[pkg-java] r14284 - in trunk/libxpp2-java/debian: . patches source
Torsten Werner
twerner at alioth.debian.org
Thu Aug 18 12:24:03 UTC 2011
Author: twerner
Date: 2011-08-18 12:24:03 +0000 (Thu, 18 Aug 2011)
New Revision: 14284
Added:
trunk/libxpp2-java/debian/patches/0001-update-Java-version-to-1.2.patch
trunk/libxpp2-java/debian/patches/series
trunk/libxpp2-java/debian/source/
trunk/libxpp2-java/debian/source/format
Removed:
trunk/libxpp2-java/debian/patches/01_buildxml.patch
trunk/libxpp2-java/debian/patches/02_buildxml_target.patch
Modified:
trunk/libxpp2-java/debian/changelog
trunk/libxpp2-java/debian/control
trunk/libxpp2-java/debian/rules
Log:
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.
Modified: trunk/libxpp2-java/debian/changelog
===================================================================
--- trunk/libxpp2-java/debian/changelog 2011-08-17 22:26:20 UTC (rev 14283)
+++ trunk/libxpp2-java/debian/changelog 2011-08-18 12:24:03 UTC (rev 14284)
@@ -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 <twerner at 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.
Modified: trunk/libxpp2-java/debian/control
===================================================================
--- trunk/libxpp2-java/debian/control 2011-08-17 22:26:20 UTC (rev 14283)
+++ trunk/libxpp2-java/debian/control 2011-08-18 12:24:03 UTC (rev 14284)
@@ -12,7 +12,7 @@
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).
Added: trunk/libxpp2-java/debian/patches/0001-update-Java-version-to-1.2.patch
===================================================================
--- trunk/libxpp2-java/debian/patches/0001-update-Java-version-to-1.2.patch (rev 0)
+++ trunk/libxpp2-java/debian/patches/0001-update-Java-version-to-1.2.patch 2011-08-18 12:24:03 UTC (rev 14284)
@@ -0,0 +1,22 @@
+From: Torsten Werner <twerner at 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"/>
+--
Deleted: trunk/libxpp2-java/debian/patches/01_buildxml.patch
===================================================================
--- trunk/libxpp2-java/debian/patches/01_buildxml.patch 2011-08-17 22:26:20 UTC (rev 14283)
+++ trunk/libxpp2-java/debian/patches/01_buildxml.patch 2011-08-18 12:24:03 UTC (rev 14284)
@@ -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">
Deleted: trunk/libxpp2-java/debian/patches/02_buildxml_target.patch
===================================================================
--- trunk/libxpp2-java/debian/patches/02_buildxml_target.patch 2011-08-17 22:26:20 UTC (rev 14283)
+++ trunk/libxpp2-java/debian/patches/02_buildxml_target.patch 2011-08-18 12:24:03 UTC (rev 14284)
@@ -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}"
Added: trunk/libxpp2-java/debian/patches/series
===================================================================
--- trunk/libxpp2-java/debian/patches/series (rev 0)
+++ trunk/libxpp2-java/debian/patches/series 2011-08-18 12:24:03 UTC (rev 14284)
@@ -0,0 +1 @@
+0001-update-Java-version-to-1.2.patch
Modified: trunk/libxpp2-java/debian/rules
===================================================================
--- trunk/libxpp2-java/debian/rules 2011-08-17 22:26:20 UTC (rev 14283)
+++ trunk/libxpp2-java/debian/rules 2011-08-18 12:24:03 UTC (rev 14284)
@@ -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
Added: trunk/libxpp2-java/debian/source/format
===================================================================
--- trunk/libxpp2-java/debian/source/format (rev 0)
+++ trunk/libxpp2-java/debian/source/format 2011-08-18 12:24:03 UTC (rev 14284)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the pkg-java-commits
mailing list