[pkg-java] r9570 - in trunk/libxalan2-java/debian: . patches
Ludovic Claude
ludovicc-guest at alioth.debian.org
Tue Aug 4 10:09:37 UTC 2009
Author: ludovicc-guest
Date: 2009-08-04 10:09:37 +0000 (Tue, 04 Aug 2009)
New Revision: 9570
Added:
trunk/libxalan2-java/debian/patches/build.patch
trunk/libxalan2-java/debian/patches/series
Removed:
trunk/libxalan2-java/debian/patches/01_Build_xml.patch
trunk/libxalan2-java/debian/patches/01_build_headless.patch
Modified:
trunk/libxalan2-java/debian/changelog
trunk/libxalan2-java/debian/control
trunk/libxalan2-java/debian/rules
Log:
Migrate the patch to quilt and update it
Modified: trunk/libxalan2-java/debian/changelog
===================================================================
--- trunk/libxalan2-java/debian/changelog 2009-08-03 22:38:08 UTC (rev 9569)
+++ trunk/libxalan2-java/debian/changelog 2009-08-04 10:09:37 UTC (rev 9570)
@@ -5,6 +5,7 @@
* Change section to java for all Java binary packages
* Install serializer.jar in /usr/share/java as it was
done in 2.7.1-2
+ * Migrate the patch to quilt and update it
-- Ludovic Claude <ludovic.claude at laposte.net> Mon, 13 Jul 2009 23:43:51 +0100
Modified: trunk/libxalan2-java/debian/control
===================================================================
--- trunk/libxalan2-java/debian/control 2009-08-03 22:38:08 UTC (rev 9569)
+++ trunk/libxalan2-java/debian/control 2009-08-04 10:09:37 UTC (rev 9570)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Arnaud Vandyck <avdyk at debian.org>, Marcus Better <marcus at better.se>, Matthias Klose <doko at ubuntu.com>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 5.0.0), cdbs (>= 0.4.8), default-jdk-builddep, ant (>= 1.6.3),
+Build-Depends: debhelper (>= 5.0.0), cdbs (>= 0.4.8), default-jdk-builddep, ant (>= 1.6.3), quilt,
maven-repo-helper, libxerces2-java (>= 2.8.0), libbsf-java,
libregexp-java, libbcel-java (>= 5.0), jlex, cup, libjaxp1.3-java, libstylebook-java
Standards-Version: 3.8.2
Deleted: trunk/libxalan2-java/debian/patches/01_Build_xml.patch
===================================================================
--- trunk/libxalan2-java/debian/patches/01_Build_xml.patch 2009-08-03 22:38:08 UTC (rev 9569)
+++ trunk/libxalan2-java/debian/patches/01_Build_xml.patch 2009-08-04 10:09:37 UTC (rev 9570)
@@ -1,30 +0,0 @@
---- build.xml.orig 2007-12-31 13:26:40.000000000 +0100
-+++ build.xml 2007-12-31 13:30:32.000000000 +0100
-@@ -408,7 +408,9 @@
- <exclude name="${xsltc.reldir}/**/*.java" />
- <classpath refid="compile.class.path" />
- <bootclasspath refid="xslt.boot.class.path" />
-+ <!--
- <sourcepath refid="compile.source.path" />
-+ -->
- </javac>
- <!-- Copy needed properties, resource, etc. files to be put into .jar file -->
- <copy todir="${build.classes}">
-@@ -1034,6 +1036,7 @@
- additionalparam="-breakiterator"
- destdir="${build.apidocs}"
- public="true"
-+ maxmemory="256m"
- sourcepath="${src.dir}"
- overview="${src.dir}/javadocOverview.html"
- packagenames="org.apache.*,org.xml.*,org.w3c.*,javax.xml.*"
-@@ -1044,7 +1047,9 @@
- doctitle="${Name-in-docs} ${impl.version}"
- bottom="Copyright © ${year} Apache XML Project. All Rights Reserved.">
- <classpath refid="docs.class.path" />
-+ <!--
- <taglet name="xalan2jtaglet.XSLUsageTag" path="${taglet.jar}"/>
-+ -->
- <group title="Transformations API for XML (TrAX)" packages="javax.xml.transform*"/>
- <group title="Java API for XML Parsing" packages="javax.xml.parsers"/>
- <group title="Xalan Core"
Deleted: trunk/libxalan2-java/debian/patches/01_build_headless.patch
===================================================================
--- trunk/libxalan2-java/debian/patches/01_build_headless.patch 2009-08-03 22:38:08 UTC (rev 9569)
+++ trunk/libxalan2-java/debian/patches/01_build_headless.patch 2009-08-04 10:09:37 UTC (rev 9570)
@@ -1,104 +0,0 @@
---- build.xml.orig 2007-12-31 13:18:32.000000000 +0100
-+++ build.xml 2007-12-31 13:20:41.000000000 +0100
-@@ -354,11 +354,13 @@
- puts the result in xdocs/sources/xalan for inclusion in the readme.xml -->
- <echo message="Transform commits.xml and put the result in ${xdocs.dir}"/>
- <java fork="yes" classname="${xalan.cmdline.class}" >
-+ <jvmarg value="-Djava.awt.headless=true"/>
- <classpath refid="docs.class.path" />
- <arg line="-in commits.xml -xsl ${xdocs.style}/stylesheets/done.xsl -out ${xdocs.DONE.file} -param xsltcdone ${xdocs.XSLTCDONE.file}"/>
- </java>
- <echo message="Generate Xalan-J 2.x design document"/>
- <java fork="yes" classname="${doc.generator}" >
-+ <jvmarg value="-Djava.awt.headless=true"/>
- <classpath refid="docs.class.path" />
- <arg line="loaderConfig=sbk:/style/loaderdesign.xml targetDirectory=./build/docs/design/
- ./xdocs/sources/xalandesign.xml ./xdocs/style"/>
-@@ -475,6 +477,7 @@
- <echo message="java_cup preparsing"/>
- <java fork="yes" failonerror="true"
- classname="org.apache.xalan.xsltc.util.JavaCupRedirect" >
-+ <jvmarg value="-Djava.awt.headless=true"/>
- <classpath refid="xsltc.class.path" />
- <!-- need to bootclasspath java_cup for JDKs that include JavaCupRedirect -->
- <jvmarg value="-Xbootclasspath/p:${java_cup.jar}${path.separator}${runtime.jar}"/>
-@@ -493,6 +496,7 @@
- has to be generated after sym.java, so order is important. -->
- <echo message="JLex preparsing"/>
- <java fork="yes" failonerror="true" classname="JLex.Main" >
-+ <jvmarg value="-Djava.awt.headless=true"/>
- <classpath refid="xsltc.class.path" />
- <arg line="-static ${src.dir}/${xsltc.reldir}/compiler/xpath.lex"/>
- </java>
-@@ -958,6 +962,7 @@
- <java fork="yes"
- classname="${doc.generator}"
- classpathref="docs.class.path" >
-+ <jvmarg value="-Djava.awt.headless=true"/>
- <arg line="targetDirectory=${build.docs} ${xdocs.book} ${xdocs.style}"/>
- </java>
- </target>
-@@ -1394,6 +1399,7 @@
- <java fork="yes"
- classname="${doc.generator}"
- classpathref="docs.class.path" >
-+ <jvmarg value="-Djava.awt.headless=true"/>
- <arg line="targetDirectory=${site.dir} ${site.book} ${xdocs.style}"/>
- </java>
-
-@@ -1422,6 +1428,7 @@
- <java fork="yes"
- classname="${doc.generator}"
- classpathref="docs.class.path" >
-+ <jvmarg value="-Djava.awt.headless=true"/>
- <arg line="targetDirectory=${xalan.apache.org.site.dir} ${xalan.apache.org.site.book} ${xdocs.style}"/>
- </java>
-
-@@ -1474,6 +1481,7 @@
- <java fork="yes"
- classname="${doc.generator}"
- classpathref="docs.class.path" >
-+ <jvmarg value="-Djava.awt.headless=true"/>
- <arg line="loaderConfig=sbk:/style/loaderdesign.xml targetDirectory=${build.dir}/docs/design/
- ${xdocs.dir}/sources/xalandesign.xml ${xdocs.style}"/>
- </java>
-@@ -1490,6 +1498,7 @@
- <java fork="yes"
- classname="${xalan.cmdline.class}"
- classpathref="docs.class.path" >
-+ <jvmarg value="-Djava.awt.headless=true"/>
- <arg line="-xsl ${xdocs.dir}/sources/xalan-collate.xsl
- -out xdocs/sources/xalan/xalan-collate.xml"/>
- </java>
-@@ -1499,6 +1508,7 @@
- <java fork="yes"
- classname="${xalan.cmdline.class}"
- classpathref="docs.class.path" >
-+ <jvmarg value="-Djava.awt.headless=true"/>
- <arg line="-in ${xdocs.dir}/sources/xalan/xalan-collate.xml
- -param resourceFile '../../sources/xalan/resources.xml'
- -param project ${Name-in-docs}
-@@ -1510,6 +1520,7 @@
- <java fork="yes"
- classname="org.apache.fop.apps.CommandLine"
- classpath="${java.class.path}:${build.xalan.jar}:${bin.dir}/fop.jar:${bin.dir}/w3c.jar">
-+ <jvmarg value="-Djava.awt.headless=true"/>
- <arg line="${build.docs}/xalan-collate.fo build/docs/xalan.pdf"/>
- </java>
- </target>
-@@ -1526,6 +1537,7 @@
- <!--
- <echo message="Transform xsltc_todo.xml and put the result in ${build.docs}/xsltc"/>
- <java fork="yes" classname="${xalan.cmdline.class}">
-+ <jvmarg value="-Djava.awt.headless=true"/>
- <classpath refid="docs.class.path" />
- <arg line="-in xsltc_todo.xml -xsl todo.xsl -out build/docs/xsltc/todo.html"/>
- </java> -->
-@@ -1536,6 +1548,7 @@
- <java fork="yes"
- classname="${doc.generator}"
- classpathref="docs.class.path" >
-+ <jvmarg value="-Djava.awt.headless=true"/>
- <arg line="targetDirectory=${build.docs}/xsltc ${xdocs.dir}/sources/xsltc.xml ${xdocs.style}"/>
- </java>
- <copy todir="${build.docs}/xsltc"
Added: trunk/libxalan2-java/debian/patches/build.patch
===================================================================
--- trunk/libxalan2-java/debian/patches/build.patch (rev 0)
+++ trunk/libxalan2-java/debian/patches/build.patch 2009-08-04 10:09:37 UTC (rev 9570)
@@ -0,0 +1,132 @@
+--- a/build.xml
++++ b/build.xml
+@@ -354,11 +354,13 @@
+ puts the result in xdocs/sources/xalan for inclusion in the readme.xml -->
+ <echo message="Transform commits.xml and put the result in ${xdocs.dir}"/>
+ <java fork="yes" classname="${xalan.cmdline.class}" >
++ <jvmarg value="-Djava.awt.headless=true"/>
+ <classpath refid="docs.class.path" />
+ <arg line="-in commits.xml -xsl ${xdocs.style}/stylesheets/done.xsl -out ${xdocs.DONE.file} -param xsltcdone ${xdocs.XSLTCDONE.file}"/>
+ </java>
+ <echo message="Generate Xalan-J 2.x design document"/>
+ <java fork="yes" classname="${doc.generator}" >
++ <jvmarg value="-Djava.awt.headless=true"/>
+ <classpath refid="docs.class.path" />
+ <arg line="loaderConfig=sbk:/style/loaderdesign.xml targetDirectory=./build/docs/design/
+ ./xdocs/sources/xalandesign.xml ./xdocs/style"/>
+@@ -406,7 +408,9 @@
+ <exclude name="${xsltc.reldir}/**/*.java" />
+ <classpath refid="compile.class.path" />
+ <bootclasspath refid="xslt.boot.class.path" />
++ <!--
+ <sourcepath refid="compile.source.path" />
++ -->
+ </javac>
+ <!-- Copy needed properties, resource, etc. files to be put into .jar file -->
+ <copy todir="${build.classes}">
+@@ -475,6 +479,7 @@
+ <echo message="java_cup preparsing"/>
+ <java fork="yes" failonerror="true"
+ classname="org.apache.xalan.xsltc.util.JavaCupRedirect" >
++ <jvmarg value="-Djava.awt.headless=true"/>
+ <classpath refid="xsltc.class.path" />
+ <!-- need to bootclasspath java_cup for JDKs that include JavaCupRedirect -->
+ <jvmarg value="-Xbootclasspath/p:${java_cup.jar}${path.separator}${runtime.jar}"/>
+@@ -493,6 +498,7 @@
+ has to be generated after sym.java, so order is important. -->
+ <echo message="JLex preparsing"/>
+ <java fork="yes" failonerror="true" classname="JLex.Main" >
++ <jvmarg value="-Djava.awt.headless=true"/>
+ <classpath refid="xsltc.class.path" />
+ <arg line="-static ${src.dir}/${xsltc.reldir}/compiler/xpath.lex"/>
+ </java>
+@@ -958,6 +964,7 @@
+ <java fork="yes"
+ classname="${doc.generator}"
+ classpathref="docs.class.path" >
++ <jvmarg value="-Djava.awt.headless=true"/>
+ <arg line="targetDirectory=${build.docs} ${xdocs.book} ${xdocs.style}"/>
+ </java>
+ </target>
+@@ -1029,6 +1036,7 @@
+ additionalparam="-breakiterator"
+ destdir="${build.apidocs}"
+ public="true"
++ maxmemory="256m"
+ sourcepath="${src.dir}"
+ overview="${src.dir}/javadocOverview.html"
+ packagenames="org.apache.*,org.xml.*,org.w3c.*,javax.xml.*"
+@@ -1039,7 +1047,9 @@
+ doctitle="${Name-in-docs} ${impl.version}"
+ bottom="Copyright © ${year} Apache XML Project. All Rights Reserved.">
+ <classpath refid="docs.class.path" />
++ <!--
+ <taglet name="xalan2jtaglet.XSLUsageTag" path="${taglet.jar}"/>
++ -->
+ <group title="Transformations API for XML (TrAX)" packages="javax.xml.transform*"/>
+ <group title="Java API for XML Parsing" packages="javax.xml.parsers"/>
+ <group title="Xalan Core"
+@@ -1394,6 +1404,7 @@
+ <java fork="yes"
+ classname="${doc.generator}"
+ classpathref="docs.class.path" >
++ <jvmarg value="-Djava.awt.headless=true"/>
+ <arg line="targetDirectory=${site.dir} ${site.book} ${xdocs.style}"/>
+ </java>
+
+@@ -1422,6 +1433,7 @@
+ <java fork="yes"
+ classname="${doc.generator}"
+ classpathref="docs.class.path" >
++ <jvmarg value="-Djava.awt.headless=true"/>
+ <arg line="targetDirectory=${xalan.apache.org.site.dir} ${xalan.apache.org.site.book} ${xdocs.style}"/>
+ </java>
+
+@@ -1474,6 +1486,7 @@
+ <java fork="yes"
+ classname="${doc.generator}"
+ classpathref="docs.class.path" >
++ <jvmarg value="-Djava.awt.headless=true"/>
+ <arg line="loaderConfig=sbk:/style/loaderdesign.xml targetDirectory=${build.dir}/docs/design/
+ ${xdocs.dir}/sources/xalandesign.xml ${xdocs.style}"/>
+ </java>
+@@ -1490,6 +1503,7 @@
+ <java fork="yes"
+ classname="${xalan.cmdline.class}"
+ classpathref="docs.class.path" >
++ <jvmarg value="-Djava.awt.headless=true"/>
+ <arg line="-xsl ${xdocs.dir}/sources/xalan-collate.xsl
+ -out xdocs/sources/xalan/xalan-collate.xml"/>
+ </java>
+@@ -1499,6 +1513,7 @@
+ <java fork="yes"
+ classname="${xalan.cmdline.class}"
+ classpathref="docs.class.path" >
++ <jvmarg value="-Djava.awt.headless=true"/>
+ <arg line="-in ${xdocs.dir}/sources/xalan/xalan-collate.xml
+ -param resourceFile '../../sources/xalan/resources.xml'
+ -param project ${Name-in-docs}
+@@ -1510,6 +1525,7 @@
+ <java fork="yes"
+ classname="org.apache.fop.apps.CommandLine"
+ classpath="${java.class.path}:${build.xalan.jar}:${bin.dir}/fop.jar:${bin.dir}/w3c.jar">
++ <jvmarg value="-Djava.awt.headless=true"/>
+ <arg line="${build.docs}/xalan-collate.fo build/docs/xalan.pdf"/>
+ </java>
+ </target>
+@@ -1526,6 +1542,7 @@
+ <!--
+ <echo message="Transform xsltc_todo.xml and put the result in ${build.docs}/xsltc"/>
+ <java fork="yes" classname="${xalan.cmdline.class}">
++ <jvmarg value="-Djava.awt.headless=true"/>
+ <classpath refid="docs.class.path" />
+ <arg line="-in xsltc_todo.xml -xsl todo.xsl -out build/docs/xsltc/todo.html"/>
+ </java> -->
+@@ -1536,6 +1553,7 @@
+ <java fork="yes"
+ classname="${doc.generator}"
+ classpathref="docs.class.path" >
++ <jvmarg value="-Djava.awt.headless=true"/>
+ <arg line="targetDirectory=${build.docs}/xsltc ${xdocs.dir}/sources/xsltc.xml ${xdocs.style}"/>
+ </java>
+ <copy todir="${build.docs}/xsltc"
Added: trunk/libxalan2-java/debian/patches/series
===================================================================
--- trunk/libxalan2-java/debian/patches/series (rev 0)
+++ trunk/libxalan2-java/debian/patches/series 2009-08-04 10:09:37 UTC (rev 9570)
@@ -0,0 +1,2 @@
+build.patch
+
Modified: trunk/libxalan2-java/debian/rules
===================================================================
--- trunk/libxalan2-java/debian/rules 2009-08-03 22:38:08 UTC (rev 9569)
+++ trunk/libxalan2-java/debian/rules 2009-08-04 10:09:37 UTC (rev 9570)
@@ -2,7 +2,7 @@
# debian/rules file for libxalan2-java (uses cdbs)
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/class/ant.mk
PACKAGE := $(DEB_SOURCE_PACKAGE)
More information about the pkg-java-commits
mailing list