CVS libxalan2-java/debian

Arnaud Vandyck avdyk@haydn.debian.org
Wed Jun 1 14:16:02 2005


Update of /cvsroot/pkg-java/libxalan2-java/debian
In directory haydn:/tmp/cvs-serv12567/debian

Modified Files:
	ant.properties changelog control libxalan2-java-doc.examples 
	rules 
Added Files:
	README.Debian libxalan2-java.links 
Log Message:
new upstream from Wolfgang

--- /cvsroot/pkg-java/libxalan2-java/debian/ant.properties	2003/10/17 17:37:26	1.1
+++ /cvsroot/pkg-java/libxalan2-java/debian/ant.properties	2005/06/01 14:16:00	1.2
@@ -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 @@
 #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
--- /cvsroot/pkg-java/libxalan2-java/debian/changelog	2004/03/14 19:21:24	1.5
+++ /cvsroot/pkg-java/libxalan2-java/debian/changelog	2005/06/01 14:16:00	1.6
@@ -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@gmx.de>  Sat, 19 Mar 2005 14:54:04 +0100
+
 libxalan2-java (2.6.0-1) unstable; urgency=low
 
   * New upstream release
--- /cvsroot/pkg-java/libxalan2-java/debian/control	2004/03/14 19:21:24	1.6
+++ /cvsroot/pkg-java/libxalan2-java/debian/control	2005/06/01 14:16:00	1.7
@@ -1,14 +1,13 @@
 Source: libxalan2-java
-Section: contrib/libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Stefan Gybas <sgybas@debian.org>, Takashi Okamoto <tora@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@debian.org>, Takashi Okamoto <tora@debian.org>, Wolfgang Baer <WBaer@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 @@
 
 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 @@
 
 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
--- /cvsroot/pkg-java/libxalan2-java/debian/libxalan2-java-doc.examples	2002/10/01 15:49:47	1.1.1.1
+++ /cvsroot/pkg-java/libxalan2-java/debian/libxalan2-java-doc.examples	2005/06/01 14:16:00	1.2
@@ -1,2 +1 @@
 samples/*
-build/xalansamples.jar
--- /cvsroot/pkg-java/libxalan2-java/debian/rules	2004/03/14 19:21:24	1.5
+++ /cvsroot/pkg-java/libxalan2-java/debian/rules	2005/06/01 14:16:00	1.6
@@ -5,25 +5,18 @@
 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