r1784 - in trunk/libxpp2-java/debian: . patches

[Wolfgang Bär]

Author: wbaer-guest
Date: 2006-01-23 14:28:04 +0000 (Mon, 23 Jan 2006)
New Revision: 1784

Added:
   trunk/libxpp2-java/debian/patches/02_buildxml_target.patch
Modified:
   trunk/libxpp2-java/debian/changelog
   trunk/libxpp2-java/debian/rules
Log:
Update to kaffe transition upload.

Modified: trunk/libxpp2-java/debian/changelog
===================================================================
--- trunk/libxpp2-java/debian/changelog	2006-01-23 14:27:05 UTC (rev 1783)
+++ trunk/libxpp2-java/debian/changelog	2006-01-23 14:28:04 UTC (rev 1784)
@@ -1,3 +1,11 @@
+libxpp2-java (2.1.10-4) unstable; urgency=low
+
+  * Removed explicit usage of jikes build compiler property
+    for kaffe jikes -> ecj transition
+  * Added patch to raise build target to 1.3 - required for ecj
+
+ -- Wolfgang Baer <WBaer at gmx.de>  Fri,  6 Jan 2006 19:01:08 +0100
+
 libxpp2-java (2.1.10-3) unstable; urgency=low
 
   * Added ant-optional due to ant reorganization

Added: trunk/libxpp2-java/debian/patches/02_buildxml_target.patch
===================================================================
--- trunk/libxpp2-java/debian/patches/02_buildxml_target.patch	2006-01-23 14:27:05 UTC (rev 1783)
+++ trunk/libxpp2-java/debian/patches/02_buildxml_target.patch	2006-01-23 14:28:04 UTC (rev 1784)
@@ -0,0 +1,29 @@
+--- 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}"

Modified: trunk/libxpp2-java/debian/rules
===================================================================
--- trunk/libxpp2-java/debian/rules	2006-01-23 14:27:05 UTC (rev 1783)
+++ trunk/libxpp2-java/debian/rules	2006-01-23 14:28:04 UTC (rev 1784)
@@ -10,7 +10,6 @@
 JAVA_HOME := /usr/lib/kaffe
 ANT_HOME := /usr/share/ant
 DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar junit
-DEB_ANT_COMPILER := jikes
 DEB_ANT_BUILD_TARGET := compile junit api
 
 install/libxpp2-java::