[guice] 03/04: Depend on libasm-java (>= 5.0) instead of libasm4-java

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository guice.

commit d00407ea3bc395c8d07453b694f25c923196642b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Oct 4 15:28:59 2016 +0200

    Depend on libasm-java (>= 5.0) instead of libasm4-java
---
 debian/changelog   | 1 +
 debian/control     | 4 ++--
 debian/maven.rules | 1 -
 debian/rules       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3cbf6d7..d7354a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 guice (4.0-3) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Depend on libasm-java (>= 5.0) instead of libasm4-java
   * Standards-Version updated to 3.9.8
   * Use a secure Vcs-Git URL
 
diff --git a/debian/control b/debian/control
index 15317fe..3eaaf9d 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 9),
                default-jdk,
                default-jdk-doc,
                libaopalliance-java,
-               libasm4-java,
+               libasm-java (>= 5.0),
                libatinject-jsr330-api-java,
                libbuild-helper-maven-plugin-java,
                libcglib-java (>= 3.2),
@@ -28,7 +28,7 @@ Package: libguice-java
 Architecture: all
 Depends: ${misc:Depends}, ${maven:Depends}
 Suggests: ${maven:OptionalDepends}
-Built-Using: libasm4-java (= ${asm:Version}), cglib (= ${cglib:Version})
+Built-Using: asm (= ${asm:Version}), cglib (= ${cglib:Version})
 Description: lightweight dependency injection framework for Java 5 and above
  Guice provides support for dependency injection using annotations to
  configure Java objects. Dependency injection is a design pattern whose
diff --git a/debian/maven.rules b/debian/maven.rules
index 32b2433..6e81cd6 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,3 +1,2 @@
 javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/3.1/ * *
 org.springframework spring-beans * s/.*/3.x/ * *
-org.ow2.asm asm* * s/.*/4.x/ * *
diff --git a/debian/rules b/debian/rules
index c7e471b..a964387 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 export JAVA_HOME=/usr/lib/jvm/default-java
 
 # Variables for the Built-Using field in the control file
-ASM_VERSION   := $(shell dpkg-query -f '$${source:Version}' --show libasm4-java)
+ASM_VERSION   := $(shell dpkg-query -f '$${source:Version}' --show libasm-java)
 CGLIB_VERSION := $(shell dpkg-query -f '$${source:Version}' --show libcglib-java)
 
 %:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/guice.git