[pkg-java] r18476 - trunk/libxstream-java/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-09-29 17:15:06 +0000 (Mon, 29 Sep 2014)
New Revision: 18476

Modified:
   trunk/libxstream-java/debian/changelog
   trunk/libxstream-java/debian/control
   trunk/libxstream-java/debian/manifest
   trunk/libxstream-java/debian/maven.rules
   trunk/libxstream-java/debian/rules
Log:
Depend on libcglib3-java instead of libcglib-java



Modified: trunk/libxstream-java/debian/changelog
===================================================================
--- trunk/libxstream-java/debian/changelog	2014-09-29 14:44:46 UTC (rev 18475)
+++ trunk/libxstream-java/debian/changelog	2014-09-29 17:15:06 UTC (rev 18476)
@@ -1,3 +1,9 @@
+libxstream-java (1.4.7-2) UNRELEASED; urgency=medium
+
+  * Depend on libcglib3-java instead of libcglib-java
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 29 Sep 2014 19:14:04 +0200
+
 libxstream-java (1.4.7-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/libxstream-java/debian/control
===================================================================
--- trunk/libxstream-java/debian/control	2014-09-29 14:44:46 UTC (rev 18475)
+++ trunk/libxstream-java/debian/control	2014-09-29 17:15:06 UTC (rev 18476)
@@ -11,7 +11,7 @@
                debhelper (>= 9),
                default-jdk,
                javahelper,
-               libcglib-java,
+               libcglib3-java,
                libdom4j-java,
                libjdom1-java,
                libjdom2-java,
@@ -33,7 +33,7 @@
 Package: libxstream-java
 Architecture: all
 Depends: libxpp3-java, ${misc:Depends}
-Suggests: libcglib-java,
+Suggests: libcglib3-java,
           libdom4j-java,
           libjdom1-java,
           libjdom2-java,

Modified: trunk/libxstream-java/debian/manifest
===================================================================
--- trunk/libxstream-java/debian/manifest	2014-09-29 14:44:46 UTC (rev 18475)
+++ trunk/libxstream-java/debian/manifest	2014-09-29 17:15:06 UTC (rev 18476)
@@ -1,2 +1,2 @@
 usr/share/java/xstream.jar:
- Class-Path: cglib.jar dom4j.jar jdom1.jar jdom2.jar jettison.jar joda-time.jar xom.jar xpp3.jar xpp3-xpath.jar
+ Class-Path: cglib3.jar dom4j.jar jdom1.jar jdom2.jar jettison.jar joda-time.jar xom.jar xpp3.jar xpp3-xpath.jar

Modified: trunk/libxstream-java/debian/maven.rules
===================================================================
--- trunk/libxstream-java/debian/maven.rules	2014-09-29 14:44:46 UTC (rev 18475)
+++ trunk/libxstream-java/debian/maven.rules	2014-09-29 17:15:06 UTC (rev 18476)
@@ -30,3 +30,4 @@
 org.codehaus.jettison jettison s/bundle/jar/ s/.*/debian/ * *
 s/hsqldb/org.hsqldb/ hsqldb * s/.*/debian/ * *
 s/jboss/javassist/ javassist * s/.*/debian/ * *
+cglib cglib * s/.*/3.x/ * *

Modified: trunk/libxstream-java/debian/rules
===================================================================
--- trunk/libxstream-java/debian/rules	2014-09-29 14:44:46 UTC (rev 18475)
+++ trunk/libxstream-java/debian/rules	2014-09-29 17:15:06 UTC (rev 18476)
@@ -6,7 +6,7 @@
 PACKAGE              := $(DEB_SOURCE_PACKAGE)
 VERSION              := $(DEB_UPSTREAM_VERSION)
 JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_JARS             := ant-nodeps xom joda-time jettison cglib dom4j xpp3 jdom1 jdom2 stax woodstox-core-lgpl kxml2 stax2-api
+DEB_JARS             := ant-nodeps xom joda-time jettison cglib3 dom4j xpp3 jdom1 jdom2 stax woodstox-core-lgpl kxml2 stax2-api
 DEB_ANT_BUILD_TARGET := package javadoc
 DEB_ANT_BUILDFILE    := debian/build.xml
 DEB_ANT_ARGS         := -Dbasedir=$(realpath .) -Dpackage=xstream -Dversion=$(VERSION)