This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libxpp2-java.
commit df3f70b4cac7e996fae55b2eeb9cf75d6b40a260 Author: Torsten Werner <twer...@debian.org> Date: Thu Aug 18 12:24:03 2011 +0000 UNRELEASED * Team upload. * Switch to source format 3.0. * Minor cleanups in d/rules. * Remove Java runtime from Depends. * Remove old patches because they did not apply. * Add a new patch to update Java version to 1.2. --- debian/changelog | 12 ++++++++ debian/control | 2 +- .../patches/0001-update-Java-version-to-1.2.patch | 22 ++++++++++++++ debian/patches/01_buildxml.patch | 34 ---------------------- debian/patches/02_buildxml_target.patch | 29 ------------------ debian/patches/series | 1 + debian/rules | 10 ++----- debian/source/format | 1 + 8 files changed, 40 insertions(+), 71 deletions(-) diff --git a/debian/changelog b/debian/changelog index a4b0e83..837e0fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +libxpp2-java (2.1.10-7) unstable; urgency=low + + UNRELEASED + * Team upload. + * Switch to source format 3.0. + * Minor cleanups in d/rules. + * Remove Java runtime from Depends. + * Remove old patches because they did not apply. + * Add a new patch to update Java version to 1.2. + + -- Torsten Werner <twer...@debian.org> Thu, 18 Aug 2011 14:20:45 +0200 + libxpp2-java (2.1.10-6) unstable; urgency=low * Make package Depends on java runtime alternatives. diff --git a/debian/control b/debian/control index c913824..b15ce1b 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Homepage: http://www.extreme.indiana.edu/xgws/xsoap/xpp/xpp2/ Package: libxpp2-java Architecture: all -Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless, ${misc:Depends} +Depends: ${misc:Depends} Description: XML pull parser library for java V2 Xml Pull Parser (in short XPP) is a streaming pull XML parser for java. This version XPP2 is the predecessor of XPP3 (see package libxpp3-java). diff --git a/debian/patches/0001-update-Java-version-to-1.2.patch b/debian/patches/0001-update-Java-version-to-1.2.patch new file mode 100644 index 0000000..cd7568c --- /dev/null +++ b/debian/patches/0001-update-Java-version-to-1.2.patch @@ -0,0 +1,22 @@ +From: Torsten Werner <twer...@debian.org> +Date: Thu, 18 Aug 2011 14:17:09 +0200 +Subject: [PATCH] update Java version to 1.2 + +--- + build.xml | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/build.xml b/build.xml +index 21c872f..0dfc9bd 100644 +--- a/build.xml ++++ b/build.xml +@@ -9,7 +9,7 @@ + <property name="midp4palm.home" value="c:/util/midp4palm1.0" /> + + +- <property name="target" value="1.1" /> ++ <property name="target" value="1.2" /> + <!-- set global properties for this build --> + + <property name="name" value="XML Pull Parser"/> +-- diff --git a/debian/patches/01_buildxml.patch b/debian/patches/01_buildxml.patch deleted file mode 100644 index 15c219d..0000000 --- a/debian/patches/01_buildxml.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- build.xml.orig 2005-04-30 20:14:10.000000000 +0200 -+++ build.xml 2005-04-23 16:39:39.000000000 +0200 -@@ -318,11 +318,12 @@ - <!-- =================================================================== --> - - <target name="api_sax2" depends="prepare"> -- <mkdir dir="${build_api_sax2}"/> -+ <mkdir dir="${build_api_sax2}"/> -+ <!-- Use the debian sax package to build against - <javac target="${target}" debug="${debug}" deprecation="${deprecation}" - srcdir="${src_api_sax2}" destdir="${build_api_sax2}" - > -- </javac> -+ </javac>--> - </target> - - <target name="driver_sax2" depends="api_sax2,intf"> -@@ -335,13 +336,14 @@ - </target> - - <target name="api_jaxp11" depends="api_sax2"> -- <mkdir dir="${build_api_jaxp11}"/> -+ <mkdir dir="${build_api_jaxp11}"/> -+ <!-- Use the debian jaxp package to build against - <javac target="${target}" debug="${debug}" deprecation="${deprecation}" - srcdir="${src_api_jaxp11}" destdir="${build_api_jaxp11}" - classpath="${build_api_sax2}" - > - -- </javac> -+ </javac>--> - </target> - - <target name="driver_jaxp11" depends="api_sax2,driver_sax2,api_jaxp11,intf"> diff --git a/debian/patches/02_buildxml_target.patch b/debian/patches/02_buildxml_target.patch deleted file mode 100644 index 46d1478..0000000 --- a/debian/patches/02_buildxml_target.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- build.xml.orig 2006-01-06 19:01:39.000000000 +0100 -+++ build.xml 2006-01-06 19:03:05.000000000 +0100 -@@ -9,7 +9,7 @@ - <property name="midp4palm.home" value="c:/util/midp4palm1.0" /> - - -- <property name="target" value="1.1" /> -+ <property name="target" value="1.3" /> - <!-- set global properties for this build --> - - <property name="name" value="XML Pull Parser"/> -@@ -318,7 +318,7 @@ - <!-- =================================================================== --> - - <target name="api_sax2" depends="prepare"> -- <mkdir dir="${build_api_sax2}"/> -+ <mkdir dir="${build_api_sax2}"/> - <!-- Use the debian sax package to build against - <javac target="${target}" debug="${debug}" deprecation="${deprecation}" - srcdir="${src_api_sax2}" destdir="${build_api_sax2}" -@@ -336,7 +336,7 @@ - </target> - - <target name="api_jaxp11" depends="api_sax2"> -- <mkdir dir="${build_api_jaxp11}"/> -+ <mkdir dir="${build_api_jaxp11}"/> - <!-- Use the debian jaxp package to build against - <javac target="${target}" debug="${debug}" deprecation="${deprecation}" - srcdir="${src_api_jaxp11}" destdir="${build_api_jaxp11}" diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..605542f --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-update-Java-version-to-1.2.patch diff --git a/debian/rules b/debian/rules index d4642d5..c939c58 100755 --- a/debian/rules +++ b/debian/rules @@ -1,17 +1,13 @@ #!/usr/bin/make -f -# debian/rules file for libxpp2-java (uses cdbs) 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 - -export UPSTREAM_VERSION = $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-) JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar junit +DEB_JARS := ant-junit junit DEB_ANT_BUILD_TARGET := compile junit api install/libxpp2-java:: - install -m 644 build/lib/PullParser-$(UPSTREAM_VERSION).jar debian/libxpp2-java/usr/share/java/xpp2-$(UPSTREAM_VERSION).jar - ln -s xpp2-$(UPSTREAM_VERSION).jar debian/libxpp2-java/usr/share/java/xpp2.jar + install -m 644 build/lib/PullParser-$(DEB_UPSTREAM_VERSION).jar debian/libxpp2-java/usr/share/java/xpp2-$(DEB_UPSTREAM_VERSION).jar + ln -s xpp2-$(DEB_UPSTREAM_VERSION).jar debian/libxpp2-java/usr/share/java/xpp2.jar diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libxpp2-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