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

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-10-16 07:00:29 +0000 (Wed, 16 Oct 2013)
New Revision: 17332

Modified:
   trunk/libxstream-java/debian/changelog
   trunk/libxstream-java/debian/compat
   trunk/libxstream-java/debian/control
   trunk/libxstream-java/debian/manifest
   trunk/libxstream-java/debian/maven.rules
   trunk/libxstream-java/debian/orig-tar.sh
   trunk/libxstream-java/debian/rules
Log:
New upstream release (1.4.5)



Modified: trunk/libxstream-java/debian/changelog
===================================================================
--- trunk/libxstream-java/debian/changelog	2013-10-15 18:35:12 UTC (rev 17331)
+++ trunk/libxstream-java/debian/changelog	2013-10-16 07:00:29 UTC (rev 17332)
@@ -1,3 +1,12 @@
+libxstream-java (1.4.5-1) UNRELEASED; urgency=low
+
+  * New upstream release
+    - Added a dependency on libjdom2-java
+  * Use XZ compression for the upstream tarball
+  * Build depend on debhelper >= 9
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 03 Oct 2013 09:43:12 +0200
+
 libxstream-java (1.4.4-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/libxstream-java/debian/compat
===================================================================
--- trunk/libxstream-java/debian/compat	2013-10-15 18:35:12 UTC (rev 17331)
+++ trunk/libxstream-java/debian/compat	2013-10-16 07:00:29 UTC (rev 17332)
@@ -1 +1 @@
-7
+9

Modified: trunk/libxstream-java/debian/control
===================================================================
--- trunk/libxstream-java/debian/control	2013-10-15 18:35:12 UTC (rev 17331)
+++ trunk/libxstream-java/debian/control	2013-10-16 07:00:29 UTC (rev 17332)
@@ -8,12 +8,13 @@
            Emmanuel Bourg <ebourg at apache.org>
 Build-Depends: ant,
                cdbs,
-               debhelper (>= 7),
+               debhelper (>= 9),
                default-jdk,
                javahelper,
                libcglib-java,
                libdom4j-java,
                libjdom1-java,
+               libjdom2-java,
                libjettison-java,
                libjoda-time-java,
                libkxml2-java,
@@ -35,6 +36,7 @@
 Suggests: libcglib-java,
           libdom4j-java,
           libjdom1-java,
+          libjdom2-java,
           libjettison-java,
           libjoda-time-java,
           libkxml2-java,

Modified: trunk/libxstream-java/debian/manifest
===================================================================
--- trunk/libxstream-java/debian/manifest	2013-10-15 18:35:12 UTC (rev 17331)
+++ trunk/libxstream-java/debian/manifest	2013-10-16 07:00:29 UTC (rev 17332)
@@ -1,2 +1,2 @@
 usr/share/java/xstream.jar:
- Class-Path: cglib.jar dom4j.jar jdom1.jar jettison.jar joda-time.jar xom.jar xpp3.jar xpp3-xpath.jar
\ No newline at end of file
+ Class-Path: cglib.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	2013-10-15 18:35:12 UTC (rev 17331)
+++ trunk/libxstream-java/debian/maven.rules	2013-10-16 07:00:29 UTC (rev 17332)
@@ -22,6 +22,7 @@
 com.thoughtworks.xstream xstream-parent pom s/.*/debian/ * *
 com.thoughtworks.xstream xstream jar s/.*/debian/ * *
 s/jdom/org.jdom/ jdom jar s/1\..*/debian/ * *
+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/ * *
 joda-time joda-time jar s/.*/debian/ * *

Modified: trunk/libxstream-java/debian/orig-tar.sh
===================================================================
--- trunk/libxstream-java/debian/orig-tar.sh	2013-10-15 18:35:12 UTC (rev 17331)
+++ trunk/libxstream-java/debian/orig-tar.sh	2013-10-16 07:00:29 UTC (rev 17332)
@@ -2,11 +2,11 @@
 
 # called by uscan with '--upstream-version' <version> <file>
 DIR=xstream-$2
-TAR=../libxstream-java_$2.orig.tar.gz
+TAR=../libxstream-java_$2.orig.tar.xz
 
 # clean up the upstream tarball
 unzip $3
-GZIP=--best tar -c -z -f $TAR --exclude '*.jar' $DIR
+XZ_OPT=--best tar -c -J -f $TAR --exclude '*.jar' $DIR
 rm -rf $DIR $3
 
 # move to directory 'tarballs'

Modified: trunk/libxstream-java/debian/rules
===================================================================
--- trunk/libxstream-java/debian/rules	2013-10-15 18:35:12 UTC (rev 17331)
+++ trunk/libxstream-java/debian/rules	2013-10-16 07:00:29 UTC (rev 17332)
@@ -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 stax woodstox-core-lgpl kxml2 stax2-api
+DEB_JARS             := ant-nodeps xom joda-time jettison cglib 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)