diff --git a/debian/changelog b/debian/changelog index e3214cd..56b75de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Thu, 03 Oct 2013 09:43:12 +0200 + libxstream-java (1.4.4-1) unstable; urgency=low * New upstream release diff --git a/debian/compat b/debian/compat index 7f8f011..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index 9436d45..28f232d 100644 --- a/debian/control +++ b/debian/control @@ -8,12 +8,13 @@ Emmanuel Bourg 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, diff --git a/debian/manifest b/debian/manifest index 653b440..e7f185c 100644 --- a/debian/manifest +++ b/debian/manifest @@ -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 diff --git a/debian/maven.rules b/debian/maven.rules index b1e7769..310fa97 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -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/ * * diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index bde943a..0bbb860 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -2,11 +2,11 @@ # called by uscan with '--upstream-version' 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' diff --git a/debian/rules b/debian/rules index a2176b3..bf95d95 100755 --- a/debian/rules +++ b/debian/rules @@ -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)