[libquartz2-java] 51/63: Build depend on libasm-java (>= 5.0) instead of libasm4-java

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Thu Apr 14 10:32:51 UTC 2016


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

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

commit a34744736aa0fd7eb0831527434f9b79bb8fbf88
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Apr 3 16:31:40 2016 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 2d674b0..f6c9f32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libquartz-java (1:1.8.6-2) UNRELEASED; urgency=medium
 
   * Team upload.
   * Build with the DH sequencer instead of CDBS
+  * Build depend on libasm-java (>= 5.0) instead of libasm4-java
   * Standards-Version updated to 3.9.7 (no changes)
   * Use secure Vcs-* fields
 
diff --git a/debian/control b/debian/control
index 3c91dd7..26e0f2d 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends-Indep: default-jdk-doc,
                      glassfish-activation,
                      glassfish-javaee,
                      junit,
-                     libasm4-java,
+                     libasm-java (>= 5.0),
                      libcommons-beanutils-java-doc,
                      libcommons-dbcp-java,
                      libcommons-dbcp-java-doc,
diff --git a/debian/maven.rules b/debian/maven.rules
index 70796b6..0645ae3 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -16,8 +16,7 @@
 # and version starting with 3., replacing the version with 3.x
 #   junit junit jar s/3\..*/3.x/
 
-s/asm/org.ow2.asm/ asm jar s/.*/4.x/ * *
-s/asm/org.ow2.asm/ * * s/.*/4.x/ * *
+s/asm/org.ow2.asm/ * * s/.*/debian/ * *
 junit junit jar s/3\..*/3.x/ * *
 junit s/junit-dep/junit jar s/4\..*/4.x/ * *
 log4j log4j jar s/1\.2.*/1.2.x/ * *

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



More information about the pkg-java-commits mailing list