[jetty8] 03/05: 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 jetty8.

commit 9b7b5e10b17721a1ba9b69961aa4755fc8239c08
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue May 17 11:04:29 2016 +0200

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

diff --git a/debian/changelog b/debian/changelog
index dcd05ef..40966d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 jetty8 (8.1.19-2) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Depend on libasm-java (>= 5.0) instead of libasm4-java
   * Standards-Version updated to 3.9.8 (no changes)
   * Use a secure Vcs-Git URL
 
diff --git a/debian/control b/debian/control
index e76c963..b370130 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: ant-optional,
                glassfish-jmac-api (>= 1:2.1.1-b31g-2),
                javahelper,
                junit,
-               libasm4-java,
+               libasm-java (>= 5.0),
                libbuild-helper-maven-plugin-java,
                libgeronimo-jta-1.1-spec-java,
                libmail-java,
@@ -58,7 +58,7 @@ Description: Javadoc for the Jetty API
 
 Package: libjetty8-extra-java
 Architecture: all
-Depends: libasm4-java,
+Depends: libasm-java (>= 5.0),
          libmail-java,
          libjakarta-taglibs-standard-java,
          libjetty8-java (>= ${source:Version}),
diff --git a/debian/maven.rules b/debian/maven.rules
index 1834214..07c6e6e 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,4 +1,4 @@
-s/asm/org.ow2.asm/ asm* * s/.*/4.x/ * *
+s/asm/org.ow2.asm/ asm* * s/.*/debian/ * *
 javax.servlet jstl jar s/.*/1.1/ * *
 javax.servlet.jsp jsp-api jar s/.*/2.2/ * *
 javax.servlet servlet-api jar s/.*/3.0/ * *

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