This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libxpp3-java.
commit 1076998da4b46226073e5fec30a1f40b44ee7c60 Author: Ludovic Claude <ludovic.cla...@laposte.net> Date: Sat Aug 15 10:46:24 2009 +0000 * New upstream version * Add myself to Uploaders * Add ${misc:Depends} to Depends to clear Lintian warnings * Remove Depends on Java runtimes as it is a library * Change section to java * Bump up Standards-Version to 3.8.2 * Add the Maven POM to the package * Add a Build-Depends-Indep dependency on maven-repo-helper and quilt * Use quilt to patch the sources, easier to work with * Use default-jdk instead of kaffe for the build --- debian/changelog | 15 +++ debian/control | 10 +- debian/libxpp3-java.poms | 4 + debian/patches/01_Buildxml_apidoc.patch | 12 --- debian/patches/02_Buildxml_target.patch | 47 ---------- debian/patches/03_exclude_javax_xml.patch | 11 --- debian/patches/build.patch | 150 ++++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 33 ++++--- debian/xpp3.pom | 40 ++++++++ debian/xpp3_min.pom | 32 +++++++ debian/xpp3_xpath.pom | 13 +++ 12 files changed, 282 insertions(+), 86 deletions(-) diff --git a/debian/changelog b/debian/changelog index fc5c282..24d93ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +libxpp3-java (1.1.4c-1) unstable; urgency=low + + * New upstream version + * Add myself to Uploaders + * Add ${misc:Depends} to Depends to clear Lintian warnings + * Remove Depends on Java runtimes as it is a library + * Change section to java + * Bump up Standards-Version to 3.8.2 + * Add the Maven POM to the package + * Add a Build-Depends-Indep dependency on maven-repo-helper and quilt + * Use quilt to patch the sources, easier to work with + * Use default-jdk instead of kaffe for the build + + -- Ludovic Claude <ludovic.cla...@laposte.net> Tue, 28 Jul 2009 23:33:35 +0100 + libxpp3-java (1.1.3.4.O-4) unstable; urgency=low * Do not include the javax.xml.namespace.QName class since it is likely diff --git a/debian/control b/debian/control index b0e5f9b..9c34a95 100644 --- a/debian/control +++ b/debian/control @@ -1,16 +1,16 @@ Source: libxpp3-java -Section: libs +Section: java Priority: optional Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Marcus Better <mar...@better.se> -Build-Depends: debhelper, cdbs, ant, ant-optional -Build-Depends-Indep: kaffe, junit -Standards-Version: 3.8.0.1 +Build-Depends: debhelper, cdbs, ant, ant-optional, default-jdk, quilt +Build-Depends-Indep: junit, maven-repo-helper +Standards-Version: 3.8.2 Homepage: http://www.extreme.indiana.edu/xgws/xsoap/xpp Package: libxpp3-java Architecture: all -Depends: kaffe | java1-runtime | java2-runtime +Depends: ${misc:Depends} Description: XML pull parser library for java Xml Pull Parser (in short XPP) is a streaming pull XML parser for java. This version XPP3 is a successor of XPP2 (see package libxpp2-java) that diff --git a/debian/libxpp3-java.poms b/debian/libxpp3-java.poms new file mode 100644 index 0000000..78f0e0d --- /dev/null +++ b/debian/libxpp3-java.poms @@ -0,0 +1,4 @@ +debian/xpp3.pom +debian/xpp3_min.pom +debian/xpp3_xpath.pom + diff --git a/debian/patches/01_Buildxml_apidoc.patch b/debian/patches/01_Buildxml_apidoc.patch deleted file mode 100644 index f968287..0000000 --- a/debian/patches/01_Buildxml_apidoc.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- build.xml.orig 2005-04-23 15:43:52.000000000 +0200 -+++ build.xml 2005-04-23 15:40:53.000000000 +0200 -@@ -477,8 +477,7 @@ - use="true" - windowtitle="${name} ${version} API" - doctitle="${name}" -- bottom="${copyright}" -- link="http://java.sun.com/j2se/1.4/docs/api/" -+ bottom="${copyright}" - /> - </target> - diff --git a/debian/patches/02_Buildxml_target.patch b/debian/patches/02_Buildxml_target.patch deleted file mode 100644 index b5f4b3c..0000000 --- a/debian/patches/02_Buildxml_target.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- build.xml.orig 2006-01-06 19:07:27.000000000 +0100 -+++ build.xml 2006-01-06 19:10:55.000000000 +0100 -@@ -219,20 +219,20 @@ - - <target name="api" depends="prepare,update_api"> - <mkdir dir="${build_api}"/> -- <javac debug="${debug}" deprecation="${deprecation}" target="1.1" -+ <javac debug="${debug}" deprecation="${deprecation}" target="1.3" source="1.3" - srcdir="${src_api}" destdir="${build_api}" classpath="${build_api}"/> - </target> - - <target name="impl_min" depends="prepare,api"> - <mkdir dir="${build_classes_min}"/> - <touch file="${build_classes_min}/${xpp3_tag}_MIN_VERSION"/> -- <javac debug="${debug}" deprecation="${deprecation}" target="1.1" -+ <javac debug="${debug}" deprecation="${deprecation}" target="1.3" source="1.3" - srcdir="${src_api}" destdir="${build_classes_min}" classpath="${build_classes_min}"> - <include name="**/*.java"/> - <exclude name="**/*Factory.java"/> - <exclude name="**/*Serializer.java"/> - </javac> -- <javac debug="${debug}" deprecation="${deprecation}" target="1.1" -+ <javac debug="${debug}" deprecation="${deprecation}" target="1.3" source="1.3" - srcdir="${src_impl_min}" destdir="${build_classes_min}" classpath="${build_classes_min}"/> - <mkdir dir="${build_classes_min}/META-INF/services"/> - <copy todir="${build_classes_min}/META-INF/services"> -@@ -248,7 +248,7 @@ - </target> - - <target name="serializer" depends="prepare,api"> -- <javac debug="${debug}" deprecation="${deprecation}" target="1.1" -+ <javac debug="${debug}" deprecation="${deprecation}" target="1.3" source="1.3" - srcdir="${src_impl_serializer}" destdir="${build_classes}" classpath="${build_api}"/> - </target> - -@@ -277,9 +277,9 @@ - </target> - - <target name="impl" depends="impl_min,serializer"> -- <javac debug="${debug}" deprecation="${deprecation}" target="1.1" -+ <javac debug="${debug}" deprecation="${deprecation}" target="1.3" source="1.3" - srcdir="${src_impl_min}" destdir="${build_classes}" classpath="${build_api}"/> -- <javac debug="${debug}" deprecation="${deprecation}" target="1.1" -+ <javac debug="${debug}" deprecation="${deprecation}" target="1.3" source="1.3" - srcdir="${src_impl_standard}" destdir="${build_classes}" classpath="${build_api}"/> - <mkdir dir="${build_classes}/META-INF/services"/> - <copy todir="${build_classes}/META-INF/services"> diff --git a/debian/patches/03_exclude_javax_xml.patch b/debian/patches/03_exclude_javax_xml.patch deleted file mode 100644 index d2eaeb0..0000000 --- a/debian/patches/03_exclude_javax_xml.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- build.xml.orig 2008-10-02 17:41:06.000000000 +0200 -+++ build.xml 2008-10-02 17:40:24.000000000 +0200 -@@ -254,7 +254,7 @@ - - <target name="builder" depends="prepare,api"> - <javac debug="${debug}" deprecation="${deprecation}" -- srcdir="${src_builder}" destdir="${build_classes}" classpath="${build_api}"/> -+ srcdir="${src_builder}" destdir="${build_classes}" classpath="${build_api}" excludes="javax/xml/" /> - </target> - - diff --git a/debian/patches/build.patch b/debian/patches/build.patch new file mode 100644 index 0000000..c940d9d --- /dev/null +++ b/debian/patches/build.patch @@ -0,0 +1,150 @@ +--- a/build.xml ++++ b/build.xml +@@ -220,20 +220,20 @@ + + <target name="api" depends="prepare,update_api"> + <mkdir dir="${build_api}"/> +- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1" ++ <javac debug="${debug}" deprecation="${deprecation}" source="1.3" target="1.3" + srcdir="${src_api}" destdir="${build_api}" classpath="${build_api}"/> + </target> + + <target name="impl_min" depends="prepare,api"> + <mkdir dir="${build_classes_min}"/> + <touch file="${build_classes_min}/${xpp3_tag}_MIN_VERSION"/> +- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1" ++ <javac debug="${debug}" deprecation="${deprecation}" source="1.3" target="1.3" + srcdir="${src_api}" destdir="${build_classes_min}" classpath="${build_classes_min}"> + <include name="**/*.java"/> + <exclude name="**/*Factory.java"/> + <exclude name="**/*Serializer.java"/> + </javac> +- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1" ++ <javac debug="${debug}" deprecation="${deprecation}" source="1.3" target="1.3" + srcdir="${src_impl_min}" destdir="${build_classes_min}" classpath="${build_classes_min}"/> + <mkdir dir="${build_classes_min}/META-INF/services"/> + <copy todir="${build_classes_min}/META-INF/services"> +@@ -249,13 +249,13 @@ + </target> + + <target name="serializer" depends="prepare,api"> +- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1" ++ <javac debug="${debug}" deprecation="${deprecation}" source="1.3" target="1.3" + srcdir="${src_impl_serializer}" destdir="${build_classes}" classpath="${build_api}"/> + </target> + + <target name="builder" depends="prepare,api"> +- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1" +- srcdir="${src_builder}" destdir="${build_classes}" classpath="${build_api}"/> ++ <javac debug="${debug}" deprecation="${deprecation}" source="1.3" target="1.3" ++ srcdir="${src_builder}" destdir="${build_classes}" classpath="${build_api}" excludes="javax/xml/" /> + </target> + + +@@ -267,20 +267,20 @@ + + <target name="xpath" depends="builder"> + <mkdir dir="${build_xpath}"/> +- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1" ++ <javac debug="${debug}" deprecation="${deprecation}" source="1.3" target="1.3" + srcdir="${src_xpath}" destdir="${build_xpath}" classpath="${build_api}:${build_classes}"/> + </target> + + <target name="xpath_samples" depends="check_junit,xpath" if="junit_present"> + <mkdir dir="${build_samples}"/> +- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1" ++ <javac debug="${debug}" deprecation="${deprecation}" source="1.3" target="1.3" + srcdir="${src_xpath_samples}" destdir="${build_samples}" classpath="${build_api}:${build_classes}:${build_xpath}"/> + </target> + + <target name="impl" depends="impl_min,serializer"> +- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1" ++ <javac debug="${debug}" deprecation="${deprecation}" source="1.3" target="1.3" + srcdir="${src_impl_min}" destdir="${build_classes}" classpath="${build_api}"/> +- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1" ++ <javac debug="${debug}" deprecation="${deprecation}" source="1.3" target="1.3" + srcdir="${src_impl_standard}" destdir="${build_classes}" classpath="${build_api}"/> + <mkdir dir="${build_classes}/META-INF/services"/> + <copy todir="${build_classes}/META-INF/services"> +@@ -298,7 +298,7 @@ + + <target name="parser_pool" depends="api,update_parser_pool"> + <mkdir dir="${build_classes}"/> +- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1" ++ <javac debug="${debug}" deprecation="${deprecation}" source="1.3" target="1.3" + srcdir="${src_parser_pool}" destdir="${build_classes}" classpath="${build_api}"/> + </target> + +@@ -312,7 +312,7 @@ + + <target name="dom2_builder" depends="api,check_dom2,update_dom2_builder"> + <mkdir dir="${build_classes}"/> +- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1" ++ <javac debug="${debug}" deprecation="${deprecation}" source="1.3" target="1.3" + srcdir="${src_dom2_builder}" destdir="${build_classes}" classpath="${build_api}"/> + </target> + +@@ -328,7 +328,7 @@ + + <target name="sax2_driver" depends="api,check_sax2,update_sax2_driver"> + <mkdir dir="${build_classes}"/> +- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1" ++ <javac debug="${debug}" deprecation="${deprecation}" source="1.3" target="1.3" + srcdir="${src_sax2_driver}" destdir="${build_classes}" classpath="${build_api}"/> + </target> + +@@ -344,7 +344,7 @@ + + <target name="util" depends="api,update_util"> + <mkdir dir="${build_classes}"/> +- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1" ++ <javac debug="${debug}" deprecation="${deprecation}" source="1.3" target="1.3" + srcdir="${src_util}" destdir="${build_classes}" classpath="${build_api}"/> + </target> + +@@ -358,7 +358,7 @@ + + <target name="wrapper" depends="api,util,update_wrapper"> + <mkdir dir="${build_classes}"/> +- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1" ++ <javac debug="${debug}" deprecation="${deprecation}" source="1.3" target="1.3" + srcdir="${src_wrapper}" destdir="${build_classes}" classpath="${build_api}"/> + </target> + +@@ -389,7 +389,7 @@ + + <target name="xmlpull_samples" depends="api,update_samples"> + <mkdir dir="${build_samples}"/> +- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1" ++ <javac debug="${debug}" deprecation="${deprecation}" source="1.3" target="1.3" + srcdir="${src_samples}" destdir="${build_samples}" classpath="${build_api}"/> + </target> + +@@ -424,16 +424,16 @@ + + <target name="tests_addons" if="junit_present" + depends="check_junit,impl,update_tests,wrapper,dom2_builder"> +- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1" ++ <!--javac debug="${debug}" deprecation="${deprecation}" source="1.3" target="1.3" + srcdir="${src_addons_tests}" destdir="${build_tests}" + classpath="${build_api}:${build_classes}" +- /> ++ /--> + </target> + + <target name="tests_main" if="junit_present" + depends="check_junit,impl,update_tests"> + <mkdir dir="${build_tests}"/> +- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1" ++ <javac debug="${debug}" deprecation="${deprecation}" source="1.3" target="1.3" + srcdir="${src_tests}" destdir="${build_tests}" classpath="${build_api}" + /> + <copy todir="${build_tests_xml}"> +@@ -502,7 +502,6 @@ + windowtitle="${name} ${version} API" + doctitle="${name}" + bottom="${copyright}" +- link="http://java.sun.com/j2se/1.4/docs/api/" + /> + </target> + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..5879227 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +build.patch diff --git a/debian/rules b/debian/rules index 1d1906f..61cbf34 100755 --- a/debian/rules +++ b/debian/rules @@ -3,20 +3,31 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk -export UPSTREAM_VERSION = $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-) - -JAVA_HOME := /usr/lib/kaffe -ANT_HOME := /usr/share/ant -DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar junit +PACKAGE := $(DEB_SOURCE_PACKAGE) +VERSION := $(DEB_UPSTREAM_VERSION) +JAVA_HOME := /usr/lib/jvm/default-java +DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar junit DEB_ANT_BUILD_TARGET := xpp3 junit apidoc clean:: -rm -rf doc/api + -rm -rf debian/tmp + +binary-post-install/$(PACKAGE):: + mh_installpoms -p$(PACKAGE) + mh_installjar -p$(PACKAGE) -l debian/xpp3.pom build/xpp3-$(VERSION).jar + mh_installjar -p$(PACKAGE) -l --usj-name=xpp3-min debian/xpp3_min.pom build/xpp3_min-$(VERSION).jar + mh_installjar -p$(PACKAGE) -l --usj-name=xpp3-xpath debian/xpp3_xpath.pom build/xpp3_xpath-$(VERSION).jar + +get-orig-source: + -uscan --download-version $(VERSION) --force-download --rename + +get-orig-pom: XPP3_XPATH_VERSION=1.1.3.4.O +get-orig-pom: + wget -O debian/xpp3.pom http://repository.sonatype.org/service/local/repositories/central-proxy/content/xpp3/xpp3/$(VERSION)/xpp3-$(VERSION).pom + wget -O debian/xpp3_min.pom http://repository.sonatype.org/service/local/repositories/central-proxy/content/xpp3/xpp3_min/$(VERSION)/xpp3_min-$(VERSION).pom + wget -O debian/xpp3_xpath.pom http://repository.sonatype.org/service/local/repositories/central-proxy/content/xpp3/xpp3_xpath/$(XPP3_XPATH_VERSION)/xpp3_xpath-$(XPP3_XPATH_VERSION).pom + perl -p -i -e 's/<version>$(XPP3_XPATH_VERSION)/<version>$(VERSION)/' debian/xpp3_xpath.pom -install/libxpp3-java:: - install -m 644 build/xpp3-$(UPSTREAM_VERSION).jar debian/libxpp3-java/usr/share/java/xpp3-$(UPSTREAM_VERSION).jar - ln -s xpp3-$(UPSTREAM_VERSION).jar debian/libxpp3-java/usr/share/java/xpp3.jar - install -m 644 build/xpp3_xpath-$(UPSTREAM_VERSION).jar debian/libxpp3-java/usr/share/java/xpp3-xpath-$(UPSTREAM_VERSION).jar - ln -s xpp3-xpath-$(UPSTREAM_VERSION).jar debian/libxpp3-java/usr/share/java/xpp3-xpath.jar diff --git a/debian/xpp3.pom b/debian/xpp3.pom new file mode 100644 index 0000000..845a8d8 --- /dev/null +++ b/debian/xpp3.pom @@ -0,0 +1,40 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>xpp3</groupId> + <artifactId>xpp3</artifactId> + <version>1.1.4c</version> + <packaging>jar</packaging> + <name>MXP1: Xml Pull Parser 3rd Edition (XPP3)</name> + <url>http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/</url> + <description>MXP1 is a stable XmlPull parsing engine that is based on ideas from XPP and in particular XPP2 but completely revised and rewritten to take the best advantage of latest JIT JVMs such as Hotspot in JDK 1.4+.</description> + <licenses> + <license> + <name>Indiana University Extreme! Lab Software License, vesion 1.1.1</name> + <url>http://www.extreme.indiana.edu/viewcvs/~checkout~/XPP3/java/LICENSE.txt</url> + <distribution>repo</distribution> + <comments>The license applies to the Xpp3 classes (all classes below the org.xmlpull package with exception of classes directly in package org.xmlpull.v1 )</comments> + </license> + <license> + <name>Public Domain</name> + <url>http://creativecommons.org/licenses/publicdomain</url> + <distribution>repo</distribution> + <comments>The license applies to the XmlPull API (all classes directly in the org.xmlpull.v1 package)</comments> + </license> + <license> + <name>Apache Software License, version 1.1</name> + <url>http://www.apache.org/licenses/LICENSE-1.1</url> + <distribution>repo</distribution> + <comments>The license applies to the class javax.xml.namespace.QName</comments> + </license> + </licenses> + <scm> + <url>http://www.extreme.indiana.edu/viewcvs/~checkout~/XPP3/java/</url> + </scm> + <organization> + <name>Extreme! Lab, Indiana University</name> + <url>http://www.extreme.indiana.edu/</url> + </organization> + <dependencies/> +</project> diff --git a/debian/xpp3_min.pom b/debian/xpp3_min.pom new file mode 100644 index 0000000..49616cb --- /dev/null +++ b/debian/xpp3_min.pom @@ -0,0 +1,32 @@ +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>xpp3</groupId> + <artifactId>xpp3_min</artifactId> + <version>1.1.4c</version> + <packaging>jar</packaging> + <name>MXP1: Xml Pull Parser 3rd Edition (XPP3)</name> + <url>http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/</url> + <description>MXP1 is a stable XmlPull parsing engine that is based on ideas from XPP and in particular XPP2 but completely revised and rewritten to take the best advantage of latest JIT JVMs such as Hotspot in JDK 1.4+.</description> + <licenses> + <license> + <name>Indiana University Extreme! Lab Software License, vesion 1.1.1</name> + <url>http://www.extreme.indiana.edu/viewcvs/~checkout~/XPP3/java/LICENSE.txt</url> + <distribution>repo</distribution> + <comments>The license applies to the Xpp3 classes (all classes below the org.xmlpull package with exception of classes directly in package org.xmlpull.v1 )</comments> + </license> + <license> + <name>Public Domain</name> + <url>http://creativecommons.org/licenses/publicdomain</url> + <distribution>repo</distribution> + <comments>The license applies to the XmlPull API (all classes directly in the org.xmlpull.v1 package)</comments> + </license> + </licenses> + <scm> + <url>http://www.extreme.indiana.edu/viewcvs/~checkout~/XPP3/java/</url> + </scm> + <organization> + <name>Extreme! Lab, Indiana University</name> + <url>http://www.extreme.indiana.edu/</url> + </organization> + <dependencies/> +</project> diff --git a/debian/xpp3_xpath.pom b/debian/xpp3_xpath.pom new file mode 100644 index 0000000..9b046b1 --- /dev/null +++ b/debian/xpp3_xpath.pom @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>xpp3</groupId> + <artifactId>xpp3_xpath</artifactId> + <version>1.1.4c</version> + <packaging>jar</packaging> + <url>http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/</url> + <description>MXP1 is a stable XmlPull parsing engine that is based on ideas from XPP and in particular XPP2 but completely revised and rewritten to take the best advantage of latest JIT JVMs such as Hotspot in JDK 1.4+.</description> + <scm> + <connection>scm:cvs:pserver:anonym...@cvs.extreme.indiana.edu:/l/extreme/cvspub/XPP3</connection> + </scm> +</project> \ No newline at end of file -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libxpp3-java.git _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits