debian/changelog

+diffoscope (106) unstable; urgency=medium
+
+  [ Chris Lamb ]
+  * comparators:
+    + elf: Don't assume all files called ".a" are ELF binaries.  Closes: #903446
+    + pdf:
+      - Display the reason when cannot extract metadata from PDF files.
+      - Prevent tracebacks when obtaining PDF metadata from files with multiple
+        PDF dictionary definition entries.  Closes: #913315
+
+  [ Marius Gedminas ]
+  * Add a python_requires to setup.py.
+
+  [ Mattia Rizzolo ]
+  * debian:
+    + Disable depends on gnumeric and procyon as they are RC buggy.
+    + Override the new lintian's public-upstream-key-in-native-package.
+
+ -- Mattia Rizzolo <mattia@debian.org>  Fri, 23 Nov 2018 11:09:28 +0100
+
 diffoscope (105) unstable; urgency=medium
 
   [ Chris Lamb ]

debian/control

@@ -30,7 +30,7 @@ Build-Depends:
  ghc <!nocheck>,
  ghostscript <!nocheck>,
  giflib-tools <!nocheck>,
- gnumeric <!nocheck>,
+# gnumeric <!nocheck>,
  help2man,
  imagemagick <!nocheck>,
  jsbeautifier <!nocheck>,
@@ -50,7 +50,7 @@ Build-Depends:
  openssh-client <!nocheck>,
  pgpdump <!nocheck>,
  poppler-utils <!nocheck>,
- procyon-decompiler <!nocheck>,
+# procyon-decompiler <!nocheck>,
  python-argcomplete,
  python3-all,
  python3-binwalk <!nocheck>,

debian/rules

@@ -81,6 +81,8 @@ override_dh_auto_clean:
 	@sed -i "s,fp-utils,fp-utils [!ppc64el !s390x]," debian/tests/control.tmp
 	#@sed -i "s,oggvideotools,oggvideotools [!s390x]," debian/tests/control.tmp
 	@sed -i "s/oggvideotools, //" debian/tests/control.tmp
+	@sed -i "s/gnumeric, //" debian/tests/control.tmp
+	@sed -i "s/procyon-decompiler, //" 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." ;\

debian/source/lintian-overrides

 # This will mainly be used to double check that what we upload to Debian
 # is also in our "archive".
 debian-watch-file-in-native-package
+
+# We like to share our own keys for others to check the released signature.
+public-upstream-key-in-native-package

debian/tests/control

@@ -7,7 +7,7 @@
 #   $ mv debian/tests/control.tmp debian/tests/control
 
 Tests: pytest-with-recommends
-Depends: diffoscope, python3-pytest, file, linux-image-amd64 [amd64] | linux-image-generic [amd64], abootimg, acl, apktool [!ppc64el !s390x], 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 [!ppc64el !s390x], genisoimage, gettext, ghc, ghostscript, giflib-tools, gnumeric, gnupg, imagemagick, jsbeautifier, libarchive-tools, llvm, lz4 | liblz4-tool, mono-utils, ocaml-nox, odt2txt, openssh-client, pgpdump, poppler-utils, procyon-decompiler, r-base-core, rpm2cpio, sng, sqlite3, squashfs-tools, tcpdump, unzip, xmlbeans, xxd | vim-common, xz-utils, python3-argcomplete, python3-binwalk, python3-defusedxml, python3-distro, python3-guestfs, python3-jsondiff, python3-progressbar, python3-pypdf2, python3-debian, python3-pyxattr, python3-rpm, python3-tlsh
+Depends: diffoscope, python3-pytest, file, linux-image-amd64 [amd64] | linux-image-generic [amd64], abootimg, acl, apktool [!ppc64el !s390x], 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 [!ppc64el !s390x], genisoimage, gettext, ghc, ghostscript, giflib-tools, gnupg, imagemagick, jsbeautifier, libarchive-tools, llvm, lz4 | liblz4-tool, mono-utils, ocaml-nox, odt2txt, openssh-client, pgpdump, poppler-utils, r-base-core, rpm2cpio, sng, sqlite3, squashfs-tools, tcpdump, unzip, xmlbeans, xxd | vim-common, xz-utils, python3-argcomplete, python3-binwalk, python3-defusedxml, python3-distro, python3-guestfs, python3-jsondiff, python3-progressbar, python3-pypdf2, python3-debian, python3-pyxattr, python3-rpm, python3-tlsh
 
 Tests: pytest
 Depends: diffoscope, python3-pytest, file

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 = "105"
+VERSION = "106"