[Git][reproducible-builds/diffoscope][master] 2 commits: init changelog for the next release

[Mattia Rizzolo]

Mattia Rizzolo pushed to branch master at Reproducible Builds / diffoscope


Commits:
553f82fb by Mattia Rizzolo at 2018-10-26T11:27:36Z
init changelog for the next release

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

- - - - -
f4a93c1b by Mattia Rizzolo at 2018-10-26T11:27:47Z
Reinstate apktool Build-Depends and Test-Depends, as it is now back in buster.

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

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/rules
- debian/tests/control


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+diffoscope (105) UNRELEASED; urgency=medium
+
+  * WIP.
+
+  [ Chris Lamb ]
+  * tests:
+    + Prevent test failures when running under stretch-backports by checking
+      the ocaml version number.  Closes: #911846
+
+ -- Mattia Rizzolo <mattia at debian.org>  Fri, 26 Oct 2018 13:26:53 +0200
+
 diffoscope (104) unstable; urgency=medium
 
   [ Chris Lamb ]


=====================================
debian/control
=====================================
@@ -10,7 +10,7 @@ Uploaders:
  Ximin Luo <infinity0 at debian.org>,
 Build-Depends:
  abootimg <!nocheck>,
-# apktool [!ppc64el !s390x] <!nocheck>,
+ apktool [!ppc64el !s390x] <!nocheck>,
  bash-completion,
  binutils-multiarch <!nocheck>,
  caca-utils <!nocheck>,


=====================================
debian/rules
=====================================
@@ -77,8 +77,7 @@ override_dh_auto_clean:
 	)#" debian/tests/control.tmp
 	@sed -i "s,python3-python-debian,python3-debian," debian/tests/control.tmp
 	@sed -i "s,python3-rpm-python,python3-rpm," debian/tests/control.tmp
-	#@sed -i "s,apktool,apktool [!ppc64el !s390x]," debian/tests/control.tmp
-	@sed -i "s/apktool, //" debian/tests/control.tmp
+	@sed -i "s,apktool,apktool [!ppc64el !s390x]," debian/tests/control.tmp
 	@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


=====================================
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, 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-distro, python3-argcomplete, python3-progressbar, python3-binwalk, python3-defusedxml, python3-guestfs, python3-jsondiff, python3-debian, python3-pypdf2, 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, 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-distro, python3-argcomplete, python3-progressbar, python3-binwalk, python3-defusedxml, python3-guestfs, python3-jsondiff, python3-debian, python3-pypdf2, python3-pyxattr, python3-rpm, python3-tlsh
 
 Tests: pytest
 Depends: diffoscope, python3-pytest, file



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/compare/65a2cba4248932d81278e95fdde520594172a97f...f4a93c1be9c29e16b73a93ee212c73bc8e9c0ad2

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/compare/65a2cba4248932d81278e95fdde520594172a97f...f4a93c1be9c29e16b73a93ee212c73bc8e9c0ad2
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/20181026/aad85df8/attachment.html>