[plexus-containers1.5] 03/07: Depend on asm4 instead of asm3 (Closes: #800862)

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository plexus-containers1.5.

commit 017e7bda9e7885750f4b3e33aa521861c39a8bf8
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Nov 19 12:38:30 2015 +0100

    Depend on asm4 instead of asm3 (Closes: #800862)
---
 debian/changelog   | 1 +
 debian/control     | 4 ++--
 debian/maven.rules | 2 +-
 debian/rules       | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c2424e7..bc60395 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ plexus-containers1.5 (1.6-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream release
     - Removed 01-classworlds-compatibility.patch (fixed upstream)
+    - Depend on asm4 instead of asm3 (Closes: #800862)
   * debian/watch: Track the release tags on GitHub
   * Updated Standards-Version to 3.9.6 (no changes)
 
diff --git a/debian/control b/debian/control
index 0f865f8..18dafc6 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: cdbs, debhelper (>= 9), default-jdk
 Build-Depends-Indep: ant,
                      ant-optional,
                      junit,
-                     libasm3-java,
+                     libasm4-java,
                      libcommons-cli-java,
                      libguava-java,
                      libjdom1-java,
@@ -26,7 +26,7 @@ Homepage: http://plexus.codehaus.org/plexus-containers/
 
 Package: libplexus-containers1.5-java
 Architecture: all
-Depends: libasm3-java,
+Depends: libasm4-java,
          libcommons-cli-java,
          libguava-java,
          libjdom1-java,
diff --git a/debian/maven.rules b/debian/maven.rules
index 0438aba..3a22037 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -16,7 +16,7 @@
 # and version starting with 3., replacing the version with 3.x
 #   junit junit jar s/3\\..*/3.x/
 
-asm asm jar s/.*/3.x/ * *
+org.ow2.asm asm* jar s/.*/4.x/ * *
 s/jdom/org.jdom/ jdom jar s/.*/debian/ * *
 junit junit jar s/.*/3.x/ * *
 s/qdox/com.thoughtworks.qdox/ * * s/.*/debian/ * *
diff --git a/debian/rules b/debian/rules
index ca4bd50..98af26d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ include /usr/share/cdbs/1/class/ant.mk
 PACKAGE              := $(DEB_SOURCE_PACKAGE)
 VERSION              := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -s "s/~beta/-beta-/")
 JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_JARS             := ant-nodeps asm3 asm3-core commons-cli guava \
+DEB_JARS             := ant-nodeps asm4 asm4-core commons-cli guava \
                         jdom1 junit maven-artifact maven-artifact-manager maven-core \
                         maven-model maven-plugin-api maven-project maven2 \
                         plexus-classworlds2 plexus-cli plexus-utils2 qdox xbean-reflect

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