[Android-tools-devel] Bug#1033236: unblock: apktool/2.7.0+dfsg-5

[Hans-Christoph Steiner]

Package: release.debian.org
Severity: normal
User: release.debian.org at packages.debian.org
Usertags: unblock
X-Debbugs-Cc: apktool at packages.debian.org
Control: affects -1 + src:apktool

Please unblock package apktool

[ Reason ]

To fix the RC bug #1033226.

[ Impact ]

The core feature of `apktool build` will not work at all because it can't find a 
JAR.

[ Tests ]

I added a new test to cover a full cycle:

     apktool decode
     check if extracted file exists
     apktool build
     check if new APK file exists

[ Risks ]

Its a trivial fix, just fixing a symlink, I see no risks.

[ Checklist ]
   [x] all changes are documented in the d/changelog
   [x] I reviewed all changes and I approve them
   [x] attach debdiff against the package in testing

unblock apktool/2.7.0+dfsg-5
-------------- next part --------------
diff --git a/debian/changelog b/debian/changelog
index d439603..1884587 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apktool (2.7.0+dfsg-5) unstable; urgency=medium
+
+  * fix broken symlink to commons-text.jar (Closes: #1033226)
+
+ -- Hans-Christoph Steiner <hans at 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..af602dd 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,4 +1,4 @@
 # 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
+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
 Depends: apktool
 Restrictions: allow-stderr