[libxalan2-java] 06/71: Debian release 2.6.0-1
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Oct 13 15:38:27 UTC 2017
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 d8a0fdf3d3511782eea025d26f4d677cc80429b4
Author: Stefan Gybas <sgybas at debian.org>
Date: Sun Mar 14 19:21:24 2004 +0000
Debian release 2.6.0-1
---
debian/changelog | 11 +++++++++++
debian/control | 6 +++---
debian/patches/01_build_headless.patch | 32 ++++++++++++++++----------------
debian/patches/02_build_no_doclet.patch | 17 -----------------
debian/rules | 15 ++++-----------
5 files changed, 34 insertions(+), 47 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d1acddf..f5dcf6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+libxalan2-java (2.6.0-1) unstable; urgency=low
+
+ * New upstream release
+ * Don't ship xml-apis.jar any longer since its contents are equal to
+ xmlParserAPIs.jar from libxerces2-java
+ * Use Xerces 2.0 Ant 1.6 during build
+ * Don't install versioned JARs in /usr/share/java since this package has
+ no API itself
+
+ -- Stefan Gybas <sgybas at debian.org> Sun, 14 Mar 2004 18:35:28 +0100
+
libxalan2-java (2.5.1-1) unstable; urgency=low
* New upstream release (closes: #199885)
diff --git a/debian/control b/debian/control
index 6eb891b..feba7f1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,14 +3,14 @@ Section: contrib/libs
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Stefan Gybas <sgybas at debian.org>, Takashi Okamoto <tora at debian.org>
-Build-Depends: cdbs (>= 0.4.8), debhelper (>= 4.1.0), j2sdk1.4, libant1.5-java, libxerces2-java, libbsf-java, libregexp-java, libbcel-java (>= 5.0), jlex, cup
+Build-Depends: cdbs (>= 0.4.8), debhelper (>= 4.1.0), j2sdk1.4, libant1.6-java, libxerces2-java, libbsf-java, libregexp-java, libbcel-java (>= 5.0), jlex, cup
Standards-Version: 3.6.1
Package: libxalan2-java
Architecture: all
Section: contrib/libs
-Depends: libxerces2-java, libbsf-java
-Suggests: libxalan2-java-doc, libxsltc-java
+Depends: libjaxp1.2-java, libxerces2-java
+Suggests: libxalan2-java-doc, libbsf-java, libxsltc-java
Description: XSL Transformations (XSLT) processor in Java
Xalan-Java is an XSLT processor for transforming XML documents into HTML,
text, or other XML document types. It implements the W3C Recommendations for
diff --git a/debian/patches/01_build_headless.patch b/debian/patches/01_build_headless.patch
index 1f8253d..f77083d 100644
--- a/debian/patches/01_build_headless.patch
+++ b/debian/patches/01_build_headless.patch
@@ -1,6 +1,6 @@
---- build.xml.orig 2003-05-30 17:08:41.000000000 +0200
-+++ build.xml 2003-10-17 18:43:31.000000000 +0200
-@@ -222,11 +222,13 @@
+--- 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 -->
<echo message="Transform commits.xml and put the result in ${xdocs.dir}"/>
<java fork="yes" classname="${xalan.cmdline.class}" >
@@ -14,15 +14,15 @@
<classpath refid="docs.class.path" />
<arg line="loaderConfig=sbk:/style/loaderdesign.xml targetDirectory=./build/docs/design/
./xdocs/sources/xalandesign.xml ./xdocs/style"/>
-@@ -340,6 +342,7 @@
+@@ -352,6 +354,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" />
- <!-- We're using JavaCupRedirect to call the java_cup application -->
- <arg line="-parser XPathParser -expect 0
-@@ -791,6 +794,7 @@
+ <!-- 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 @@
<java fork="yes"
classname="${doc.generator}"
classpathref="docs.class.path" >
@@ -30,7 +30,7 @@
<arg line="targetDirectory=${build.docs} ${xdocs.book} ${xdocs.style}"/>
</java>
</target>
-@@ -1106,6 +1110,7 @@
+@@ -1226,6 +1230,7 @@
<java fork="yes"
classname="${doc.generator}"
classpathref="docs.class.path" >
@@ -38,7 +38,7 @@
<arg line="targetDirectory=${site.dir} ${site.book} ${xdocs.style}"/>
</java>
-@@ -1171,6 +1176,7 @@
+@@ -1291,6 +1296,7 @@
<java fork="yes"
classname="${doc.generator}"
classpathref="docs.class.path" >
@@ -46,7 +46,7 @@
<arg line="loaderConfig=sbk:/style/loaderdesign.xml targetDirectory=${build.dir}/docs/design/
${xdocs.dir}/sources/xalandesign.xml ${xdocs.style}"/>
</java>
-@@ -1187,6 +1193,7 @@
+@@ -1307,6 +1313,7 @@
<java fork="yes"
classname="${xalan.cmdline.class}"
classpathref="docs.class.path" >
@@ -54,7 +54,7 @@
<arg line="-xsl ${xdocs.dir}/sources/xalan-collate.xsl
-out xdocs/sources/xalan/xalan-collate.xml"/>
</java>
-@@ -1196,6 +1203,7 @@
+@@ -1316,6 +1323,7 @@
<java fork="yes"
classname="${xalan.cmdline.class}"
classpathref="docs.class.path" >
@@ -62,7 +62,7 @@
<arg line="-in ${xdocs.dir}/sources/xalan/xalan-collate.xml
-param resourceFile '../../sources/xalan/resources.xml'
-param project ${Name-in-docs}
-@@ -1207,6 +1215,7 @@
+@@ -1327,6 +1335,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 +70,15 @@
<arg line="${build.docs}/xalan-collate.fo build/docs/xalan.pdf"/>
</java>
</target>
-@@ -1222,6 +1231,7 @@
- <echo message="Transform xsltc_todo.xml and put the result in ${build.docs}/xsltc"/>
+@@ -1343,6 +1352,7 @@
<mkdir dir="${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>
-@@ -1232,6 +1242,7 @@
+ </target>
+@@ -1352,6 +1362,7 @@
<java fork="yes"
classname="${doc.generator}"
classpathref="docs.class.path" >
diff --git a/debian/patches/02_build_no_doclet.patch b/debian/patches/02_build_no_doclet.patch
deleted file mode 100644
index df9d4fc..0000000
--- a/debian/patches/02_build_no_doclet.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- build.xml.orig 2003-10-17 19:24:51.000000000 +0200
-+++ build.xml 2003-10-17 19:25:03.000000000 +0200
-@@ -825,11 +825,14 @@
- use="true"
- windowtitle="${Name-in-docs} ${impl.version}"
- doctitle="${Name-in-docs} ${impl.version}"
-+ destDir="${build.apidocs}"
- bottom="Copyright © ${year} Apache XML Project. All Rights Reserved.">
- <classpath refid="docs.class.path" />
-+ <!-- Debian notice: Build throws an expection when using this Doclet
- <doclet name="xalanjdoc.Standard" path="${doclet.jar}">
- <param name="-d" value="${build.apidocs}"/>
- </doclet>
-+ -->
- <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/rules b/debian/rules
index 52ab163..07cb5bf 100644
--- a/debian/rules
+++ b/debian/rules
@@ -7,11 +7,11 @@ include /usr/share/cdbs/1/class/ant.mk
# Directories to look for JAVA_HOME (JDK 1.4+ required!)
JAVA_HOME_DIRS := /usr/lib/j2se/1.4 /usr/lib/j2sdk1.4
-ANT_HOME := /usr/share/ant1.5
+ANT_HOME := /usr/share/ant1.6
# Additional JARs to add to the class path, either full path or just the
# basename for JARs in /usr/share/java. The ".jar" suffix may also be ommitted
-DEB_JARS :=
+DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar
# Build compiler
DEB_ANT_COMPILER := modern
@@ -20,20 +20,13 @@ DEB_ANT_COMPILER := modern
DEB_ANT_CLEAN_TARGET := clean xsltc.clean
DEB_ANT_BUILD_TARGET := jar xsltc.unbundledjar samples docs javadocs xsltc.docs
-API_VERSION := 2.5
-
-
clean::
rm -f xdocs/sources/xalan/*DONE XSLTCDONE
install/libxalan2-java::
- install -m 644 build/xalan.jar debian/libxalan2-java/usr/share/java/xalan-$(API_VERSION).jar
- ln -s xalan-$(API_VERSION).jar debian/libxalan2-java/usr/share/java/xalan2.jar
- install -m 644 bin/xml-apis.jar debian/libxalan2-java/usr/share/java/xml-apis-$(API_VERSION).jar
- ln -s xml-apis-$(API_VERSION).jar debian/libxalan2-java/usr/share/java/xml-apis.jar
+ install -m 644 build/xalan.jar debian/libxalan2-java/usr/share/java/xalan2.jar
install/libxsltc-java::
- install -m 644 build/xsltc.jar debian/libxsltc-java/usr/share/java/xsltc-$(API_VERSION).jar
- ln -s xsltc-$(API_VERSION).jar debian/libxsltc-java/usr/share/java/xsltc.jar
+ install -m 644 build/xsltc.jar debian/libxsltc-java/usr/share/java/xsltc.jar
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libxalan2-java.git
More information about the pkg-java-commits
mailing list