This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository libxalan2-java.
commit 26016547725dedb23a15732e81b3afe1493e4003
Author: Ludovic Claude <ludovic.cla...@laposte.net>
Date: Tue Aug 4 10:09:37 2009 +0000
Migrate the patch to quilt and update it
---
debian/changelog | 1 +
debian/control | 2 +-
debian/patches/01_Build_xml.patch | 30 ------------
.../{01_build_headless.patch => build.patch} | 54 ++++++++++++++++------
debian/patches/series | 2 +
debian/rules | 2 +-
6 files changed, 46 insertions(+), 45 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fbfbf08..e01091e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libxalan2-java (2.7.1-4) experimental; urgency=low
* 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.cla...@laposte.net> Mon, 13 Jul 2009 23:43:51
+0100
diff --git a/debian/control b/debian/control
index 3f64868..89546b8 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers
<pkg-java-maintainers@lists.alioth.debian.org>
Uploaders: Arnaud Vandyck <av...@debian.org>, Marcus Better
<mar...@better.se>, Matthias Klose <d...@ubuntu.com>, Michael Koch
<konque...@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
diff --git a/debian/patches/01_Build_xml.patch
b/debian/patches/01_Build_xml.patch
deleted file mode 100644
index faf12e6..0000000
--- a/debian/patches/01_Build_xml.patch
+++ /dev/null
@@ -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"
diff --git a/debian/patches/01_build_headless.patch b/debian/patches/build.patch
similarity index 75%
rename from debian/patches/01_build_headless.patch
rename to debian/patches/build.patch
index fe974fc..0b4af50 100644
--- a/debian/patches/01_build_headless.patch
+++ b/debian/patches/build.patch
@@ -1,5 +1,5 @@
---- build.xml.orig 2007-12-31 13:18:32.000000000 +0100
-+++ build.xml 2007-12-31 13:20:41.000000000 +0100
+--- 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}"/>
@@ -14,7 +14,17 @@
<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 @@
+@@ -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" >
@@ -22,7 +32,7 @@
<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 @@
+@@ -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" >
@@ -30,7 +40,7 @@
<classpath refid="xsltc.class.path" />
<arg line="-static ${src.dir}/${xsltc.reldir}/compiler/xpath.lex"/>
</java>
-@@ -958,6 +962,7 @@
+@@ -958,6 +964,7 @@
<java fork="yes"
classname="${doc.generator}"
classpathref="docs.class.path" >
@@ -38,7 +48,25 @@
<arg line="targetDirectory=${build.docs} ${xdocs.book}
${xdocs.style}"/>
</java>
</target>
-@@ -1394,6 +1399,7 @@
+@@ -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" >
@@ -46,7 +74,7 @@
<arg line="targetDirectory=${site.dir} ${site.book} ${xdocs.style}"/>
</java>
-@@ -1422,6 +1428,7 @@
+@@ -1422,6 +1433,7 @@
<java fork="yes"
classname="${doc.generator}"
classpathref="docs.class.path" >
@@ -54,7 +82,7 @@
<arg line="targetDirectory=${xalan.apache.org.site.dir}
${xalan.apache.org.site.book} ${xdocs.style}"/>
</java>
-@@ -1474,6 +1481,7 @@
+@@ -1474,6 +1486,7 @@
<java fork="yes"
classname="${doc.generator}"
classpathref="docs.class.path" >
@@ -62,7 +90,7 @@
<arg line="loaderConfig=sbk:/style/loaderdesign.xml
targetDirectory=${build.dir}/docs/design/
${xdocs.dir}/sources/xalandesign.xml ${xdocs.style}"/>
</java>
-@@ -1490,6 +1498,7 @@
+@@ -1490,6 +1503,7 @@
<java fork="yes"
classname="${xalan.cmdline.class}"
classpathref="docs.class.path" >
@@ -70,7 +98,7 @@
<arg line="-xsl ${xdocs.dir}/sources/xalan-collate.xsl
-out xdocs/sources/xalan/xalan-collate.xml"/>
</java>
-@@ -1499,6 +1508,7 @@
+@@ -1499,6 +1513,7 @@
<java fork="yes"
classname="${xalan.cmdline.class}"
classpathref="docs.class.path" >
@@ -78,7 +106,7 @@
<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 @@
+@@ -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">
@@ -86,7 +114,7 @@
<arg line="${build.docs}/xalan-collate.fo build/docs/xalan.pdf"/>
</java>
</target>
-@@ -1526,6 +1537,7 @@
+@@ -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}">
@@ -94,7 +122,7 @@
<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 @@
+@@ -1536,6 +1553,7 @@
<java fork="yes"
classname="${doc.generator}"
classpathref="docs.class.path" >
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..385dc21
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+build.patch
+
diff --git a/debian/rules b/debian/rules
index 6473033..d9e482f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/libxalan2-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
