Merge lp:~cjwatson/convoy/split-common into lp:~launchpad/convoy/packaging

[Colin Watson]

Move /usr/share/convoy/convoy.wsgi to a new convoy-common package.

This allows it to be used in Python-3-only setups.

The fact that python-convoy/python3-convoy depend on the package containing `/usr/share/convoy/convoy.wsgi` rather than the other way round is a bit odd, since `convoy.wsgi` imports from the `convoy` package. However, this is necessary for a smooth upgrade, and it also means that we don't have to pick which Python version `convoy-common` should depend on; this is important since that must be in sync with whether `libapache2-mod-wsgi` or `libapache2-mod-wsgi-py3` is installed. Since `convoy.wsgi` itself is Python-version-agnostic and has no `#!` line, it can safely be shipped in a common package like this.

For people unfamiliar with Debian packaging, the `Breaks`/`Replaces` pair here is the standard way to inform `dpkg` that a file is being intentionally moved to a different package so that it doesn't treat that as an error.

[lp:~cjwatson/convoy/split-common]

46. By Colin Watson on 2022-08-26

Move /usr/share/convoy/convoy.wsgi to a new convoy-common package.

This allows it to be used in Python-3-only setups.

The fact that python-convoy/python3-convoy depend on the package
containing `/usr/share/convoy/convoy.wsgi` rather than the other way
round is a bit odd, since `convoy.wsgi` imports from the `convoy`
package. However, this is necessary for a smooth upgrade, and it also
means that we don't have to pick which Python version `convoy-common`
should depend on; this is important since that must be in sync with
whether `libapache2-mod-wsgi` or `libapache2-mod-wsgi-py3` is installed.
Since `convoy.wsgi` itself is Python-version-agnostic and has no `#!`
line, it can safely be shipped in a common package like this.

[Guruprasad (lgp171188)]

LGTM 👍

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2019-10-11 23:10:38 +0000
+++ debian/changelog	2022-08-26 19:35:16 +0000
@@ -1,3 +1,11 @@
+convoy (0.4.4+bzr39-0lp6) UNRELEASED; urgency=medium
+
+  * Drop unused dependencies on python-cssutils/python3-cssutils.
+  * Move /usr/share/convoy/convoy.wsgi to a new convoy-common package,
+    allowing it to be used in Python-3-only setups.
+
+ -- Colin Watson <[e-mail]>  Fri, 26 Aug 2022 19:44:41 +0100
+
 convoy (0.4.4+bzr39-0lp5) xenial; urgency=medium
 
   [ zriv ]

=== modified file 'debian/control'
--- debian/control	2019-10-11 22:59:44 +0000
+++ debian/control	2022-08-26 19:35:16 +0000
@@ -17,9 +17,23 @@
 Standards-Version: 3.8.3
 Homepage: https://launchpad.net/convoy
 
+Package: convoy-common
+Architecture: all
+Depends: ${misc:Depends},
+Recommends: python3-convoy | python-convoy
+Breaks: python-convoy (<< 0.4.4+bzr39-0lp6~)
+Replaces: python-convoy (<< 0.4.4+bzr39-0lp6~)
+Description: A combo loader WSGI application (common files)
+ Provides a WSGI application that can be hooked up to a
+ generic WSGI container to create a combo loader server, for
+ loading Javascript and CSS files combined into a single
+ request.
+ .
+ This package installs common files for both Python 2 and 3.
+
 Package: python-convoy
 Architecture: all
-Depends: python-cssutils,
+Depends: convoy-common (= ${binary:Version}),
          ${misc:Depends},
          ${python:Depends},
 Description: A combo loader WSGI application (Python 2)
@@ -32,7 +46,7 @@
 
 Package: python3-convoy
 Architecture: all
-Depends: python3-cssutils,
+Depends: convoy-common (= ${binary:Version}),
          ${misc:Depends},
          ${python3:Depends},
 Description: A combo loader WSGI application (Python 3)

=== renamed file 'debian/python-convoy.install' => 'debian/convoy-common.install'
=== modified file 'debian/rules'
--- debian/rules	2019-10-11 23:08:45 +0000
+++ debian/rules	2022-08-26 19:35:16 +0000
@@ -7,14 +7,12 @@
 %:
 	dh $@ --with python2,python3 --buildsystem pybuild
 
-override_dh_python3:
-	dh_python3
-	install -m644 \
-		debian/convoy.wsgi \
-		debian/python3-convoy/usr/lib/python3/dist-packages/convoy/wsgi.py
-
 override_dh_link:
 	set -e; for py2 in $$(pyversions -vr); do \
-		dh_link usr/share/convoy/convoy.wsgi \
+		dh_link -ppython-convoy \
+		        usr/share/convoy/convoy.wsgi \
 		        usr/lib/python$$py2/dist-packages/convoy/wsgi.py; \
 	done
+	dh_link -ppython3-convoy \
+	        usr/share/convoy/convoy.wsgi \
+	        usr/lib/python3/dist-packages/convoy/wsgi.py