This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository mvel.
commit 328e7af911dc14ec66d1c68ffd81ebeea914c413 Author: Emmanuel Bourg <[email protected]> Date: Mon Jan 18 17:28:40 2016 +0100 Depend on libasm4-java instead of libasm3-java (Closes: #800853) --- debian/changelog | 1 + debian/control | 2 +- debian/maven.rules | 3 +-- debian/patches/pom.diff | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index a272e00..3e932a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ mvel (2.2.1-1) UNRELEASED; urgency=medium - Refreshed the patches - Removed java8-compatibility.patch (fixed upstream) - Build depend on junit4 instead of junit + - Depend on libasm4-java instead of libasm3-java (Closes: #800853) - Enabled the bundle plugin * Build with the DH sequencer instead of CDBS * Moved the package to Git diff --git a/debian/control b/debian/control index 39031ca..602ca65 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Damien Raude-Morvan <[email protected]> Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper Build-Depends-Indep: default-jdk-doc, junit4, - libasm3-java, + libasm4-java, libmaven-bundle-plugin-java, libmaven-compiler-plugin-java (>= 2.0.2), libmaven-jar-plugin-java (>= 2.2), diff --git a/debian/maven.rules b/debian/maven.rules index 6f80ba4..2c43856 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1,5 +1,4 @@ -asm asm jar s/.*/3.x/ * * com.thoughtworks.xstream xstream jar s/.*/debian/ * * junit junit jar s/.*/4.x/ * * -asm * * s/3\..*/3.x/ * * +org.ow2.asm * * s/.*/4.x/ * * diff --git a/debian/patches/pom.diff b/debian/patches/pom.diff index dc00371..b1cce25 100644 --- a/debian/patches/pom.diff +++ b/debian/patches/pom.diff @@ -1,4 +1,4 @@ -Description: Add a dependency on asm 3.x +Description: Add a dependency on asm 4.x Author: Damien Raude-Morvan <[email protected]> Forwarded: not-needed --- a/pom.xml @@ -9,9 +9,9 @@ Forwarded: not-needed <!--</dependency> --> + + <dependency> -+ <groupId>asm</groupId> ++ <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> -+ <version>3.x</version> ++ <version>4.x</version> + </dependency> + </dependencies> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/mvel.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
