Control: retitle  -1 unblock: apktool/2.7.0+dfsg-6

aapt building is not supported on all arches, upstream only supports amd64, arm64 and i386. So I had to restrict the test of building to those arches.
diff --git a/debian/changelog b/debian/changelog
index d439603..8c68cfa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+apktool (2.7.0+dfsg-6) unstable; urgency=medium
+
+  * only test APK build on arches with aapt that can do it
+
+ -- Hans-Christoph Steiner <h...@eds.org>  Tue, 21 Mar 2023 09:41:45 +0100
+
+apktool (2.7.0+dfsg-5) unstable; urgency=medium
+
+  * fix broken symlink to commons-text.jar (Closes: #1033226)
+
+ -- Hans-Christoph Steiner <h...@eds.org>  Mon, 20 Mar 2023 14:00:20 +0100
+
 apktool (2.7.0+dfsg-4) unstable; urgency=medium
 
   * fix arch detection for Depends:
diff --git a/debian/links b/debian/links
index 2c167db..779d62e 100644
--- a/debian/links
+++ b/debian/links
@@ -2,7 +2,7 @@ usr/share/java/antlr3-runtime.jar 
usr/share/apktool/antlr3-runtime.jar
 usr/share/java/commons-cli.jar usr/share/apktool/commons-cli.jar
 usr/share/java/commons-io.jar usr/share/apktool/commons-io.jar
 usr/share/java/commons-lang3.jar usr/share/apktool/commons-lang3.jar
-usr/share/java/commons-text-1.9.jar usr/share/apktool/commons-text-1.9.jar
+usr/share/java/commons-text.jar usr/share/apktool/commons-text.jar
 usr/share/java/guava.jar usr/share/apktool/guava.jar
 usr/share/java/snakeyaml.jar usr/share/apktool/snakeyaml.jar
 usr/share/java/stringtemplate.jar usr/share/apktool/stringtemplate.jar
diff --git a/debian/tests/control b/debian/tests/control
index 298f6e5..6855f40 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,4 +1,11 @@
 # urzip.apk comes from https://github.com/eighthave/urzip via 
https://gitlab.com/fdroid/fdroidserver
+
 Test-Command: apktool d debian/tests/urzip.apk && test -e 
urzip/smali/info/guardianproject/urzip/UnZipper.smali
 Depends: apktool
 Restrictions: allow-stderr
+
+# Test building an APK on arches that have aapt that can do it
+Test-Command: apktool d debian/tests/urzip.apk && test -e 
urzip/smali/info/guardianproject/urzip/UnZipper.smali && apktool b urzip/ && 
test -e urzip/dist/urzip.apk
+Architecture: amd64 arm64 i386
+Depends: apktool
+Restrictions: allow-stderr

Reply via email to