[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:
0a2742fd by Mattia Rizzolo at 2018-07-09T14:28:32+02:00
init changelog for the next release.

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

- - - - -
013bebdb by Mattia Rizzolo at 2018-07-09T14:28:52+02:00
On Debian, do not seek apktool on ppc64el and s390x as it's not installable there.

Fixes autopkgtest on those architectures.

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

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/tests/control
- diffoscope/external_tools.py


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+diffoscope (100) UNRELEASED; urgency=medium
+
+  * WIP.
+
+ -- Mattia Rizzolo <mattia at debian.org>  Mon, 09 Jul 2018 14:28:26 +0200
+
 diffoscope (99) unstable; urgency=medium
 
   [ Xavier Briand ]


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


=====================================
debian/tests/control
=====================================
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -2,7 +2,7 @@
 # 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
+Depends: diffoscope, python3-pytest, 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, 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
 
 Tests: pytest
 Depends: diffoscope, python3-pytest


=====================================
diffoscope/external_tools.py
=====================================
--- a/diffoscope/external_tools.py
+++ b/diffoscope/external_tools.py
@@ -22,7 +22,7 @@ EXTERNAL_TOOLS = {
         'debian': 'abootimg',
     },
     'apktool': {
-        'debian': 'apktool',
+        'debian': 'apktool [!ppc64el !s390x]',
     },
     'db_dump': {
         'debian': 'db-util',



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

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/compare/0cb74c0974bf05534882b23fbddf22b4fc4402c6...013bebdb2df91a65c8292311e3f2e90634510ec3
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/20180709/64b5eceb/attachment.html>