[pkg-java] r5280 - in trunk/libxalan2-java/debian: . patches
mkoch at alioth.debian.org
mkoch at alioth.debian.org
Thu Jan 3 19:41:09 UTC 2008
Author: mkoch
Date: 2008-01-03 19:41:09 +0000 (Thu, 03 Jan 2008)
New Revision: 5280
Modified:
trunk/libxalan2-java/debian/ant.properties
trunk/libxalan2-java/debian/changelog
trunk/libxalan2-java/debian/control
trunk/libxalan2-java/debian/patches/01_Build_xml.patch
trunk/libxalan2-java/debian/patches/01_build_headless.patch
trunk/libxalan2-java/debian/rules
Log:
libxalan2-java (2.7.1-1) unstable; urgency=low
* New upstream release.
* Fixed path to xmlParserAPIs.jar in debian/ant.properties.
* Added Homepage field.
* Renamed XS-Vcs-Svn fielt to Vcs-Svn and XS-Vcs-Browse to Vcs-Browser.
* Updated Standards-Version to 3.7.3.
* Added myself to Uploaders.
-- Michael Koch <konqueror at gmx.de> Tue, 01 Jan 2008 14:33:39 +0100
Modified: trunk/libxalan2-java/debian/ant.properties
===================================================================
--- trunk/libxalan2-java/debian/ant.properties 2008-01-03 14:56:01 UTC (rev 5279)
+++ trunk/libxalan2-java/debian/ant.properties 2008-01-03 19:41:09 UTC (rev 5280)
@@ -1,4 +1,4 @@
-xmlapis.jar=/usr/share/xmlParserAPIs.jar
+xmlapis.jar=/usr/share/java/xmlParserAPIs.jar
parser.jar=/usr/share/java/xercesImpl.jar
bsf.jar=/usr/share/java/bsf.jar
bcel.jar=/usr/share/java/bcel.jar
Modified: trunk/libxalan2-java/debian/changelog
===================================================================
--- trunk/libxalan2-java/debian/changelog 2008-01-03 14:56:01 UTC (rev 5279)
+++ trunk/libxalan2-java/debian/changelog 2008-01-03 19:41:09 UTC (rev 5280)
@@ -1,3 +1,14 @@
+libxalan2-java (2.7.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Fixed path to xmlParserAPIs.jar in debian/ant.properties.
+ * Added Homepage field.
+ * Renamed XS-Vcs-Svn fielt to Vcs-Svn and XS-Vcs-Browse to Vcs-Browser.
+ * Updated Standards-Version to 3.7.3.
+ * Added myself to Uploaders.
+
+ -- Michael Koch <konqueror at gmx.de> Tue, 01 Jan 2008 14:33:39 +0100
+
libxalan2-java (2.7.0-5) unstable; urgency=low
* debian/control: removed Stefan Gybas, Wolfgang Baer and Jeroen van
Modified: trunk/libxalan2-java/debian/control
===================================================================
--- trunk/libxalan2-java/debian/control 2008-01-03 14:56:01 UTC (rev 5279)
+++ trunk/libxalan2-java/debian/control 2008-01-03 19:41:09 UTC (rev 5280)
@@ -2,12 +2,12 @@
Section: libs
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>
+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), java-gcj-compat-dev (>= 1.0.65-6), ant (>= 1.6.3-1), libxerces2-java (>= 2.8.0), libbsf-java, libregexp-java, libbcel-java (>= 5.0), jlex, cup, libjaxp1.3-java, libstylebook-java
-Standards-Version: 3.7.2
-Homepage: http://xml.apache.org/xalan-j/
+Standards-Version: 3.7.3
Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/libxalan2-java
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libxalan2-java/
+Homepage: http://xml.apache.org/xalan-j/
Package: libxalan2-java
Architecture: all
@@ -32,8 +32,6 @@
XSL Transformations (XSLT) and the XML Path Language (XPath). It can be used
from the command line, in an applet or a servlet, or as a module in other
programs.
- .
- This package contains the natively compiled code for use by gij.
Package: libxsltc-java
Architecture: all
Modified: trunk/libxalan2-java/debian/patches/01_Build_xml.patch
===================================================================
--- trunk/libxalan2-java/debian/patches/01_Build_xml.patch 2008-01-03 14:56:01 UTC (rev 5279)
+++ trunk/libxalan2-java/debian/patches/01_Build_xml.patch 2008-01-03 19:41:09 UTC (rev 5280)
@@ -1,28 +1,30 @@
---- build.xml.orig 2005-05-19 19:51:30.000000000 +0200
-+++ build.xml 2005-05-19 19:52:59.000000000 +0200
-@@ -284,7 +284,7 @@
+--- 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" />
-+ <!--<sourcepath refid="compile.source.path" />-->
++ <!--
+ <sourcepath refid="compile.source.path" />
++ -->
</javac>
<!-- Copy needed properties, resource, etc. files to be put into .jar file -->
<copy todir="${build.classes}">
-@@ -883,6 +883,7 @@
+@@ -1034,6 +1036,7 @@
additionalparam="-breakiterator"
destdir="${build.apidocs}"
public="true"
-+ maxmemory="256m"
++ maxmemory="256m"
sourcepath="${src.dir}"
overview="${src.dir}/javadocOverview.html"
packagenames="org.apache.*,org.xml.*,org.w3c.*,javax.xml.*"
-@@ -893,7 +894,7 @@
+@@ -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}"/>
-+ <!--<taglet name="xalan2jtaglet.XSLUsageTag" path="${taglet.jar}"/>-->
++ <!--
+ <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"
Modified: trunk/libxalan2-java/debian/patches/01_build_headless.patch
===================================================================
--- trunk/libxalan2-java/debian/patches/01_build_headless.patch 2008-01-03 14:56:01 UTC (rev 5279)
+++ trunk/libxalan2-java/debian/patches/01_build_headless.patch 2008-01-03 19:41:09 UTC (rev 5280)
@@ -1,7 +1,7 @@
---- build.xml.orig 2004-02-27 22:47:15.000000000 +0100
-+++ build.xml 2004-03-14 18:44:54.000000000 +0100
-@@ -234,11 +234,13 @@
- readme.xml -->
+--- 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"/>
@@ -14,7 +14,7 @@
<classpath refid="docs.class.path" />
<arg line="loaderConfig=sbk:/style/loaderdesign.xml targetDirectory=./build/docs/design/
./xdocs/sources/xalandesign.xml ./xdocs/style"/>
-@@ -352,6 +354,7 @@
+@@ -475,6 +477,7 @@
<echo message="java_cup preparsing"/>
<java fork="yes" failonerror="true"
classname="org.apache.xalan.xsltc.util.JavaCupRedirect" >
@@ -22,31 +22,47 @@
<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}"/>
-@@ -829,6 +832,7 @@
+@@ -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"/>
++ <jvmarg value="-Djava.awt.headless=true"/>
<arg line="targetDirectory=${build.docs} ${xdocs.book} ${xdocs.style}"/>
</java>
</target>
-@@ -1226,6 +1230,7 @@
+@@ -1394,6 +1399,7 @@
<java fork="yes"
classname="${doc.generator}"
classpathref="docs.class.path" >
-+ <jvmarg value="-Djava.awt.headless=true"/>
++ <jvmarg value="-Djava.awt.headless=true"/>
<arg line="targetDirectory=${site.dir} ${site.book} ${xdocs.style}"/>
</java>
-@@ -1291,6 +1296,7 @@
+@@ -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>
-@@ -1307,6 +1313,7 @@
+@@ -1490,6 +1498,7 @@
<java fork="yes"
classname="${xalan.cmdline.class}"
classpathref="docs.class.path" >
@@ -54,7 +70,7 @@
<arg line="-xsl ${xdocs.dir}/sources/xalan-collate.xsl
-out xdocs/sources/xalan/xalan-collate.xml"/>
</java>
-@@ -1316,6 +1323,7 @@
+@@ -1499,6 +1508,7 @@
<java fork="yes"
classname="${xalan.cmdline.class}"
classpathref="docs.class.path" >
@@ -62,7 +78,7 @@
<arg line="-in ${xdocs.dir}/sources/xalan/xalan-collate.xml
-param resourceFile '../../sources/xalan/resources.xml'
-param project ${Name-in-docs}
-@@ -1327,6 +1335,7 @@
+@@ -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">
@@ -70,15 +86,15 @@
<arg line="${build.docs}/xalan-collate.fo build/docs/xalan.pdf"/>
</java>
</target>
-@@ -1343,6 +1352,7 @@
- <mkdir dir="${build.docs}/xsltc"/>
- <java fork="yes" classname="${xalan.cmdline.class}">
+@@ -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" />
-+ <jvmarg value="-Djava.awt.headless=true"/>
<arg line="-in xsltc_todo.xml -xsl todo.xsl -out build/docs/xsltc/todo.html"/>
- </java>
- </target>
-@@ -1352,6 +1362,7 @@
+ </java> -->
+@@ -1536,6 +1548,7 @@
<java fork="yes"
classname="${doc.generator}"
classpathref="docs.class.path" >
Modified: trunk/libxalan2-java/debian/rules
===================================================================
--- trunk/libxalan2-java/debian/rules 2008-01-03 14:56:01 UTC (rev 5279)
+++ trunk/libxalan2-java/debian/rules 2008-01-03 19:41:09 UTC (rev 5280)
@@ -21,7 +21,13 @@
clean::
rm -f xdocs/sources/xalan/*DONE XSLTCDONE
+ rm -f lib/BCEL.jar lib/regexp.jar
+pre-build::
+ rm -f lib/BCEL.jar lib/regexp.jar
+ ln -s /usr/share/java/bcel.jar lib/BCEL.jar
+ ln -s /usr/share/java/regexp.jar lib/regexp.jar
+
install/libxalan2-java::
install -m 644 build/xalan.jar debian/libxalan2-java/usr/share/java/xalan2.jar
install -m 644 build/serializer.jar debian/libxalan2-java/usr/share/java
More information about the pkg-java-commits
mailing list