debian/changelog

 diffoscope (99) UNRELEASED; urgency=medium
 
-  * WIP
+  [ Xavier Briand ]
+  * Add lz4 comparator.  Closes: #901548; !4
+
+  [ Paul Wise ]
+  * Clear the progress bar after completion.  Closes: #901758
+    Handle terminals that do not support erasing the line by filling the
+    terminal with spaces.  Ignore output devices that are not terminals.
+  * Do not delete the current terminal line for every progress bar update.
+    The erasure was also causing the progress bar to flicker.
+
+  [ Mattia Rizzolo ]
+  * Add a gitlab CI script.  !8
+  * tempfiles:
+    + Set the base directory only if the caller didn't specify one already.
+    + 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
+  * tests/test_tools: fix test if /sbin contains a directory.  MR: !2
+    Thanks to Chris Lamb <lamby@debian.org> for the patch.
+  * logging:
+    + Move the computation of the terminal line eraser into logging.py
+    + Always clean the line before printing a log message
+  * main:
+    + Clean the terminal line before printing a traceback.
+  * comparators:
+    + Do not shadow the original import errors.  MR: !7
+
+  [ anthraxx ]
+  * comparators.utils:libarchive:
+    + Add compatibility code for python-libarchive >= 2.8.  MR: !6
 
- -- Chris Lamb <lamby@debian.org>  Fri, 29 Jun 2018 08:20:42 +0100
+ -- Mattia Rizzolo <mattia@debian.org>  Sun, 08 Jul 2018 18:07:55 +0200
 
 diffoscope (98) unstable; urgency=medium
 

debian/control

@@ -48,6 +48,7 @@ Build-Depends:
  openssh-client <!nocheck>,
  pgpdump <!nocheck>,
  poppler-utils <!nocheck>,
+ procyon-decompiler <!nocheck>,
  python-argcomplete,
  python3-all,
  python3-binwalk <!nocheck>,
@@ -74,7 +75,7 @@ Build-Depends:
  unzip <!nocheck>,
  xmlbeans <!nocheck>,
  xxd <!nocheck> | vim-common <!nocheck>,
-Standards-Version: 4.1.4
+Standards-Version: 4.1.5
 Rules-Requires-Root: no
 Homepage: https://diffoscope.org
 Vcs-Git: https://salsa.debian.org/reproducible-builds/diffoscope.git

debian/rules

@@ -76,3 +76,22 @@ diffoscope/presenters/icon.py: favicon.png
 
 favicon.png: logo.svg
 	inkscape -w 32 -h 32 -e $@ $<
+
+override_dh_clean:
+	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
+	@echo "#" >> debian/tests/control.tmp
+	@cat debian/tests/control.in >> debian/tests/control.tmp
+	@sed -i "s#%RECOMMENDS%#$(shell bin/diffoscope --list-debian-substvars | cut -d= -f2)#" debian/tests/control.tmp
+	@set -e ; if ! diff -q debian/tests/control debian/tests/control.tmp ; then \
+		echo ;\
+		echo "The generated control file differs from the actual one." ;\
+		echo "A sourceful upload of this package is needed." ;\
+		echo ;\
+		echo "Differences:" ;\
+		diff -u debian/tests/control debian/tests/control.tmp ;\
+	else \
+		rm debian/tests/control.tmp ;\
+	fi

debian/tests/control

-Tests: pytest
-Depends: diffoscope, python3-pytest
-Restrictions: needs-recommends
+# DON'T MANUALLY MODIFY!
+# EDIT debian/tests/control.in INSTEAD!
+#
+Tests: pytest-with-recommends
+Depends: diffoscope, python3-pytest, abootimg, acl, apktool, binutils-multiarch, bzip2, caca-utils, colord, db-util, default-jdk-headless | default-jdk | java-sdk, device-tree-compiler, docx2txt, e2fsprogs, enjarify, fontforge-extras, fp-utils, genisoimage, gettext, ghc, ghostscript, giflib-tools, gnumeric, gnupg, imagemagick, jsbeautifier, libarchive-tools, llvm, lz4, mono-utils, odt2txt, oggvideotools, openssh-client, pgpdump, poppler-utils, procyon-decompiler, r-base-core, rpm2cpio, sng, sqlite3, squashfs-tools, tcpdump, unzip, xmlbeans, xxd | vim-common, xz-utils
 
-Test-Command: debian/tests/pytest
+Tests: pytest
 Depends: diffoscope, python3-pytest
-# but without Recommends
 
 Tests: basic-command-line
 Depends: diffoscope

debian/tests/control.in

+Tests: pytest-with-recommends
+Depends: diffoscope, python3-pytest, %RECOMMENDS%
+
+Tests: pytest
+Depends: diffoscope, python3-pytest
+
+Tests: basic-command-line
+Depends: diffoscope
+Restrictions: allow-stderr
+# without Recommends

debian/tests/pytest-with-recommends

+pytest
\ No newline at end of file

diffoscope/external_tools.py

@@ -268,7 +268,7 @@ EXTERNAL_TOOLS = {
         'debian': 'procyon-decompiler',
     },
     'dumpxsb': {
-        'debian': 'xmlutils',
+        'debian': 'xmlbeans',
     },
 }
 

diffoscope/main.py

@@ -459,7 +459,7 @@ def main(args=None):
             post_parse(parsed_args)
             sys.exit(run_diffoscope(parsed_args))
     except KeyboardInterrupt:
-        logger.info('Keyboard Interrupt')
+        logger.error('Keyboard Interrupt')
         sys.exit(2)
     except BrokenPipeError:
         sys.exit(2)