[jetty9] 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 jetty9.

commit 1055f1969a27acdf1a1a8204761582ab869c52dc
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Apr 1 22:03:13 2016 +0200

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

diff --git a/debian/changelog b/debian/changelog
index fdd74e9..d9a35ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ jetty9 (9.2.14-2) UNRELEASED; urgency=medium
 
   * Standards-Version updated to 3.9.7 (no changes)
   * Use a secure Vcs-Git URL
+  * Depend on libasm-java (>= 5.0) instead of libasm4-java
 
  -- Emmanuel Bourg <ebourg at apache.org>  Fri, 01 Apr 2016 22:00:08 +0200
 
diff --git a/debian/control b/debian/control
index 58905cb..dbc544a 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,
                libmail-java,
                libjakarta-taglibs-standard-java (>= 1.1.2-4~),
@@ -45,7 +45,7 @@ Description: Java servlet engine and webserver -- core libraries
 Package: libjetty9-extra-java
 Architecture: all
 Depends: glassfish-jmac-api,
-         libasm4-java,
+         libasm-java (>= 5.0),
          libmail-java,
          libjakarta-taglibs-standard-java (>= 1.1.2-4~),
          libjetty9-java (>= ${source:Version}),
diff --git a/debian/jetty9.links b/debian/jetty9.links
index 9dd33c5..c9592db 100755
--- a/debian/jetty9.links
+++ b/debian/jetty9.links
@@ -48,8 +48,8 @@ usr/share/java/jetty9-xml.jar                   usr/share/jetty9/lib/jetty-xml-$
 
 usr/share/java/servlet-api-3.1.jar              usr/share/jetty9/lib/servlet-api-3.1.jar
 usr/share/java/tomcat8-annotations-api.jar      usr/share/jetty9/lib/annotations/javax.annotation.jar
-usr/share/java/asm4.jar                         usr/share/jetty9/lib/annotations/org.objectweb.asm.jar
-usr/share/java/asm4-commons.jar                 usr/share/jetty9/lib/annotations/org.objectweb.asm.commons.jar
+usr/share/java/asm.jar                          usr/share/jetty9/lib/annotations/org.objectweb.asm.jar
+usr/share/java/asm-commons.jar                  usr/share/jetty9/lib/annotations/org.objectweb.asm.commons.jar
 usr/share/java/ecj.jar                          usr/share/jetty9/lib/apache-jsp/jdt-core.jar
 usr/share/java/tomcat8-api.jar                  usr/share/jetty9/lib/apache-jsp/tomcat-api.jar
 usr/share/java/tomcat8-el-api.jar               usr/share/jetty9/lib/apache-jsp/tomcat-el-api.jar
diff --git a/debian/maven.rules b/debian/maven.rules
index 63fceba..e6710eb 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,4 +1,3 @@
-org.ow2.asm asm* * s/.*/4.x/ * *
 javax.servlet jstl jar s/.*/1.1/ * *
 javax.servlet.jsp javax.jsp-api jar s/.*/2.3/ * *
 javax.servlet javax.servlet-api * s/.*/3.1/ * *

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