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

commit eed0ac7f21f15a59fe3407419c4e2a5f9d7d01c1
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Aug 10 22:53:21 2016 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 5aee283..405cf9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 jruby (1.7.25-1) UNRELEASED; urgency=medium
 
+  * Team upload.
+
+  [ Miguel Landaeta ]
   * New upstream release.
   * Fix FTBFS due to changes introduced in yecht 1.1 and snakeyaml 1.7.
     (Closes: #821181).
@@ -7,6 +10,9 @@ jruby (1.7.25-1) UNRELEASED; urgency=medium
   * Bump Standards-Version to 3.9.8. No changes were required.
   * Use https URLs with Vcs-* fields.
 
+  [ Emmanuel Bourg ]
+  * Depend on libasm-java (>= 5.0) instead of libasm4-java
+
  -- Miguel Landaeta <nomadium at debian.org>  Sat, 23 Apr 2016 15:23:53 +0100
 
 jruby (1.7.22-2) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 34a2378..f3b7226 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: ant-optional,
                default-jdk (>= 2:1.8~),
                jruby-openssl,
                junit4,
-               libasm4-java,
+               libasm-java (>= 5.0),
                libbsf-java,
                libbuild-helper-maven-plugin-java,
                libbytelist-java (>= 1.0.12~),
@@ -63,7 +63,7 @@ Architecture: all
 Depends: default-jre | java6-runtime,
          ant,
          junit4,
-         libasm4-java,
+         libasm-java (>= 5.0),
          libbsf-java,
          libbytelist-java (>= 1.0.12~),
          libheadius-options-java,
diff --git a/debian/maven.rules b/debian/maven.rules
index 1f80c92..1734ff2 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,4 +1,3 @@
-org.ow2.asm * jar s/.*/4.x/ * *
 org.jruby.extras bytelist jar s/.*/debian/ * *
 org.yaml snakeyaml jar s/.*/1.x/ * *
 junit junit jar s/.*/4.x/ * *

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