Author: drazzib Date: 2012-05-28 22:24:17 +0000 (Mon, 28 May 2012) New Revision: 16070
Added: trunk/libxstream-java/debian/build.properties trunk/libxstream-java/debian/build.xml trunk/libxstream-java/debian/manifest trunk/libxstream-java/debian/maven.ignoreRules Removed: trunk/libxstream-java/debian/patches/01_fix_classpath.diff Modified: trunk/libxstream-java/debian/changelog trunk/libxstream-java/debian/control trunk/libxstream-java/debian/libxstream-java.poms trunk/libxstream-java/debian/maven.rules trunk/libxstream-java/debian/patches/series trunk/libxstream-java/debian/rules Log: * Update Standards-Version: 3.9.3. * New upstream release: - Add Build-Depends on libstax-java, libwoodstox-java, libstax2-api-java and libkxml2-java (and Suggests). * Use maven-ant-helper for build: - Add Build-Depends on maven-ant-helper. - New debian/build.xml. - Drop patch on MANIFEST.MF update and use jh_manifest. - Add Build-Depends on javahelper. * Add myself as Uploader. Added: trunk/libxstream-java/debian/build.properties =================================================================== --- trunk/libxstream-java/debian/build.properties (rev 0) +++ trunk/libxstream-java/debian/build.properties 2012-05-28 22:24:17 UTC (rev 16070) @@ -0,0 +1,7 @@ +ant.build.javac.source=1.5 +ant.build.javac.target=1.5 + +javadoc.dir=target/api +build.sourceDirectory=src/java +classpath.compile=\ + ${basedir}/xstream/build/xstream-${version}.jar \ No newline at end of file Added: trunk/libxstream-java/debian/build.xml =================================================================== --- trunk/libxstream-java/debian/build.xml (rev 0) +++ trunk/libxstream-java/debian/build.xml 2012-05-28 22:24:17 UTC (rev 16070) @@ -0,0 +1,47 @@ +<?xml version="1.0"?> + +<project name="xstream" default="package" basedir=".."> + + <property file="debian/build.properties"/> + <property name="maven.build" value="/usr/share/maven-ant-helper/maven-build.xml"/> + <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/> + + <macrodef name="cleanmodule"> + <attribute name="dir"/> + <sequential> + <ant target="clean" antfile="${maven.build}" dir="@{dir}"> + <property name="debian.dir" location="debian" /> + <property name="project.dir" value="@{dir}" /> + </ant> + </sequential> + </macrodef> + + <macrodef name="packagemodule"> + <attribute name="dir"/> + <sequential> + <ant target="package" antfile="${maven.build}" dir="@{dir}"> + <property name="debian.dir" location="debian" /> + <property name="project.dir" value="@{dir}" /> + </ant> + </sequential> + </macrodef> + + <target name="clean"> + <delete dir="build"/> + <cleanmodule dir="xstream/"/> + <cleanmodule dir="xstream-benchmark/"/> + </target> + + <target name="package"> + <packagemodule dir="xstream/"/> + <packagemodule dir="xstream-benchmark/"/> + </target> + + <target name="javadoc"> + <javadoc destdir="${javadoc.dir}"> + <packageset dir="xstream/src/java/"/> + <packageset dir="xstream-benchmark/src/java/"/> + </javadoc> + </target> + +</project> Modified: trunk/libxstream-java/debian/changelog =================================================================== --- trunk/libxstream-java/debian/changelog 2012-05-27 14:45:43 UTC (rev 16069) +++ trunk/libxstream-java/debian/changelog 2012-05-28 22:24:17 UTC (rev 16070) @@ -1,11 +1,22 @@ -libxstream-java (1.3.1-8) UNRELEASED; urgency=low +libxstream-java (1.4.2-1) unstable; urgency=low - * Team upload. + [ tony mancill ] * Remove Michael Koch from Uploaders (Closes: #654106) - * Update Standards-Version: 3.9.2. + * Update Standards-Version: 3.9.3. - -- tony mancill <tmanc...@debian.org> Sat, 14 Jan 2012 10:26:44 -0800 + [ Damien Raude-Morvan ] + * New upstream release: + - Add Build-Depends on libstax-java, libwoodstox-java, libstax2-api-java + and libkxml2-java (and Suggests). + * Use maven-ant-helper for build: + - Add Build-Depends on maven-ant-helper. + - New debian/build.xml. + - Drop patch on MANIFEST.MF update and use jh_manifest. + - Add Build-Depends on javahelper. + * Add myself as Uploader. + -- Damien Raude-Morvan <draz...@debian.org> Mon, 28 May 2012 23:14:16 +0200 + libxstream-java (1.3.1-7) unstable; urgency=low * Switch to source format 3.0. Modified: trunk/libxstream-java/debian/control =================================================================== --- trunk/libxstream-java/debian/control 2012-05-27 14:45:43 UTC (rev 16069) +++ trunk/libxstream-java/debian/control 2012-05-28 22:24:17 UTC (rev 16070) @@ -2,21 +2,45 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> -Uploaders: Torsten Werner <twer...@debian.org>, Varun Hiremath <va...@debian.org> -Build-Depends: debhelper (>= 7), cdbs -Build-Depends-Indep: ant, default-jdk, libxom-java, libjoda-time-java, - libjettison-java, libcglib-java, libdom4j-java, libxpp3-java, - libjdom1-java, maven-repo-helper -Standards-Version: 3.9.2 +Uploaders: Torsten Werner <twer...@debian.org>, + Varun Hiremath <va...@debian.org>, + Damien Raude-Morvan <draz...@debian.org> +Build-Depends: ant, + cdbs, + debhelper (>= 7), + default-jdk, + javahelper, + libcglib-java, + libdom4j-java, + libjdom1-java, + libjettison-java, + libjoda-time-java, + libkxml2-java, + libstax-java, + libstax2-api-java, + libwoodstox-java, + libxom-java, + libxpp3-java, + maven-ant-helper, + maven-repo-helper +Standards-Version: 3.9.3 Homepage: http://xstream.codehaus.org Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libxstream-java Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libxstream-java Package: libxstream-java Architecture: all -Depends: ${misc:Depends}, libxpp3-java -Suggests: libdom4j-java, libjdom1-java, libjoda-time-java, libstax-java, - libxom-java, libcglib2.1-java, libjettison-java +Depends: libxpp3-java, ${misc:Depends} +Suggests: libcglib-java, + libdom4j-java, + libjdom1-java, + libjettison-java, + libjoda-time-java, + libkxml2-java, + libstax-java, + libstax2-api-java, + libwoodstox-java, + libxom-java Description: Java library to serialize objects to XML and back again The features of the XStream library are: . Modified: trunk/libxstream-java/debian/libxstream-java.poms =================================================================== --- trunk/libxstream-java/debian/libxstream-java.poms 2012-05-27 14:45:43 UTC (rev 16069) +++ trunk/libxstream-java/debian/libxstream-java.poms 2012-05-28 22:24:17 UTC (rev 16070) @@ -1,4 +1,3 @@ pom.xml --no-parent -xstream/pom.xml -xstream-benchmark/pom.xml - +xstream/pom.xml --java-lib +xstream-benchmark/pom.xml --java-lib Added: trunk/libxstream-java/debian/manifest =================================================================== --- trunk/libxstream-java/debian/manifest (rev 0) +++ trunk/libxstream-java/debian/manifest 2012-05-28 22:24:17 UTC (rev 16070) @@ -0,0 +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 Added: trunk/libxstream-java/debian/maven.ignoreRules =================================================================== --- trunk/libxstream-java/debian/maven.ignoreRules (rev 0) +++ trunk/libxstream-java/debian/maven.ignoreRules 2012-05-28 22:24:17 UTC (rev 16070) @@ -0,0 +1,36 @@ +# Maven ignore rules - ignore some Maven dependencies and plugins +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# All elements much match before a rule can be applied +# Example rule: match jar with groupid= junit, artifactid= junit +# and version starting with 3., this dependency is then removed +# from the POM +# junit junit jar s/3\..*/3.x/ + +com.megginson.sax xml-writer * * * * +commons-cli commons-cli * * * * +commons-io commons-io * * * * +commons-lang commons-lang * * * * +jmock jmock * * * * +org.apache.maven.plugins maven-assembly-plugin * * * * +org.apache.maven.plugins maven-eclipse-plugin * * * * +org.apache.maven.plugins maven-enforcer-plugin * * * * +org.apache.maven.plugins maven-javadoc-plugin * * * * +org.apache.maven.plugins maven-release-plugin * * * * +org.apache.maven.plugins maven-source-plugin * * * * +org.apache.maven.plugins maven-surefire-plugin * * * * +org.apache.maven.plugins maven-surefire-report-plugin * * * * +org.apache.maven.wagon wagon-webdav * * * * +org.codehaus.mojo cobertura-maven-plugin * * * * +org.codehaus.mojo jxr-maven-plugin * * * * +org.codehaus.woodstox wstx-asl * * * * +org.json json * * * * +oro oro * * * * +xmlpull xmlpull * * * * Modified: trunk/libxstream-java/debian/maven.rules =================================================================== --- trunk/libxstream-java/debian/maven.rules 2012-05-27 14:45:43 UTC (rev 16069) +++ trunk/libxstream-java/debian/maven.rules 2012-05-28 22:24:17 UTC (rev 16070) @@ -1 +1,31 @@ -junit junit jar s/3\..*/3.x/ +# Maven rules - transform Maven dependencies and plugins +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# - a regular expression of the form s/match/replace/ +# in this case, elements that match are transformed using +# the regex rule. +# All elements much match before a rule can be applied +# Example rule: match jar with groupid= junit, artifactid= junit +# and version starting with 3., replacing the version with 3.x +# junit junit jar s/3\..*/3.x/ + +com.thoughtworks.xstream xstream-benchmark jar s/.*/debian/ * * +com.thoughtworks.xstream xstream-distribution pom s/.*/debian/ * * +com.thoughtworks.xstream xstream-hibernate jar s/.*/debian/ * * +com.thoughtworks.xstream xstream-parent pom s/.*/debian/ * * +com.thoughtworks.xstream xstream jar s/.*/debian/ * * +s/jdom/org.jdom/ jdom jar s/1\..*/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/ * * +junit junit jar s/3\..*/3.x/ * * +org.codehaus.jettison jettison s/bundle/jar/ s/.*/debian/ * * +s/hsqldb/org.hsqldb/ hsqldb * s/.*/debian/ * * +s/jboss/javassist/ javassist * s/.*/debian/ * * Deleted: trunk/libxstream-java/debian/patches/01_fix_classpath.diff =================================================================== --- trunk/libxstream-java/debian/patches/01_fix_classpath.diff 2012-05-27 14:45:43 UTC (rev 16069) +++ trunk/libxstream-java/debian/patches/01_fix_classpath.diff 2012-05-28 22:24:17 UTC (rev 16070) @@ -1,28 +0,0 @@ -Index: libxstream-java-1.3.1/xstream/build.xml -=================================================================== ---- libxstream-java-1.3.1.orig/xstream/build.xml 2009-11-04 21:39:34.000000000 +0530 -+++ libxstream-java-1.3.1/xstream/build.xml 2009-11-04 21:41:56.000000000 +0530 -@@ -25,6 +25,7 @@ - <property name="test.src.includes" value="**/*Test.java"/> - <property name="test.src.excludes" value="**/Abstract*"/> - <property name="junit.haltonfailure" value="false"/> -+ <property name="manifest.classpath" value="cglib.jar dom4j.jar jdom1.jar jettison.jar joda-time.jar xom.jar xpp3.jar xpp3-xpath.jar"/> - - <available property="jdk1.4.available" classname="java.lang.StackTraceElement"/> - <available property="jdk1.5.available" classname="java.lang.Enum"/> -@@ -144,9 +145,15 @@ - - <target name="jar" depends="compile"> - <jar jarfile="${build.dir}/xstream-${version}.jar"> -+ <manifest> -+ <attribute name="Class-Path" value="${manifest.classpath}"/> -+ </manifest> - <fileset dir="${java.build.dir}"/> - </jar> - <jar jarfile="${build.dir}/xstream-benchmark-${version}.jar"> -+ <manifest> -+ <attribute name="Class-Path" value="${manifest.classpath}"/> -+ </manifest> - <fileset dir="${benchmark.build.dir}"/> - </jar> - <antcall target="jdk-check"/> Modified: trunk/libxstream-java/debian/patches/series =================================================================== --- trunk/libxstream-java/debian/patches/series 2012-05-27 14:45:43 UTC (rev 16069) +++ trunk/libxstream-java/debian/patches/series 2012-05-28 22:24:17 UTC (rev 16070) @@ -1 +0,0 @@ -01_fix_classpath.diff Modified: trunk/libxstream-java/debian/rules =================================================================== --- trunk/libxstream-java/debian/rules 2012-05-27 14:45:43 UTC (rev 16069) +++ trunk/libxstream-java/debian/rules 2012-05-28 22:24:17 UTC (rev 16070) @@ -1,23 +1,27 @@ #!/usr/bin/make -f +include /usr/share/cdbs/1/rules/debhelper.mk 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 := ant-nodeps xom joda-time jettison cglib dom4j xpp3 jdom1 -ANT_OPTS := -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 +DEB_JARS := ant-nodeps xom joda-time jettison cglib dom4j xpp3 jdom1 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) +pre-build:: + -rm xstream/src/java/com/thoughtworks/xstream/converters/reflection/HarmonyReflectionProvider.java + 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 + mh_installjar -p$(PACKAGE) -l xstream/pom.xml xstream/build/xstream-$(VERSION).jar + mh_installjar -p$(PACKAGE) -l xstream-benchmark/pom.xml xstream-benchmark/build/xstream-benchmark-$(VERSION).jar + jh_manifest clean:: - -rm -rf debian/tmp + mh_clean get-orig-source: - uscan --force-download --rename + uscan --force-download --rename _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits