[pkg-java] r14360 - trunk/libwoodstox-java/debian/patches
Giovanni Mascellani
gio at alioth.debian.org
Sun Aug 21 08:42:04 UTC 2011
Author: gio
Date: 2011-08-21 08:42:04 +0000 (Sun, 21 Aug 2011)
New Revision: 14360
Added:
trunk/libwoodstox-java/debian/patches/10-fix-build.xml
Removed:
trunk/libwoodstox-java/debian/patches/10-disable-unused.dpatch
Modified:
trunk/libwoodstox-java/debian/patches/series
Log:
build.xml patch completely rewritten for new upstream version.
Deleted: trunk/libwoodstox-java/debian/patches/10-disable-unused.dpatch
===================================================================
--- trunk/libwoodstox-java/debian/patches/10-disable-unused.dpatch 2011-08-21 00:56:35 UTC (rev 14359)
+++ trunk/libwoodstox-java/debian/patches/10-disable-unused.dpatch 2011-08-21 08:42:04 UTC (rev 14360)
@@ -1,82 +0,0 @@
-From: Vincent Fourmond <fourmond at debian.org>
-
-Index: libwoodstox-java/build.xml
-===================================================================
---- libwoodstox-java.orig/build.xml 2011-01-28 06:39:41.000000000 +0100
-+++ libwoodstox-java/build.xml 2011-08-15 16:50:42.000000000 +0200
-@@ -57,14 +57,19 @@
-
- <!-- jars needed for compilation -->
- <path id="classpath.compile">
-- <fileset dir="${dir.lib}" includes="stax-api*.jar" />
-- <fileset dir="${dir.lib}" includes="sax2.jar" />
-+ <!--<fileset dir="${dir.lib}" includes="stax-api*.jar" />
-+ <fileset dir="${dir.lib}" includes="sax2.jar" />-->
- <!-- these are needed for optional MSV-based validators -->
-- <fileset dir="${dir.lib}/msv" includes="*.jar" />
-+ <!--<fileset dir="${dir.lib}/msv" includes="*.jar" />-->
-+ <fileset file="/usr/share/java/msv-core.jar" />
-+ <fileset file="/usr/share/java/xsdlib.jar" />
-+ <fileset file="/usr/share/java/relaxngDatatype.jar" />
-+ <fileset file="/usr/share/java/knopflerfish-framework.jar" />
-+ <fileset file="/usr/share/java/junit4.jar" />
- <!-- 17-Dec-2008, tatu: adding OSGi bundle activation
- support, to register providers as services
- -->
-- <fileset dir="${dir.lib}/osgi" includes="*.jar" />
-+ <!--fileset dir="${dir.lib}/osgi" includes="*.jar" />-->
- </path>
- <path id="junit-libs">
- <fileset dir="${dir.lib}">
-@@ -102,10 +107,10 @@
- <include name="lib/msv/*.jar" />
- </patternset>
-
-- <import file="build-osgi.xml" />
-+ <!--<import file="build-osgi.xml" />
- <import file="build-coverage.xml" />
- <import file="build-maven-deploy.xml" />
-- <import file="repackage-msv.xml" />
-+ <import file="repackage-msv.xml" />-->
-
- <!--*********************************************************************-->
- <!-- The readme target shows a brief description of all targets -->
-@@ -254,7 +259,8 @@
- <!-- Dummy target that just includes all individual jars...
- (OSGi ones from included file)
- -->
-- <target name="jars" depends="jars.osgi, jar.stax2test, repackage-msv" />
-+ <!--<target name="jars" depends="jars.osgi, jar.stax2test, repackage-msv" />-->
-+ <target name="jars" depends="jar.stax2test" />
-
- <!-- This jar is only needed for testing purposes, to specify
- - which Stax implementation to use
-@@ -312,18 +318,6 @@
- </target>
-
- <target name="dist" depends="compile,jars,javadoc">
-- <!-- First, let's copy the binary jars to dist -->
-- <copy todir="${dir.dist}">
-- <fileset dir="${dir.build}" includes="woodstox*.jar" />
-- <fileset dir="${dir.build}" includes="stax2*.jar" />
-- <fileset dir="${dir.lib}/msv" includes="msv-core*.jar" />
-- <fileset dir="${dir.lib}/msv" includes="xsdlib*.jar" />
-- </copy>
-- <!-- Including MSV jars (note: ones we have repackaged)
-- -->
-- <copy todir="${dir.dist}">
-- <fileset dir="${dir.build}" includes="woodstox-msv-*.jar" />
-- </copy>
-
- <!-- Then let's create the source distribution tar packages
- -->
-@@ -391,6 +385,9 @@
- includes="org/codehaus/stax2/**/*.java"
- />
-
-+ <jar basedir="${dir.build.classes.stax2}" destfile="${dir.dist}/stax2-api.jar" />
-+ <jar basedir="${dir.build.classes.woodstox}" destfile="${dir.dist}/woodstox-core.jar" />
-+
- <!-- Then copy javadocs -->
- <copy todir="${dir.dist}">
- <fileset dir="${dir.javadoc}/.." includes="javadoc/**/*" />
Copied: trunk/libwoodstox-java/debian/patches/10-fix-build.xml (from rev 14183, trunk/libwoodstox-java/debian/patches/10-disable-unused.dpatch)
===================================================================
--- trunk/libwoodstox-java/debian/patches/10-fix-build.xml (rev 0)
+++ trunk/libwoodstox-java/debian/patches/10-fix-build.xml 2011-08-21 08:42:04 UTC (rev 14360)
@@ -0,0 +1,87 @@
+From: Giovanni Mascellani <gio at debian.org>
+Subject: Fix build.xml
+Last-Update: 2011-08-21
+Forwarded: not-needed
+
+This patch fixed build.xml file. It does these changes:
+ * Put in the classpath libraries from Debian packages, instead
+ of the bundled JARs;
+ * Use Debian-distributed JAR for stax2-api instead of assuming
+ to have copy of the code in the compilation tree;
+ * Reduce the dist target to only things needed for Debian.
+
+Index: libwoodstox-java/build.xml
+===================================================================
+--- libwoodstox-java.orig/build.xml 2011-08-21 10:34:06.000000000 +0200
++++ libwoodstox-java/build.xml 2011-08-21 10:36:01.000000000 +0200
+@@ -57,14 +57,13 @@
+
+ <!-- jars needed for compilation -->
+ <path id="classpath.compile">
+- <fileset dir="${dir.lib}" includes="stax-api*.jar" />
+- <fileset dir="${dir.lib}" includes="sax2.jar" />
+- <!-- these are needed for optional MSV-based validators -->
+- <fileset dir="${dir.lib}/msv" includes="*.jar" />
+- <!-- 17-Dec-2008, tatu: adding OSGi bundle activation
+- support, to register providers as services
+- -->
+- <fileset dir="${dir.lib}/osgi" includes="*.jar" />
++ <fileset file="/usr/share/java/stax-api.jar" />
++ <fileset file="/usr/share/java/stax2-api.jar" />
++ <fileset file="/usr/share/java/msv-core.jar" />
++ <fileset file="/usr/share/java/xsdlib.jar" />
++ <fileset file="/usr/share/java/relaxngDatatype.jar" />
++ <fileset file="/usr/share/java/knopflerfish-framework.jar" />
++ <fileset file="/usr/share/java/junit4.jar" />
+ </path>
+ <path id="junit-libs">
+ <fileset dir="${dir.lib}">
+@@ -102,11 +101,6 @@
+ <include name="lib/msv/*.jar" />
+ </patternset>
+
+- <import file="build-osgi.xml" />
+- <import file="build-coverage.xml" />
+- <import file="build-maven-deploy.xml" />
+- <import file="repackage-msv.xml" />
+-
+ <!--*********************************************************************-->
+ <!-- The readme target shows a brief description of all targets -->
+ <!-- supported by this ant build file -->
+@@ -208,7 +202,7 @@
+ </javac>
+ </target>
+
+- <target name="compile.woodstox" depends="prepare,copy-resources,compile.stax2">
++ <target name="compile.woodstox" depends="prepare,copy-resources">
+ <javac srcdir="${dir.src.java}" destdir="${dir.build.classes.woodstox}"
+ includeantruntime="false"
+ source="1.4" target="1.4"
+@@ -254,7 +248,7 @@
+ <!-- Dummy target that just includes all individual jars...
+ (OSGi ones from included file)
+ -->
+- <target name="jars" depends="jars.osgi, jar.stax2test, repackage-msv" />
++ <target name="jars" depends="jar.stax2test" />
+
+ <!-- This jar is only needed for testing purposes, to specify
+ - which Stax implementation to use
+@@ -310,6 +304,18 @@
+
+ </javadoc>
+ </target>
++
++ <target name="debiandist" depends="compile.woodstox">
++ <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="/usr/share/java/ant-contrib.jar"/>
++ <property name="classpath.prop.colon" refid="classpath.compile"/>
++ <propertyregex property="classpath.prop" input="${classpath.prop.colon}"
++ global="true" regexp=":" replace=" "/>
++ <jar basedir="${dir.build.classes.woodstox}" destfile="${dir.dist}/woodstox-core.jar">
++ <manifest>
++ <attribute name="Class-Path" value="${classpath.prop}"/>
++ </manifest>
++ </jar>
++ </target>
+
+ <target name="dist" depends="compile,jars,javadoc">
+ <!-- First, let's copy the binary jars to dist -->
Modified: trunk/libwoodstox-java/debian/patches/series
===================================================================
--- trunk/libwoodstox-java/debian/patches/series 2011-08-21 00:56:35 UTC (rev 14359)
+++ trunk/libwoodstox-java/debian/patches/series 2011-08-21 08:42:04 UTC (rev 14360)
@@ -1,3 +1,3 @@
-10-disable-unused.dpatch
+10-fix-build.xml
20-testsuite-enable.dpatch
30-build-poms.patch
More information about the pkg-java-commits
mailing list