CVS libsaxon-java/debian

[Arnaud Vandyck]

Update of /cvsroot/pkg-java/libsaxon-java/debian
In directory haydn:/tmp/cvs-serv30041/debian

Modified Files:
	README.Debian changelog control libsaxon-java-doc.docs rules 
Log Message:
closing several bugs, thanks to Wolfgang

--- /cvsroot/pkg-java/libsaxon-java/debian/README.Debian	2004/03/23 15:09:16	1.1.1.1
+++ /cvsroot/pkg-java/libsaxon-java/debian/README.Debian	2005/04/04 20:24:23	1.2
@@ -9,13 +9,6 @@
 
 (See the html docs for more details.)
 
-For better performance, you may wish to install a Java2 JVM. The
-Blackdown site has a list of mirrors where you can download their
-debian package of the Sun J2SDK or J2RE. Either one will work. The
-site is here:
-
-  http://www.blackdown.org/java-linux/mirrors.html
-
 - Mark Johnson <mrj@debian.org>, Fri, 21 Sep 2001 06:32:43 -0400
 
 Additionnal comments:
@@ -26,8 +19,4 @@
 the sources and put them in a 'src' directory. Finally I created an orig
 tarball.
 
-Then I can try to compile the whole thing and build the javadoc. I do
-compile with gcj, make the javadoc with gjdoc and jar the parts with
-fastjar, so, everything is free ;)
-
  -- Arnaud Vandyck <arnaud.vandyck@ulg.ac.be>, Wed Aug  6 19:29:01 2003
--- /cvsroot/pkg-java/libsaxon-java/debian/changelog	2004/03/23 15:09:16	1.1.1.1
+++ /cvsroot/pkg-java/libsaxon-java/debian/changelog	2005/04/04 20:24:23	1.2
@@ -1,3 +1,15 @@
+libsaxon-java (1:6.5.3-2) unstable; urgency=medium
+
+  * Adjusted libfop-java dependency to fop to fix
+    FTBS (closes: #301369)
+  * Urgency medium to get it into sarge
+  * Removed section in README.Debian suggesting using a non-free jdk
+    Although built with a non-free jdk - it should work with free runtimes.
+  * Javadoc builds now from source
+  * avdyk: added Wolfgang to the uploaders
+  
+ -- Wolfgang Baer <WBaer@gmx.de>  Sun, 27 Mar 2005 22:57:23 +0200
+
 libsaxon-java (1:6.5.3-1) unstable; urgency=low
 
   * The real release is not 6.5.4 but 6.5.3 (closes: #229339)
--- /cvsroot/pkg-java/libsaxon-java/debian/control	2004/03/23 15:09:16	1.1.1.1
+++ /cvsroot/pkg-java/libsaxon-java/debian/control	2005/04/04 20:24:23	1.2
@@ -2,8 +2,8 @@
 Section: contrib/libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <avdyk@debian.org>
-Build-Depends-Indep: debhelper (>> 4.0.0), j2sdk1.3, fastjar, libgnujaxp-java, libfop-java, libjdom-java
+Uploaders: Arnaud Vandyck <avdyk@debian.org>, Wolfgang Baer <WBaer@gmx.de>
+Build-Depends-Indep: debhelper (>= 4.2.30), j2sdk1.4, fastjar, libgnujaxp-java, fop, libjdom-java
 Standards-Version: 3.6.1
 
 Package: libsaxon-java
@@ -11,8 +11,8 @@
 Provides: lib-saxon-java
 Replaces: lib-saxon-java
 Conflicts: lib-saxon-java
-Depends: kaffe | gij | sablevm | java1-runtime, libgnujaxp-java
-Suggests: libfop-java, libjdom-java
+Depends: kaffe | gij | sablevm | java1-runtime | java2-runtime, libgnujaxp-java
+Suggests: fop, libjdom-java
 Description: The Saxon XSLT Processor
  The saxon package is a collection of tools for processing
  XML documents and implements the XSLT 1.0 recommendation, including
--- /cvsroot/pkg-java/libsaxon-java/debian/libsaxon-java-doc.docs	2004/03/23 15:09:16	1.1.1.1
+++ /cvsroot/pkg-java/libsaxon-java/debian/libsaxon-java-doc.docs	2005/04/04 20:24:23	1.2
@@ -1 +1,3 @@
-doc/*
+doc/*.html
+doc/*.css
+build/api
--- /cvsroot/pkg-java/libsaxon-java/debian/rules	2004/03/23 15:09:16	1.1.1.1
+++ /cvsroot/pkg-java/libsaxon-java/debian/rules	2005/04/04 20:24:23	1.2
@@ -5,13 +5,14 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+export JITC_PROCESSOR_TYPE=6
 PACKAGE=libsaxon-java
-JAVA_HOME=/usr/lib/j2se/1.3
+JAVA_HOME=/usr/lib/j2se/1.4
 BASE=debian/$(PACKAGE)
 JAVASHARE=usr/share/java
 SOURCES=src
 BUILD=build
-APIDOC=doc/api
+APIDOC=build/api
 FOP=com/icl/saxon/fop
 JDOM=com/icl/saxon/jdom
 UPSTREAM_VERSION = 6.5.3
@@ -21,7 +22,7 @@
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	if [ ! -d $(BUILD) ]; then mkdir $(BUILD); fi
+	if [ ! -d $(BUILD) ]; then mkdir $(BUILD); mkdir $(APIDOC); fi	
 	touch configure-stamp
 
 
@@ -34,8 +35,7 @@
 	(cd $(BUILD); fastjar -cf ../saxon.jar META-INF `find . -name \*.class | egrep -v $(JDOM)\|$(FOP)`; \
 	 fastjar -cf ../saxon-fop.jar $(FOP)/*.class; \
 	 fastjar -cf ../saxon-jdom.jar $(JDOM)/*.class )
-	# gjdoc crashes on my machine - bummer! calvin@debian.org
-	#(cd $(APIDOC) ; gjdoc -sourcepath ../../$(SOURCES) -genhtml -verbose @../../debian/libsaxon-java-doc.javadoc)
+	(cd $(APIDOC) ; gjdoc -sourcepath ../../$(SOURCES) @../../debian/libsaxon-java-doc.javadoc)
 	#/usr/bin/docbook-to-man debian/libsaxon-java.sgml > libsaxon-java.1
 	touch build-stamp