[libsaxon-java] 02/33: closing several bugs, thanks to Wolfgang

Mon Jun 19 12:26:38 UTC 2017

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libsaxon-java.

commit bbde75894dc25ab29f7116147a5d5441020e7f48
Author: Arnaud Vandyck <avdyk at debian.org>
Date:   Mon Apr 4 20:24:23 2005 +0000

    closing several bugs, thanks to Wolfgang
---
 debian/README.Debian          | 11 -----------
 debian/changelog              | 12 ++++++++++++
 debian/control                |  8 ++++----
 debian/libsaxon-java-doc.docs |  4 +++-
 debian/rules                  | 10 +++++-----
 5 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 48a443b..1dcda4f 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -9,13 +9,6 @@ java -classpath=/usr/share/java/saxon.jar com.icl.saxon.StyleSheet \
 
 (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 at debian.org>, Fri, 21 Sep 2001 06:32:43 -0400
 
 Additionnal comments:
@@ -26,8 +19,4 @@ the jar files and the javadoc (everything I can build). Then, I unjar
 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 at ulg.ac.be>, Wed Aug  6 19:29:01 2003
diff --git a/debian/changelog b/debian/changelog
index 0d42422..1529d6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 at 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)
diff --git a/debian/control b/debian/control
index 9bef46e..9827401 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: libsaxon-java
 Section: contrib/libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <avdyk at debian.org>
-Build-Depends-Indep: debhelper (>> 4.0.0), j2sdk1.3, fastjar, libgnujaxp-java, libfop-java, libjdom-java
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at 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 @@ Architecture: all
 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
diff --git a/debian/libsaxon-java-doc.docs b/debian/libsaxon-java-doc.docs
index 30d29de..b4871d4 100644
--- a/debian/libsaxon-java-doc.docs
+++ b/debian/libsaxon-java-doc.docs
@@ -1 +1,3 @@
-doc/*
+doc/*.html
+doc/*.css
+build/api
diff --git a/debian/rules b/debian/rules
index a6d10f2..bf015c8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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 @@ CLASSPATH = /usr/share/java/gnujaxp.jar:/usr/share/java/jdom.jar:/usr/share/java
 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 @@ build-stamp: configure-stamp
 	(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 at 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
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libsaxon-java.git

