[libxstream-java] 05/05: Depend on libcglib-nodep-java instead of libcglib3-java

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Tue Mar 29 09:24:44 UTC 2016


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

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

commit a0300af9b54ee8eb5e0936ab3c1273dd121a4a24
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Mar 29 11:21:09 2016 +0200

    Depend on libcglib-nodep-java instead of libcglib3-java
---
 debian/changelog   | 1 +
 debian/control     | 2 +-
 debian/manifest    | 2 +-
 debian/maven.rules | 1 -
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 13c662f..70a32dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libxstream-java (1.4.8-2) UNRELEASED; urgency=medium
 
   * Build with maven-debian-helper
+  * Depend on libcglib-nodep-java instead of libcglib3-java
   * Standards-Version updated to 3.9.7 (no changes)
   * Use secure Vcs-* fields
   * Updated the old references to codehaus.org
diff --git a/debian/control b/debian/control
index c20efec..8ab431e 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: maven-debian-helper,
                default-jdk,
                javahelper,
                libbuild-helper-maven-plugin-java,
-               libcglib3-java,
+               libcglib-nodep-java,
                libdom4j-java,
                libjdom1-java,
                libjdom2-java,
diff --git a/debian/manifest b/debian/manifest
index ffe0b53..9bf85de 100644
--- a/debian/manifest
+++ b/debian/manifest
@@ -1,2 +1,2 @@
 usr/share/java/xstream.jar:
- Class-Path: cglib3.jar dom4j.jar jdom1.jar jdom2.jar jettison.jar joda-time.jar xom.jar xpp3.jar xpp3-xpath.jar
+ Class-Path: cglib-nodep.jar dom4j.jar jdom1.jar jdom2.jar jettison.jar joda-time.jar xom.jar xpp3.jar xpp3-xpath.jar
diff --git a/debian/maven.rules b/debian/maven.rules
index c468ef6..53dba65 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -21,5 +21,4 @@ org.jdom jdom2 jar s/.*/debian/ * *
 s/net.sf.kxml/kxml2/ kxml2-min jar s/.*/debian/ * *
 s/net.sf.kxml/kxml2/ kxml2 jar s/.*/debian/ * *
 org.codehaus.jettison jettison s/bundle/jar/ s/.*/debian/ * *
-cglib cglib* * s/.*/3.x/ * *
 org.codehaus.woodstox s/wstx-asl/woodstox-core-lgpl/ * s/.*/debian/ * *

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



More information about the pkg-java-commits mailing list