gstlal and gstlal-ugly: properly specify python3 in Debian packaging
@patrick.godwin found that Debian packages of gstlal*
contain a mix of site-packages
(RPM style) and dist-packages
(Debian style) python module paths. Usually, the debhelper
component dh-python
makes the necessary changes during package creation - but only if given enough information.
To allow dh-python
to relocate site-packages
content to dist-packages
Debian style, at least ${python3:Depends}
is required in the install dependencies of packages containing Python3 modules, Also, X-Python3-Versions
should be provided.
Both changes apparently got lost during the Python2 - Python3 transition.
Mimimal diffs for gstlal 1.9.0
and gstlal-ugly 1.9.1
follow:
diff -Nur old/debian/changelog new/debian/changelog
--- old/debian/changelog 2021-08-12 12:10:28.000000000 +0200
+++ new/debian/changelog 2022-01-05 14:41:53.000000000 +0100
@@ -1,2 +1,8 @@
+gstlal (1.9.0-3) unstable; urgency=low
+
+ * fix site-packages issue
+
+ -- Steffen Grunewald <steffen.grunewald@ligo.org> Wed, 05 Jan 2022 14:40:00 +0100
+
gstlal (1.9.0-1.7) unstable; urgency=low
diff -Nur old/debian/control new/debian/control
--- old/debian/control 2021-08-12 12:10:27.000000000 +0200
+++ new/debian/control 2022-01-05 14:41:53.000000000 +0100
@@ -3,7 +3,7 @@
Section: lscsoft
Priority: optional
Standards-Version: 3.9.2
-X-Python-Version: >= 3.6
+X-Python3-Version: >= 3.6
Build-Depends:
debhelper (>= 9),
dh-python,
@@ -37,7 +37,7 @@
Architecture: any
Replaces: gstlal-ugly (<< 0.99.0), gstlal-dep
Breaks: gstlal-ugly (<< 0.99.0), gstlal-dep
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends},
avahi-daemon,
gir1.2-glib-2.0,
gir1.2-gstreamer-1.0 (>= 1.14.1),
diff -Nur old/debian/control.in new/debian/control.in
--- old/debian/control.in 2021-08-12 12:10:28.000000000 +0200
+++ new/debian/control.in 2022-01-05 14:41:53.000000000 +0100
@@ -3,7 +3,7 @@
Section: lscsoft
Priority: optional
Standards-Version: 3.9.2
-X-Python-Version: >= @MIN_PYTHON_VERSION@
+X-Python3-Version: >= @MIN_PYTHON_VERSION@
Build-Depends:
debhelper (>= 9),
dh-python,
@@ -37,7 +37,7 @@
Architecture: any
Replaces: gstlal-ugly (<< 0.99.0), gstlal-dep
Breaks: gstlal-ugly (<< 0.99.0), gstlal-dep
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends},
avahi-daemon,
gir1.2-glib-2.0,
gir1.2-gstreamer-1.0 (>= @MIN_GSTREAMER_VERSION@),
diff -Nur old/debian/changelog new/debian/changelog
--- old/debian/changelog 2021-10-04 12:42:31.000000000 +0200
+++ new/debian/changelog 2022-01-05 14:45:29.000000000 +0100
@@ -1,2 +1,8 @@
+gstlal-ugly (1.9.1-3) unstable; urgency=low
+
+ * fix site-packages issue
+
+ -- Steffen Grunewald <steffen.grunewald@ligo.org> Wed, 05 Jan 2022 14:45:00 +0100
+
gstlal-ugly (1.9.1-2) unstable; urgency=low
diff -Nur old/debian/control new/debian/control
--- old/debian/control 2021-10-04 12:42:31.000000000 +0200
+++ new/debian/control 2022-01-05 14:45:29.000000000 +0100
@@ -3,7 +3,7 @@
Section: lscsoft
Priority: optional
Standards-Version: 3.9.2
-X-Python-Version: >= 3.6
+X-Python3-Version: >= 3.6
Build-Depends:
debhelper (>= 9),
dh-python,
@@ -33,7 +33,7 @@
Package: gstlal-ugly
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends},
gds-lsmp (>= 2.19.0),
gds-dtt-crtools (>= 2.19.0),
gds-framexmit (>= 2.19.0),
@@ -70,7 +70,7 @@
Package: gstlal-ugly-dev
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
+Depends: ${shlibs:Depends}, ${misc:Depends},
gstlal-dev (>= 1.9.0),
gstlal-ugly (= ${binary:Version}),
liblal-dev (>= 7.1.0),
diff -Nur old/debian/control.in new/debian/control.in
--- old/debian/control.in 2021-10-04 12:42:31.000000000 +0200
+++ new/debian/control.in 2022-01-05 14:45:29.000000000 +0100
@@ -3,7 +3,7 @@
Section: lscsoft
Priority: optional
Standards-Version: 3.9.2
-X-Python-Version: >= @MIN_PYTHON_VERSION@
+X-Python3-Version: >= @MIN_PYTHON_VERSION@
Build-Depends:
debhelper (>= 9),
dh-python,
@@ -33,7 +33,7 @@
Package: gstlal-ugly
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends},
gds-lsmp (>= @MIN_GDS_VERSION@),
gds-dtt-crtools (>= @MIN_GDS_VERSION@),
gds-framexmit (>= @MIN_GDS_VERSION@),
@@ -70,7 +70,7 @@
Package: gstlal-ugly-dev
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
+Depends: ${shlibs:Depends}, ${misc:Depends},
gstlal-dev (>= @MIN_GSTLAL_VERSION@),
gstlal-ugly (= ${binary:Version}),
liblal-dev (>= @MIN_LAL_VERSION@),