[libsaxon-java] 05/33: libsaxon-java (1:6.5.4-1) unstable; urgency=low

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 920627ba85063434c8437ee1251696aeacb2853a
Author: Arnaud Vandyck <avdyk at debian.org>
Date:   Wed Aug 17 00:21:54 2005 +0000

    libsaxon-java (1:6.5.4-1) unstable; urgency=low
    
      * New upstream release
      * fop support is dropped upstream
        - updated debian dir to remove fop specific build stuff
        - removed fop build-dep and suggests
      * Move to main (closes: #122556)
      * Build with kaffe / jikes / gjdoc
      * Removed conflicts,provides,replaces with lib-saxon-java
      * Changed libjdom-java to the final release libjdom1-java
      * Standards-Version 3.6.2 (no changes)
    
      * Upload sponsored by Arnaud Vandyck
    
     -- Wolfgang Baer <WBaer at gmx.de>  Tue, 16 Aug 2005 22:46:04 +0200
---
 debian/README.Debian             |  2 +-
 debian/changelog                 | 16 ++++++++++++++++
 debian/control                   | 13 +++++--------
 debian/libsaxon-java-doc.javadoc |  1 -
 debian/rules                     | 39 ++++++++-------------------------------
 5 files changed, 30 insertions(+), 41 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 1dcda4f..cd85491 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -11,7 +11,7 @@ java -classpath=/usr/share/java/saxon.jar com.icl.saxon.StyleSheet \
 
 - Mark Johnson <mrj at debian.org>, Fri, 21 Sep 2001 06:32:43 -0400
 
-Additionnal comments:
+Additional comments:
 
 I did completly revamped saxon. First Saxon is shipped in a zip form
 with compiled classes and jar files. I did unzip the original, removed
diff --git a/debian/changelog b/debian/changelog
index 57f20ac..ee15a16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+libsaxon-java (1:6.5.4-1) unstable; urgency=low
+
+  * New upstream release 
+  * fop support is dropped upstream
+    - updated debian dir to remove fop specific build stuff
+    - removed fop build-dep and suggests
+  * Move to main (closes: #122556)
+  * Build with kaffe / jikes / gjdoc
+  * Removed conflicts,provides,replaces with lib-saxon-java
+  * Changed libjdom-java to the final release libjdom1-java
+  * Standards-Version 3.6.2 (no changes)
+
+  * Upload sponsored by Arnaud Vandyck
+
+ -- Wolfgang Baer <WBaer at gmx.de>  Tue, 16 Aug 2005 22:46:04 +0200
+
 libsaxon-java (1:6.5.3-4) unstable; urgency=low
 
   * Reverted conflicts, provides, replaces lib-saxon-java for the Woody to
diff --git a/debian/control b/debian/control
index caf3230..c9c37bb 100644
--- a/debian/control
+++ b/debian/control
@@ -1,18 +1,15 @@
 Source: libsaxon-java
-Section: contrib/libs
+Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>
-Build-Depends-Indep: debhelper (>= 4.2.30), j2sdk1.4, fastjar, gjdoc, libgnujaxp-java, fop, libjdom-java
-Standards-Version: 3.6.1
+Build-Depends-Indep: debhelper (>= 4.2.30), kaffe (>= 2:1.1.5-3), libgnujaxp-java, libjdom1-java
+Standards-Version: 3.6.2
 
 Package: libsaxon-java
 Architecture: all
-Conflicts: lib-saxon-java
-Provides: lib-saxon-java
-Replaces: lib-saxon-java
-Depends: kaffe | gij | sablevm | java1-runtime | java2-runtime, libgnujaxp-java
-Suggests: fop, libjdom-java
+Depends: kaffe | java1-runtime | java2-runtime, libgnujaxp-java
+Suggests: libjdom1-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.javadoc b/debian/libsaxon-java-doc.javadoc
index eb6ab6c..d90caa9 100644
--- a/debian/libsaxon-java-doc.javadoc
+++ b/debian/libsaxon-java-doc.javadoc
@@ -3,7 +3,6 @@ com.icl.saxon.aelfred
 com.icl.saxon.charcode
 com.icl.saxon.expr
 com.icl.saxon.exslt
-com.icl.saxon.fop
 com.icl.saxon.functions
 com.icl.saxon.handlers
 com.icl.saxon.jdom
diff --git a/debian/rules b/debian/rules
index 3bbb0f9..7baf020 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,20 +5,16 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export JITC_PROCESSOR_TYPE=6
 PACKAGE=libsaxon-java
-JAVA_HOME_DIRS=/usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.4-blackdown /usr/local/IBMJava2-ppc-142
-JAVA_HOME ?= $(shell for j in $(JAVA_HOME_DIRS); do [ -d "$$j" ] && echo $$j && exit 0; done)
+JAVA_HOME=/usr/lib/kaffe
 BASE=debian/$(PACKAGE)
 JAVASHARE=usr/share/java
 SOURCES=src
 BUILD=build
 APIDOC=build/api
-FOP=com/icl/saxon/fop
 JDOM=com/icl/saxon/jdom
-UPSTREAM_VERSION = 6.5.3
-#$(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)
-CLASSPATH = /usr/share/java/gnujaxp.jar:/usr/share/java/jdom.jar:/usr/share/java/fop.jar
+UPSTREAM_VERSION = 6.5.4
+CLASSPATH = /usr/share/java/gnujaxp.jar:/usr/share/java/jdom1.jar
 
 configure: configure-stamp
 configure-stamp:
@@ -30,14 +26,12 @@ configure-stamp:
 build: build-stamp
 build-stamp: configure-stamp
 	dh_testdir
-	$(JAVA_HOME)/bin/javac -sourcepath $(SOURCES) -classpath $(CLASSPATH) -d $(BUILD) `find $(SOURCES) -name \*.java`
+	$(JAVA_HOME)/bin/javac -nowarn -sourcepath $(SOURCES) -classpath $(CLASSPATH) -d $(BUILD) `find $(SOURCES) -name \*.java`
 	cp -r $(SOURCES)/META-INF $(BUILD)
-	# split off fop and jdom classes, everything else into saxon.jar
-	(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 )
+	# split off jdom classes, everything else into saxon.jar
+	(cd $(BUILD); $(JAVA_HOME)/bin/jar -cf ../saxon.jar META-INF `find . -name \*.class | egrep -v $(JDOM)`; \
+	 $(JAVA_HOME)/bin/jar -cf ../saxon-jdom.jar $(JDOM)/*.class )
 	(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
 
 clean:
@@ -54,7 +48,6 @@ install: build
 	dh_installdirs
 
 	install -m 644 saxon.jar $(BASE)/$(JAVASHARE)/saxon-$(UPSTREAM_VERSION).jar
-	install -m 644 saxon-fop.jar $(BASE)/$(JAVASHARE)/saxon-fop-$(UPSTREAM_VERSION).jar
 	install -m 644 saxon-jdom.jar $(BASE)/$(JAVASHARE)/saxon-jdom-$(UPSTREAM_VERSION).jar
 
 
@@ -65,26 +58,10 @@ binary-indep: build install
 	dh_installchangelogs 
 	dh_installdocs
 	dh_installexamples -plibsaxon-java-doc samples/*
-#	dh_install
-#	dh_installmenu
-#	dh_installdebconf
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-#	dh_installman
 	dh_link -plibsaxon-java $(JAVASHARE)/saxon-$(UPSTREAM_VERSION).jar $(JAVASHARE)/saxon.jar \
-		$(JAVASHARE)/saxon-fop-$(UPSTREAM_VERSION).jar $(JAVASHARE)/saxon-fop.jar \
-		$(JAVASHARE)/saxon-jdom-$(UPSTREAM_VERSION).jar $(JAVASHARE)/saxon-jdom.jar \
-#	dh_strip
+		$(JAVASHARE)/saxon-jdom-$(UPSTREAM_VERSION).jar $(JAVASHARE)/saxon-jdom.jar
 	dh_compress
 	dh_fixperms
-#	dh_perl
-#	dh_python
-#	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol

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

