This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository apktool.
commit eaabb9c31195f4f5bac5a3db3fddcd0ebba2f5bf Author: Reiner Herrmann <[email protected]> Date: Sat Dec 5 20:51:27 2015 +0100 Use system aapt. --- debian/control | 2 +- debian/patches/series | 1 + debian/patches/use_system_aapt.patch | 12 ++++++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index f8b5338..9279261 100644 --- a/debian/control +++ b/debian/control @@ -25,6 +25,6 @@ Vcs-Browser: https://anonscm.debian.org/cgit/android-tools/apktool.git Package: apktool Architecture: all -Depends: ${misc:Depends} +Depends: ${misc:Depends}, aapt Description: TBD TODO diff --git a/debian/patches/series b/debian/patches/series index 90b20f1..21bf065 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ +use_system_aapt.patch #fix_building.patch diff --git a/debian/patches/use_system_aapt.patch b/debian/patches/use_system_aapt.patch new file mode 100644 index 0000000..22173e4 --- /dev/null +++ b/debian/patches/use_system_aapt.patch @@ -0,0 +1,12 @@ +Author: Reiner Herrmann <[email protected]> +Description: Use system aapt instead of trying to use included one + +--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkOptions.java ++++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkOptions.java +@@ -29,5 +29,5 @@ + + public String frameworkFolderLocation = null; + public String frameworkTag = null; +- public String aaptPath = ""; ++ public String aaptPath = "/usr/bin/aapt"; + } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/apktool.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
