This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jarjar.
commit 16b243cd48f9f76e97c2dc383649425346642c65 Author: Emmanuel Bourg <[email protected]> Date: Fri Sep 8 14:21:12 2017 +0200 Revert to libasm4-java to avoid a compatibility issue with ASM 6 (Closes: #867889) --- debian/ant.properties | 4 ++-- debian/changelog | 2 ++ debian/control | 4 ++-- debian/rules | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/debian/ant.properties b/debian/ant.properties index 97eceae..4a8a8f9 100644 --- a/debian/ant.properties +++ b/debian/ant.properties @@ -1,5 +1,5 @@ -asm.jar=/usr/share/java/asm.jar -asm-commons.jar=/usr/share/java/asm-commons.jar +asm.jar=/usr/share/java/asm4.jar +asm-commons.jar=/usr/share/java/asm4-commons.jar maven-plugin-api.jar=/usr/share/java/maven-plugin-api.jar ant.jar=/usr/share/java/ant.jar compile.source=1.5 diff --git a/debian/changelog b/debian/changelog index f5ffaac..c0f989b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ jarjar (1.4+svn142-7) UNRELEASED; urgency=medium * Move package maintenance to git. [ Emmanuel Bourg ] + * Revert to libasm4-java to avoid a compatibility issue with ASM 6 + (Closes: #867889) * Create the required lib directory before building * Standards-Version updated to 4.1.0 diff --git a/debian/control b/debian/control index ca0f53f..a6b7157 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Damien Raude-Morvan <[email protected]> Build-Depends: ant, debhelper (>= 10~), default-jdk, - libasm-java (>= 5.0), + libasm4-java, libmaven2-core-java, maven-repo-helper Standards-Version: 4.1.0 @@ -17,7 +17,7 @@ Homepage: http://code.google.com/p/jarjar/ Package: libjarjar-java Architecture: all Depends: ${misc:Depends} -Built-Using: asm (= ${asm:Version}) +Built-Using: libasm4-java (= ${asm:Version}) Description: repackage third-party jars Utility that makes it easy to repackage Java libraries and embed them into your own distribution. This is useful for two reasons: diff --git a/debian/rules b/debian/rules index 5e12ab9..5680368 100755 --- a/debian/rules +++ b/debian/rules @@ -1,9 +1,9 @@ #!/usr/bin/make -f -export CLASSPATH := /usr/share/java/asm.jar:/usr/share/java/asm-commons.jar:/usr/share/java/maven-plugin-api.jar +export CLASSPATH := /usr/share/java/asm4.jar:/usr/share/java/asm4-commons.jar:/usr/share/java/maven-plugin-api.jar # Variable for the Built-Using field in the control file -ASM_VERSION := $(shell dpkg-query -f '$${source:Version}' --show libasm-java) +ASM_VERSION := $(shell dpkg-query -f '$${source:Version}' --show libasm4-java) %: dh $@ --with maven-repo-helper -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jarjar.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
