Hello, updated diff

the previous version suffers of a double installed file in both 
python3-greenlet and python3-greenlet-dbg packages.

Also, please do not make the mv of python3.7 files fatal in case python3.7 is 
not built, this breaks backports
and future python3.7 removals...

my updated debdiff fixes also this

diff -Nru python-greenlet-0.4.15/debian/python3-greenlet-dbg.install 
python-greenlet-0.4.15/debian/python3-greenlet-dbg.install
--- python-greenlet-0.4.15/debian/python3-greenlet-dbg.install  2018-09-17 
19:29:42.000000000 +0200
+++ python-greenlet-0.4.15/debian/python3-greenlet-dbg.install  2019-10-20 
00:00:56.000000000 +0200
@@ -1 +1 @@
-usr/lib/python3*/*-packages/*.cpython-3?dm-*.so
+usr/lib/python3*/*-packages/*.cpython-3?d*-*.so
diff -Nru python-greenlet-0.4.15/debian/python3-greenlet.install 
python-greenlet-0.4.15/debian/python3-greenlet.install
--- python-greenlet-0.4.15/debian/python3-greenlet.install      2015-09-05 
17:03:29.000000000 +0200
+++ python-greenlet-0.4.15/debian/python3-greenlet.install      2019-10-20 
00:01:02.000000000 +0200
@@ -1,2 +1,2 @@
 usr/lib/python3*/*-packages/*.egg-info
-usr/lib/python3*/*-packages/*.cpython-3?m-*.so
+usr/lib/python3*/*-packages/*.cpython-3?*-*.so
diff -Nru python-greenlet-0.4.15/debian/rules 
python-greenlet-0.4.15/debian/rules
--- python-greenlet-0.4.15/debian/rules 2019-01-27 16:29:31.000000000 +0100
+++ python-greenlet-0.4.15/debian/rules 2019-10-23 11:00:30.000000000 +0200
@@ -33,9 +33,14 @@

 override_dh_auto_install: $(PYTHON3:%=install-python%)
        dh_auto_install
-       mv $(CURDIR)/debian/tmp/usr/include/python3.7/ \
+       -mv $(CURDIR)/debian/tmp/usr/include/python3.7/ \
                $(CURDIR)/debian/tmp/usr/include/python3.7m/

+override_dh_install:
+       dh_install
+       # remove debug files from main package
+       rm 
$(CURDIR)/debian/python3-greenlet/usr/lib/python3*/*-packages/*.cpython-3?d*-*.so
+
 override_dh_auto_test: $(PYTHON2:%=test-%-stamp) $(PYTHON3:%=test-%-stamp)
 test-%-stamp:
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))

diff -Nru python-greenlet-0.4.15/debian/changelog 
python-greenlet-0.4.15/debian/changelog
--- python-greenlet-0.4.15/debian/changelog     2019-01-27 16:29:31.000000000 
+0100
+++ python-greenlet-0.4.15/debian/changelog     2019-10-23 11:00:30.000000000 
+0200
@@ -1,3 +1,19 @@
+python-greenlet (0.4.15-2ubuntu2) focal; urgency=medium
+
+  * Fix previous upload, removing debug files into both python3 and
+    python3-dbg packages, thanks Michael Hudson-Doyle
+    for help, hint and patch (Closes: #942683)
+  * Don't make mv of python3.7 installation path fatal, this breaks in case
+    Python3.7 is not installed (e.g. backports)
+
+ -- Gianfranco Costamagna <locutusofb...@debian.org>  Wed, 23 Oct 2019 
11:00:30 +0200
+
+python-greenlet (0.4.15-2ubuntu1) focal; urgency=medium
+
+  * Fix installation of python3.8 extensions.
+
+ -- Matthias Klose <d...@ubuntu.com>  Sat, 19 Oct 2019 22:01:03 +0000
+
 python-greenlet (0.4.15-2) unstable; urgency=medium
 
   * Correct Python 3 header installation directory (closes: #920026).
diff -Nru python-greenlet-0.4.15/debian/python3-greenlet-dbg.install 
python-greenlet-0.4.15/debian/python3-greenlet-dbg.install
--- python-greenlet-0.4.15/debian/python3-greenlet-dbg.install  2018-09-17 
19:29:42.000000000 +0200
+++ python-greenlet-0.4.15/debian/python3-greenlet-dbg.install  2019-10-20 
00:00:56.000000000 +0200
@@ -1 +1 @@
-usr/lib/python3*/*-packages/*.cpython-3?dm-*.so
+usr/lib/python3*/*-packages/*.cpython-3?d*-*.so
diff -Nru python-greenlet-0.4.15/debian/python3-greenlet.install 
python-greenlet-0.4.15/debian/python3-greenlet.install
--- python-greenlet-0.4.15/debian/python3-greenlet.install      2015-09-05 
17:03:29.000000000 +0200
+++ python-greenlet-0.4.15/debian/python3-greenlet.install      2019-10-20 
00:01:02.000000000 +0200
@@ -1,2 +1,2 @@
 usr/lib/python3*/*-packages/*.egg-info
-usr/lib/python3*/*-packages/*.cpython-3?m-*.so
+usr/lib/python3*/*-packages/*.cpython-3?*-*.so
diff -Nru python-greenlet-0.4.15/debian/rules 
python-greenlet-0.4.15/debian/rules
--- python-greenlet-0.4.15/debian/rules 2019-01-27 16:29:31.000000000 +0100
+++ python-greenlet-0.4.15/debian/rules 2019-10-23 11:00:30.000000000 +0200
@@ -33,9 +33,14 @@
 
 override_dh_auto_install: $(PYTHON3:%=install-python%)
        dh_auto_install
-       mv $(CURDIR)/debian/tmp/usr/include/python3.7/ \
+       -mv $(CURDIR)/debian/tmp/usr/include/python3.7/ \
                $(CURDIR)/debian/tmp/usr/include/python3.7m/
 
+override_dh_install:
+       dh_install
+       # remove debug files from main package
+       rm 
$(CURDIR)/debian/python3-greenlet/usr/lib/python3*/*-packages/*.cpython-3?d*-*.so
+
 override_dh_auto_test: $(PYTHON2:%=test-%-stamp) $(PYTHON3:%=test-%-stamp)
 test-%-stamp:
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))

Reply via email to