diff --git a/makefile b/makefile index 0b513ea2..d71df016 100644 --- a/makefile +++ b/makefile @@ -228,12 +228,12 @@ deb-package-prep: $(DSTDIR)/$(SRCPKG) cp pkg/debian/templates $(DEBBLDDIR)/debian deb-package-python2: deb-package-prep - cp pkg/debian/control $(DEBBLDDIR)/debian + cp pkg/debian/control.python2 $(DEBBLDDIR)/debian/control rm -rf $(DEBBLDDIR)/debian/weewx* rm -f $(DEBBLDDIR)/debian/files (cd $(DEBBLDDIR); dpkg-buildpackage $(DPKG_OPT)) mkdir -p $(DSTDIR) - mv $(BLDDIR)/$(DEBPKG) $(DSTDIR) + mv $(BLDDIR)/$(DEBPKG) $(DSTDIR)/python-$(DEBPKG) deb-package-python3: deb-package-prep cp pkg/debian/control.python3 $(DEBBLDDIR)/debian/control diff --git a/pkg/debian/control.python2 b/pkg/debian/control.python2 new file mode 100644 index 00000000..aaad0954 --- /dev/null +++ b/pkg/debian/control.python2 @@ -0,0 +1,25 @@ +Source: weewx +Section: science +Priority: optional +Maintainer: Tom Keffer +Standards-Version: 3.9.2 +Homepage: http://www.weewx.com +Build-Depends: debhelper (>=8) + +Package: weewx +Priority: optional +Depends: python-weewx +Architecture: all +Description: transitional package + +Package: python-weewx +Priority: optional +Architecture: all +Pre-Depends: debconf +Replaces: weewx (<<4.0.0) +Depends: python (>=2.7), python (<<3.0), python-configobj(>=4.5), python-cheetah(>=2.0), python-imaging(>=1.1.6) | python-pil(>=5.1.0) | python-pillow(>=5.1.0), python-serial(>=2.3), python-usb (>=0.4), lsb-base +Suggests: sqlite, rsync, ftp, httpd, python-dev(>=2.5), python-pip(>=0.7) +Description: weather software + weewx interacts with a weather station to produce graphs, reports, and HTML + pages. weewx can upload data to weather services such as WeatherUnderground, + PWSweather.com, or CWOP. diff --git a/pkg/debian/control.python3 b/pkg/debian/control.python3 index a0cf7af4..b43716b0 100644 --- a/pkg/debian/control.python3 +++ b/pkg/debian/control.python3 @@ -8,6 +8,12 @@ Build-Depends: debhelper (>=8) Package: weewx Priority: optional +Depends: python3-weewx +Architecture: all +Description: transitional package + +Package: python3-weewx +Priority: optional Architecture: all Pre-Depends: debconf Depends: python3 (>=3.5) | python (>=3.5), python3-configobj, python3-cheetah, python3-pil, python3-serial, python3-usb, lsb-base