diff --git a/makefile b/makefile index 0c2ea6ae..8ac83801 100644 --- a/makefile +++ b/makefile @@ -224,7 +224,7 @@ deb-package-python3: deb-package-prep rm -f $(DEBBLDDIR)/debian/files (cd $(DEBBLDDIR); DEB_BUILD_OPTIONS=python3 dpkg-buildpackage $(DPKG_OPT)) mkdir -p $(DSTDIR) - mv $(BLDDIR)/python3-$(DEBPKG) $(DSTDIR) + mv $(BLDDIR)/$(DEBPKG) $(DSTDIR)/python3-$(DEBPKG) # run lintian on the deb package check-deb: diff --git a/pkg/debian/control.python3 b/pkg/debian/control.python3 index 165721a7..a0cf7af4 100644 --- a/pkg/debian/control.python3 +++ b/pkg/debian/control.python3 @@ -6,9 +6,7 @@ Standards-Version: 3.9.2 Homepage: http://www.weewx.com Build-Depends: debhelper (>=8) -Package: python3-weewx -Replaces: weewx -Breaks: weewx +Package: weewx Priority: optional Architecture: all Pre-Depends: debconf diff --git a/pkg/debian/rules b/pkg/debian/rules index 2ae04b57..03cc902b 100755 --- a/pkg/debian/rules +++ b/pkg/debian/rules @@ -7,12 +7,11 @@ #export DH_VERBOSE=1 # determine which python we should use -ifneq (,$(filter python3,$(DEB_BUILD_OPTIONS))) -PYTHON=python3 -PKG=python3-weewx -else -PYTHON=python2 PKG=weewx +PYTHON=python2 +ifneq (,$(filter python3,$(DEB_BUILD_OPTIONS))) +#PKG=python3-weewx +PYTHON=python3 endif SRC=$(CURDIR)