[libxbean-java] 03/06: Depend on libasm-java (>= 5.0) instead of libasm4-java

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Sun Apr 10 22:38:16 UTC 2016


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

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

commit 51d3611fde1ef338fd3a6513ec59d0d441443b9e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Apr 11 00:05:52 2016 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 9659057..270c870 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libxbean-java (4.5-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 secure Vcs-* URLs
 
diff --git a/debian/control b/debian/control
index 902dfdb..23004e0 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends-Indep:
  ant-optional,
  groovy2,
  junit4,
- libasm4-java,
+ libasm-java (>= 5.0),
  libcglib3-java,
  libcommons-logging-java,
  libequinox-osgi-java,
@@ -50,7 +50,7 @@ Architecture: all
 Depends:
  ${misc:Depends}
 Recommends:
- libasm4-java,
+ libasm-java (>= 5.0),
  libcommons-logging-java,
  liblog4j1.2-java
 Suggests:
diff --git a/debian/maven.rules b/debian/maven.rules
index 4573bb5..1b725cd 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -21,7 +21,6 @@ junit junit jar s/4\..*/4.x/ * *
 log4j log4j jar s/1\.2\..*/1.2.x/ * *
 commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * *
 s/ant/org.apache.ant/ * * s/.*/debian/ * *
-org.ow2.asm * * s/.*/4.x/ * *
 org.springframework * * s/.*/3.x/ * *
 s/qdox/com.thoughtworks.qdox/ * * s/.*/debian/ * *
 s/org.apache.commons/commons-jexl/ commons-jexl jar s/.*/debian/ * *
diff --git a/debian/rules.bootstrap b/debian/rules.bootstrap
index 302d1f2..9e5e392 100644
--- a/debian/rules.bootstrap
+++ b/debian/rules.bootstrap
@@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 PACKAGE              := $(DEB_SOURCE_PACKAGE)
 JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_JARS             := ant-nodeps commons-logging groovy log4j-1.2 asm3 asm3-commons
+DEB_JARS             := ant-nodeps commons-logging groovy log4j-1.2 asm asm-commons
 DEB_ANT_BUILD_TARGET := package javadoc
 DEB_ANT_BUILDFILE    := debian/bootstrap.xml
 DEB_ANT_PROPERTYFILE := debian/bootstrap.properties
@@ -26,4 +26,4 @@ binary-post-install/$(PACKAGE)-doc::
 	dh_install -p $(PACKAGE)-doc build/docs/api /usr/share/doc/$(PACKAGE)/
 
 clean::
-	mh_clean
\ No newline at end of file
+	mh_clean

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



More information about the pkg-java-commits mailing list