diff -u libxstream-java-1.3.1/debian/changelog libxstream-java-1.3.1/debian/changelog --- libxstream-java-1.3.1/debian/changelog +++ libxstream-java-1.3.1/debian/changelog @@ -1,3 +1,9 @@ +libxstream-java (1.3.1-1ubuntu4) karmic; urgency=low + + * Add maven POM. LP: #461090. + + -- Matthias Klose Mon, 26 Oct 2009 16:44:26 +0100 + libxstream-java (1.3.1-1ubuntu3) karmic; urgency=low * debian/rules: Set JAVA_HOME to match with default-jdk diff -u libxstream-java-1.3.1/debian/rules libxstream-java-1.3.1/debian/rules --- libxstream-java-1.3.1/debian/rules +++ libxstream-java-1.3.1/debian/rules @@ -3,17 +3,27 @@ include /usr/share/cdbs/1/class/ant.mk include /usr/share/cdbs/1/rules/debhelper.mk +PACKAGE := $(DEB_SOURCE_PACKAGE) +VERSION := $(DEB_UPSTREAM_VERSION) JAVA_HOME := /usr/lib/jvm/default-java DEB_ANT_BUILDFILE := xstream/build.xml DEB_ANT_BUILD_TARGET := benchmark:compile jar -DEB_JARS := xom joda-time jettison cglib dom4j xpp3 jdom1 +DEB_JARS := ant-nodeps xom joda-time jettison cglib dom4j xpp3 jdom1 ANT_OPTS := -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 -install/libxstream-java:: - install -m644 -D xstream/target/xstream-SNAPSHOT.jar $(DEB_DESTDIR)/usr/share/java/xstream-$(DEB_UPSTREAM_VERSION).jar - dh_link -plibxstream-java /usr/share/java/xstream-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/xstream.jar - install -m644 -D xstream/target/xstream-benchmark-SNAPSHOT.jar $(DEB_DESTDIR)/usr/share/java/xstream-benchmark-$(DEB_UPSTREAM_VERSION).jar - dh_link -plibxstream-java /usr/share/java/xstream-benchmark-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/xstream-benchmark.jar +#install/libxstream-java:: +# install -m644 -D xstream/target/xstream-SNAPSHOT.jar $(DEB_DESTDIR)/usr/share/java/xstream-$(DEB_UPSTREAM_VERSION).jar +# dh_link -plibxstream-java /usr/share/java/xstream-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/xstream.jar +# install -m644 -D xstream/target/xstream-benchmark-SNAPSHOT.jar $(DEB_DESTDIR)/usr/share/java/xstream-benchmark-$(DEB_UPSTREAM_VERSION).jar +# dh_link -plibxstream-java /usr/share/java/xstream-benchmark-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/xstream-benchmark.jar + +binary-post-install/$(PACKAGE):: + mh_installpoms -p$(PACKAGE) + mh_installjar -p$(PACKAGE) -l xstream/pom.xml xstream/target/xstream-SNAPSHOT.jar + mh_installjar -p$(PACKAGE) -l xstream-benchmark/pom.xml xstream/target/xstream-benchmark-SNAPSHOT.jar + +clean:: + -rm -rf debian/tmp get-orig-source: uscan --force-download --rename diff -u libxstream-java-1.3.1/debian/control libxstream-java-1.3.1/debian/control --- libxstream-java-1.3.1/debian/control +++ libxstream-java-1.3.1/debian/control @@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 5), cdbs Build-Depends-Indep: ant, default-jdk, libxom-java, libjoda-time-java, libjettison-java, libcglib2.1-java, libdom4j-java, libxpp3-java, - libjdom1-java + libjdom1-java, maven-repo-helper Standards-Version: 3.8.0 Homepage: http://xstream.codehaus.org Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libxstream-java @@ -15,7 +15,7 @@ Package: libxstream-java Architecture: all -Depends: default-jre-headless | java5-runtime-headless +Depends: default-jre-headless | java5-runtime-headless, libxpp3-java Description: Java library to serialize objects to XML and back again The features of the XStream library are: . only in patch2: unchanged: --- libxstream-java-1.3.1.orig/debian/libxstream-java.poms +++ libxstream-java-1.3.1/debian/libxstream-java.poms @@ -0,0 +1,4 @@ +pom.xml --no-parent +xstream/pom.xml +xstream-benchmark/pom.xml + only in patch2: unchanged: --- libxstream-java-1.3.1.orig/debian/maven.rules +++ libxstream-java-1.3.1/debian/maven.rules @@ -0,0 +1 @@ +junit junit jar s/3\..*/3.x/