[Git][reproducible-builds/diffoscope][master] 2 commits: fix override_dh_clean-does-not-call-dh_clean

[Mattia Rizzolo]

Mattia Rizzolo pushed to branch master at Reproducible Builds / diffoscope


Commits:
c0ebadde by Mattia Rizzolo at 2018-07-08T20:14:31+02:00
fix override_dh_clean-does-not-call-dh_clean

move the whole thing into override_dh_auto_clean, otherwise .pyc are not
cleaned up.

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
0cb74c09 by Mattia Rizzolo at 2018-07-08T20:15:03+02:00
Release version 99

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -


3 changed files:

- debian/changelog
- debian/rules
- diffoscope/__init__.py


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-diffoscope (99) UNRELEASED; urgency=medium
+diffoscope (99) unstable; urgency=medium
 
   [ Xavier Briand ]
   * Add lz4 comparator.  Closes: #901548; !4
@@ -17,6 +17,8 @@ diffoscope (99) UNRELEASED; urgency=medium
     + Do not append '_diffoscope' to the temporary file names, as they are now
       all in their namespaced directory already.
     + Empty the list of known tempfiles after removing them.  Closes: #902709
+  * external_tools:
+    + Fix package name, s/xmlutils/xmlbeans/.
   * tests/test_tools: fix test if /sbin contains a directory.  MR: !2
     Thanks to Chris Lamb <lamby at debian.org> for the patch.
   * logging:
@@ -24,14 +26,22 @@ diffoscope (99) UNRELEASED; urgency=medium
     + Always clean the line before printing a log message
   * main:
     + Clean the terminal line before printing a traceback.
+    + Be sure to print 'Keyboard Interrupt' if that happens.
   * comparators:
     + Do not shadow the original import errors.  MR: !7
+  * d/control:
+    + Bump Standards-Version to 4.1.5, no changes needed.
+    + Add Build-Dependency on procyon-decompiler, to run the tests.
+  * d/tests:
+    + Autogenerate d/tests/control with all the recommends listed as
+      dependencies, so autopkgtest is appropriately triggered whenever one of
+      those packages changes.  Closes: #902920
 
   [ anthraxx ]
   * comparators.utils:libarchive:
     + Add compatibility code for python-libarchive >= 2.8.  MR: !6
 
- -- Mattia Rizzolo <mattia at debian.org>  Sun, 08 Jul 2018 18:07:55 +0200
+ -- Mattia Rizzolo <mattia at debian.org>  Sun, 08 Jul 2018 20:07:06 +0200
 
 diffoscope (98) unstable; urgency=medium
 


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -44,11 +44,6 @@ override_dh_auto_build: debian/diffoscope.bash-completion
 	dh_auto_build -O--buildsystem=pybuild
 	dh_auto_build -O--buildsystem=makefile -Ddoc
 
-override_dh_auto_clean:
-	dh_auto_clean -O--buildsystem=pybuild
-	dh_auto_clean -O--buildsystem=makefile -Ddoc
-	find -type d -name '__pycache__' -empty -delete
-
 override_dh_python3:
 	dh_python3 -p diffoscope \
 		--depends=distro \
@@ -77,8 +72,7 @@ diffoscope/presenters/icon.py: favicon.png
 favicon.png: logo.svg
 	inkscape -w 32 -h 32 -e $@ $<
 
-override_dh_clean:
-	dh_auto_clean
+override_dh_auto_clean:
 	@echo "Generating the debian/tests/control file..."
 	@echo "# DON'T MANUALLY MODIFY!" > debian/tests/control.tmp
 	@echo "# EDIT debian/tests/control.in INSTEAD!" >> debian/tests/control.tmp
@@ -95,3 +89,6 @@ override_dh_clean:
 	else \
 		rm debian/tests/control.tmp ;\
 	fi
+	dh_auto_clean -O--buildsystem=pybuild
+	dh_auto_clean -O--buildsystem=makefile -Ddoc
+	find -type d -name '__pycache__' -empty -delete


=====================================
diffoscope/__init__.py
=====================================
--- a/diffoscope/__init__.py
+++ b/diffoscope/__init__.py
@@ -17,4 +17,4 @@
 # You should have received a copy of the GNU General Public License
 # along with diffoscope.  If not, see <https://www.gnu.org/licenses/>.
 
-VERSION = "98"
+VERSION = "99"



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/compare/58ec1c721ebcfee320dac632ce8d3762f6bb9070...0cb74c0974bf05534882b23fbddf22b4fc4402c6

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/compare/58ec1c721ebcfee320dac632ce8d3762f6bb9070...0cb74c0974bf05534882b23fbddf22b4fc4402c6
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20180708/391cce8f/attachment.html>