[Git][reproducible-builds/diffoscope][master] Workaround impossiblity to have arch-specific recommends

[Mattia Rizzolo]

Mattia Rizzolo pushed to branch master at Reproducible Builds / diffoscope


Commits:
79d8c77f by Mattia Rizzolo at 2018-07-09T15:44:52+02:00
Workaround impossiblity to have arch-specific recommends

    dpkg-gencontrol: error: the Recommends field contains an arch-specific dependency but the package is architecture all
So instead hack the arch limitation in d/tests/control through sed…

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

- - - - -


2 changed files:

- debian/rules
- diffoscope/external_tools.py


Changes:

=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -79,6 +79,7 @@ override_dh_auto_clean:
 	@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
+	@sed -i "s,apktool,apktool [!ppc64el !s390x]," 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." ;\


=====================================
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 [!ppc64el !s390x]',
+        'debian': 'apktool',
     },
     'db_dump': {
         'debian': 'db-util',



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/commit/79d8c77f81c53ffcd40c82653ecef98479e7546a

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/commit/79d8c77f81c53ffcd40c82653ecef98479e7546a
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/3bc1d58f/attachment.html>