[libxalan2-java] 07/71: new upstream from Wolfgang

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 8802bb8ea13f27bab8e5b88a0eac7c49a5ee8f3a
Author: Arnaud Vandyck <avdyk at debian.org>
Date:   Wed Jun 1 14:16:01 2005 +0000

    new upstream from Wolfgang
---
 debian/README.Debian               | 15 +++++++++++++++
 debian/ant.properties              |  3 ++-
 debian/changelog                   | 20 ++++++++++++++++++++
 debian/control                     | 11 +++++------
 debian/libxalan2-java-doc.examples |  1 -
 debian/libxalan2-java.links        |  1 +
 debian/patches/01_Build_xml.patch  | 28 ++++++++++++++++++++++++++++
 debian/rules                       | 15 ++++-----------
 8 files changed, 75 insertions(+), 19 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..ea7c4bd
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,15 @@
+libxalan2-java for Debian
+--------------------
+
+We are now able to move this package to main. It is build 
+with kaffe and is runnable with all free java runtimes.
+
+However, currently we are not able to transform the manual
+completely with free java tools. We disabled the manual
+transformation currently and will add it back as soon
+as the free runtimes are able to do it.
+
+In the meantime please go to the upstream website
+for the manual:
+
+http://xml.apache.org/xalan-j/
diff --git a/debian/ant.properties b/debian/ant.properties
index b80079c..bdcaafb 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -1,4 +1,4 @@
-xmlapis.jar=/usr/share/java/xmlParserAPIs.jar
+xmlapis.jar=/usr/share/xmlParserAPIs.jar
 parser.jar=/usr/share/java/xercesImpl.jar
 bsf.jar=/usr/share/java/bsf.jar
 bcel.jar=/usr/share/java/bcel.jar
@@ -6,3 +6,4 @@ java_cup.jar=/usr/share/java/cup.jar
 #jlex.jar=/usr/share/java/JLex.jar
 runtime.jar=/usr/share/java/cup.jar
 regexp.jar=/usr/share/java/regexp.jar
+build.boot.class.path=/usr/share/java/jaxp-1.2.jar
diff --git a/debian/changelog b/debian/changelog
index f5dcf6c..4682aac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+libxalan2-java (2.6.0-2) experimental; urgency=low
+
+  * Build with kaffe / jikes / gjdoc
+  * Move to main - together with libbsf-java (depending on each other)
+    (closes: #306633) as non-free JDKs are no longer needed
+  * Adjusted build dependencies:
+    + libant1.6-java to versioned dependency >= 1.6.3-1
+    + added libjaxp1.2-java (needed in bootclasspath for compilation)
+      jaxp1.2.jar is added to the ant.properties for correct bootclasspath
+    + added kaffe (>= 2:1.1.5-1) needed for build
+  * Disabled the transformation of the manual until kaffe's cairo
+    Graphics2D backend will be activated - see README.Debian (added)
+  * Don't ship built samples.jar in doc package - source is enough
+  * Changed Build-Depends to Build-Depends-Indep to fix lintian warning
+  * Patched build.xml file (01_Build_xml.patch)
+    + Added maxmemory="256m" to javadoc target
+    + Commented taglet option out - not usable with gjdoc
+
+ -- Wolfgang Baer <WBaer at gmx.de>  Sat, 19 Mar 2005 14:54:04 +0100
+
 libxalan2-java (2.6.0-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index feba7f1..c2155f9 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,13 @@
 Source: libxalan2-java
-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.6-java, libxerces2-java, libbsf-java, libregexp-java, libbcel-java (>= 5.0), jlex, cup
+Uploaders: Stefan Gybas <sgybas at debian.org>, Takashi Okamoto <tora at debian.org>, Wolfgang Baer <WBaer at gmx.de>
+Build-Depends-Indep: debhelper (>= 4.2.30), cdbs (>= 0.4.8), kaffe (>= 2:1.1.5-1), libant1.6-java (>= 1.6.3-1), libxerces2-java, libbsf-java, libregexp-java, libbcel-java (>= 5.0), jlex, cup, libjaxp1.2-java
 Standards-Version: 3.6.1
 
 Package: libxalan2-java
 Architecture: all
-Section: contrib/libs
+Section: libs
 Depends: libjaxp1.2-java, libxerces2-java
 Suggests: libxalan2-java-doc, libbsf-java, libxsltc-java
 Description: XSL Transformations (XSLT) processor in Java
@@ -23,7 +22,7 @@ Description: XSL Transformations (XSLT) processor in Java
 
 Package: libxsltc-java
 Architecture: all
-Section: contrib/libs
+Section: libs
 Depends: libxalan2-java, libregexp-java, libbcel-java (>= 5.0), jlex, cup
 Description: XSL Transformations (XSLT) compiler from Xalan-Java
  XSLTC provides a compiler and a runtime processor. Use the compiler to
@@ -36,7 +35,7 @@ Description: XSL Transformations (XSLT) compiler from Xalan-Java
 
 Package: libxalan2-java-doc
 Architecture: all
-Section: contrib/doc
+Section: doc
 Description: Documentation and examples for the Xalan-Java XSLT processor
  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/libxalan2-java-doc.examples b/debian/libxalan2-java-doc.examples
index 15c8290..781fb73 100644
--- a/debian/libxalan2-java-doc.examples
+++ b/debian/libxalan2-java-doc.examples
@@ -1,2 +1 @@
 samples/*
-build/xalansamples.jar
diff --git a/debian/libxalan2-java.links b/debian/libxalan2-java.links
new file mode 100644
index 0000000..c237f73
--- /dev/null
+++ b/debian/libxalan2-java.links
@@ -0,0 +1 @@
+/usr/share/java/jaxp-1.2.jar	/usr/share/java/xml-apis.jar
diff --git a/debian/patches/01_Build_xml.patch b/debian/patches/01_Build_xml.patch
new file mode 100644
index 0000000..28e4903
--- /dev/null
+++ b/debian/patches/01_Build_xml.patch
@@ -0,0 +1,28 @@
+--- 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 @@
+       <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" />-->
+     </javac>
+     <!-- Copy needed properties, resource, etc. files to be put into .jar file -->
+     <copy todir="${build.classes}">
+@@ -883,6 +883,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.*"
+@@ -893,7 +894,7 @@
+          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}"/>-->
+           <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 07cb5bf..34991e4 100644
--- a/debian/rules
+++ b/debian/rules
@@ -5,25 +5,18 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 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
+JAVA_HOME := /usr/lib/kaffe
 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 := $(ANT_HOME)/lib/ant-launcher.jar
+DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar xmlParserAPIs xercesImpl bsf bcel cup regexp
 
-# Build compiler
-DEB_ANT_COMPILER := modern
-
-# Ant targets to call
+DEB_ANT_COMPILER := jikes
 DEB_ANT_CLEAN_TARGET := clean xsltc.clean
-DEB_ANT_BUILD_TARGET := jar xsltc.unbundledjar samples docs javadocs xsltc.docs
+DEB_ANT_BUILD_TARGET := jar xsltc.unbundledjar javadocs #docs
 
 clean::
 	rm -f xdocs/sources/xalan/*DONE XSLTCDONE
 
-
 install/libxalan2-java::
 	install -m 644 build/xalan.jar debian/libxalan2-java/usr/share/java/xalan2.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