diff --git a/makefile b/makefile index 1152c316..b757d394 100644 --- a/makefile +++ b/makefile @@ -191,7 +191,7 @@ endif deb-package: $(DSTDIR)/$(SRCPKG) mkdir -p $(BLDDIR) cp $(DSTDIR)/$(SRCPKG) $(BLDDIR) - (cd $(BLDDIR); tar xvfz $(SRCPKG)) + (cd $(BLDDIR); tar xfz $(SRCPKG)) (cd $(BLDDIR); mv $(SRCPKG) weewx_$(VERSION).orig.tar.gz) rm -rf $(DEBBLDDIR)/debian mkdir -m 0755 $(DEBBLDDIR)/debian @@ -212,13 +212,14 @@ deb-package: $(DSTDIR)/$(SRCPKG) (cd $(DEBBLDDIR); dpkg-buildpackage $(DPKG_OPT)) mkdir -p $(DSTDIR) mv $(BLDDIR)/$(DEBPKG) $(DSTDIR) + mv $(BLDDIR)/python3-$(DEBPKG) $(DSTDIR) # run lintian on the deb package check-deb: lintian -Ivi $(DSTDIR)/$(DEBPKG) upload-deb: - scp $(DSTDIR)/$(DEBPKG) $(USER)@$(WEEWX_COM):$(WEEWX_STAGING) + scp $(DSTDIR)/$(DEBPKG) $(DSTDIR)/python3-$(DEBPKG) $(USER)@$(WEEWX_COM):$(WEEWX_STAGING) RPMREVISION=1 RPMVER=$(VERSION)-$(RPMREVISION) diff --git a/pkg/debian/changelog b/pkg/debian/changelog index 1d4ff03c..42f8a837 100644 --- a/pkg/debian/changelog +++ b/pkg/debian/changelog @@ -1,3 +1,6 @@ +weewx (4.0.0b12-1) unstable; urgency=low + * new upstream release + -- Matthew Wall (weewx) Sat, 22 Feb 2020 16:05:04 -0500 weewx (4.0.0b11-1) unstable; urgency=low * new upstream release -- Matthew Wall (weewx) Sun, 02 Feb 2020 09:48:39 -0500 diff --git a/pkg/debian/control b/pkg/debian/control index 08ef92fc..ac25edbb 100644 --- a/pkg/debian/control +++ b/pkg/debian/control @@ -7,18 +7,10 @@ Homepage: http://www.weewx.com Build-Depends: debhelper (>=8) Package: weewx -Architecture: all Priority: optional -Depends: python-weewx -Description: transitional package - This is a transitional package. It can safely be removed. - -Package: python-weewx -Replaces: weewx (<< 3.9.2-1~) -Breaks: weewx (<< 3.9.2-1~) Architecture: all Pre-Depends: debconf -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 +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 @@ -26,8 +18,8 @@ Description: weather software PWSweather.com, or CWOP. Package: python3-weewx -Replaces: weewx (<< 3.9.2-1~) -Breaks: weewx (<< 3.9.2-1~) +Replaces: weewx +Breaks: weewx Architecture: all Pre-Depends: debconf Depends: python3 (>=3.5) | python (>=3.5), python3-configobj, python3-cheetah, python3-pil, python3-serial, python3-usb, lsb-base