Change package name from python3-weewx to just weewx

weewx · Mar 26, 2023 · 9965a57 · 9965a57
1 parent 3015efb
commit 9965a57
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/TODO.md b/TODO.md
@@ -1,5 +1,7 @@
 # To do
 
+Use POST for station registry (instead of GET).
+
 ## Debian packaging
 
 Test upgrade process.
@@ -40,6 +42,8 @@ Put legacy (V4.x) docs at weewx.com/legacy_docs.
 
 How to switch from init.d to systemd.
 
+How to upgrade from V4 using Python 2 to V5.
+
 
 ## Miscellaneous
 

diff --git a/makefile b/makefile
@@ -254,7 +254,7 @@ fi
 # the latest version in the debian changelog must match the packaging version
 DEBARCH=all
 DEBBLDDIR=$(BLDDIR)/weewx-$(VERSION)
-DEBPKG=python3-weewx_$(DEBVER)_$(DEBARCH).deb
+DEBPKG=weewx_$(DEBVER)_$(DEBARCH).deb
 ifneq ("$(SIGN)","1")
 DPKG_OPT=-us -uc
 endif
@@ -264,7 +264,7 @@ debian-package: deb-package-prep
 	rm -rf $(DEBBLDDIR)/debian/weewx*
 	(cd $(DEBBLDDIR); dpkg-buildpackage $(DPKG_OPT))
 	mkdir -p $(DSTDIR)
-	mv $(BLDDIR)/$(DEBPKG) $(DSTDIR)
+	mv $(BLDDIR)/$(DEBPKG) $(DSTDIR)/python3-$(DEBPKG)
 
 deb-package-prep: $(DSTDIR)/$(SRCPKG)
 	mkdir -p $(BLDDIR)
@@ -290,7 +290,7 @@ check-deb:
 	lintian -Ivi $(DSTDIR)/$(DEBPKG)
 
 upload-debian:
-	scp $(DSTDIR)/$(DEBPKG) $(USER)@$(WEEWX_COM):$(WEEWX_STAGING)
+	scp $(DSTDIR)/python3-$(DEBPKG) $(USER)@$(WEEWX_COM):$(WEEWX_STAGING)
 
 
 ###############################################################################
@@ -426,13 +426,13 @@ pull-apt-repo:
 
 # add the latest version to the local apt repo using aptly
 update-apt-repo:
-	aptly repo add python2-weewx $(DSTDIR)/$(DEBPKG)
+	aptly repo add python2-weewx $(DSTDIR)/python-$(DEBPKG)
 	aptly snapshot create python-weewx-$(DEBVER) from repo python2-weewx
 	aptly publish drop squeeze python2
 	aptly publish -architectures=all snapshot python-weewx-$(DEBVER) python2
 # i would prefer to just do a switch, but that does not work. idkw
 #	aptly publish switch squeeze python2 python-weewx-$(DEBVER)
-	aptly repo add python3-weewx $(DSTDIR)/$(DEBPKG)
+	aptly repo add python3-weewx $(DSTDIR)/python3-$(DEBPKG)
 	aptly snapshot create python3-weewx-$(DEBVER) from repo python3-weewx
 	aptly publish drop buster python3
 	aptly publish -architectures=all snapshot python3-weewx-$(DEBVER) python3

diff --git a/pkg/debian/control b/pkg/debian/control
@@ -6,8 +6,7 @@ Standards-Version: 3.9.2
 Homepage: http://www.weewx.com
 Build-Depends: debhelper (>=8)
 
-Package: python3-weewx
-Provides: weewx
+Package: weewx
 Priority: optional
 Architecture: all
 Pre-Depends: debconf
@@ -17,8 +16,7 @@ Depends:
  python3-cheetah,
  python3-pil,
  python3-serial,
- python3-usb,
- lsb-base
+ python3-usb
 Suggests:
  sqlite,
  rsync,
@@ -27,8 +25,8 @@ Suggests:
  python3-dev,
  python3-pip
 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.
+ WeeWX interacts with a weather station to produce graphs, reports, and HTML
+ pages. WeeWX can upload data to many weather services including WeatherUnderground,
+ PWSweather.com, CWOP, and others.
  .
- This is the python3 configuration of weewx
+ This version requires Python 3.7 or greater.
diff --git a/pkg/debian/rules b/pkg/debian/rules
@@ -6,8 +6,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+PKG=weewx
 PYTHON=python3
-PKG=python3-weewx
 SRC=$(CURDIR)
 DST=$(CURDIR)/debian/$(PKG)
 DST_EXECDIR=$(DST)/usr/bin