Bug#458247: Please provide a package with native code for GCJ/GIJ

2008-01-03 Thread Daniel Leidert 
Am Montag, den 31.12.2007, 00:41 +0100 schrieb Michael Koch:

[libsaxon-java-gcj] 
 I have uploaded 6.5.5-2 as a cleanup version for the current package. I
 attached a debdiff to -3 that adds a -gcj package. Please test it and
 give feedback about the improvements (timings).

As I said, I already tested this locally and with the self-built -gcj
packages, build time for docbook-defguide decreased from 16 hours to 1
(see http://www.wgdd.de/?p=32). I now built the libsaxon-java-gcj
package again and it still builds in an hours. So your patch looks good.

Regards, Daniel




-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

Bug#458247: Please provide a package with native code for GCJ/GIJ

2007-12-30 Thread Michael Koch 
On Sat, Dec 29, 2007 at 10:05:52PM +0100, Michael Koch wrote:
 On Sat, Dec 29, 2007 at 09:44:05PM +0100, Daniel Leidert wrote:
  Package: libsaxon-java
  Version: 1:6.5.5-1.1
  Severity: wishlist
  
  I would like to ask you, if you could/would be so kind to provide a
  package with native code for GCJ/GIJ. This would help me a lot to speed
  up the building of the docbook-defguide package.
  
  http://www.wgdd.de/?p=32
  http://www.wgdd.de/?p=31
  
  I prepared such packages locally, so the debdiff is attached. However,
  I prepared the package just as a proof-of-concept, so I might have
  missed necessary changes.
 
 I will take care of this. Thanks for the initial patch.
 
I have uploaded 6.5.5-2 as a cleanup version for the current package. I
attached a debdiff to -3 that adds a -gcj package. Please test it and
give feedback about the improvements (timings).


Cheers,
Michael
diff -u libsaxon-java-6.5.5/debian/rules libsaxon-java-6.5.5/debian/rules
--- libsaxon-java-6.5.5/debian/rules
+++ libsaxon-java-6.5.5/debian/rules
@@ -16,6 +16,11 @@
 UPSTREAM_VERSION = 6.5.5
 CLASSPATH = /usr/share/java/jdom1.jar
 
+include /usr/share/gcj/debian_defaults
+ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
+  with_gcj_native := yes
+endif
+
 configure: configure-stamp
 configure-stamp:
dh_testdir
@@ -71,7 +76,22 @@
dh_builddeb -i
 
 binary-arch: build install
-# We have nothing to do by default.
+   dh_testdir -a
+   dh_testroot -a
+   dh_installchangelogs -a
+   dh_installdocs -a
+ifeq ($(with_gcj_native),yes)
+   [ -d debian/libsaxon-ava/usr/share/java ] || dh_install -plibsaxon-java
+   dh_nativejava -plibsaxon-java-gcj
+endif
+   dh_strip -a
+   dh_compress -a
+   dh_fixperms -a
+   dh_installdeb -a
+   dh_shlibdeps -a
+   dh_gencontrol -a
+   dh_md5sums -a
+   dh_builddeb -a
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure
diff -u libsaxon-java-6.5.5/debian/control libsaxon-java-6.5.5/debian/control
--- libsaxon-java-6.5.5/debian/control
+++ libsaxon-java-6.5.5/debian/control
@@ -21,6 +21,17 @@
  with the DocBook XSL Stylesheets. Related packages make the process
  straightforward.
 
+Package: libsaxon-java-gcj
+Architecture: any
+Depends: libsaxon-java (= ${source:Version}), ${misc:Depends}, 
${shlibs:Depends}
+Description: The Saxon XSLT Processor (native code)
+ The saxon package is a collection of tools for processing XML documents and
+ implements the XSLT 1.0 recommendation, including XPath 1.0, in its entirety.
+ .
+ Saxon is known to work well for processing DocBook XML documents
+ with the DocBook XSL Stylesheets. Related packages make the process
+ straightforward.
+
 Package: libsaxon-java-doc
 Section: doc
 Architecture: all
diff -u libsaxon-java-6.5.5/debian/changelog 
libsaxon-java-6.5.5/debian/changelog
--- libsaxon-java-6.5.5/debian/changelog
+++ libsaxon-java-6.5.5/debian/changelog
@@ -1,3 +1,9 @@
+libsaxon-java (1:6.5.5-3) unstable; urgency=low
+
+  * Build -gcj package. Closes: #458247.
+
+ -- Michael Koch [EMAIL PROTECTED]  Sat, 29 Dec 2007 23:14:56 +0100
+
 libsaxon-java (1:6.5.5-2) unstable; urgency=low
 
   * (Build-)Depends on java-gcj-compat(-dev).

Bug#458247: Please provide a package with native code for GCJ/GIJ

2007-12-29 Thread Daniel Leidert 
Package: libsaxon-java
Version: 1:6.5.5-1.1
Severity: wishlist

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

I would like to ask you, if you could/would be so kind to provide a
package with native code for GCJ/GIJ. This would help me a lot to speed
up the building of the docbook-defguide package.

http://www.wgdd.de/?p=32
http://www.wgdd.de/?p=31

I prepared such packages locally, so the debdiff is attached. However,
I prepared the package just as a proof-of-concept, so I might have
missed necessary changes.

Regards, Daniel


- -- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (850, 'unstable'), (700, 'testing'), (550, 'stable'), (110, 
'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.22-3-k7 (SMP w/1 CPU core)
Locale: LANG=de_DE, LC_CTYPE=de_DE (charmap=ISO-8859-1)
Shell: /bin/sh linked to /bin/bash

Versions of packages libsaxon-java depends on:
ii  gij [java2-runtime]   4:4.2.2-1  The GNU Java bytecode interpreter
ii  gij-4.2 [java1-runtime]   4.2.2-3The GNU Java bytecode interpreter
ii  kaffe 2:1.1.8-3  A JVM to run Java bytecode
ii  kaffe-pthreads [kaffe]2:1.1.8-3  A POSIX threads enabled version of
ii  sablevm [java1-runtime]   1.13-1.1   Free implementation of Java Virtua
ii  sun-java5-jre [java1-runtime] 1.5.0-13-1 Sun Java(TM) Runtime Environment (

libsaxon-java recommends no packages.

- -- no debconf information

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFHdrGUm0bx+wiPa4wRAtYtAJ9qXl2EvXkDldYI2hGR2RKVi5htswCdH6gG
TgZavib9YMKB98VFwn6zeuk=
=4e/s
-END PGP SIGNATURE-
diff -u libsaxon-java-6.5.5/debian/changelog 
libsaxon-java-6.5.5/debian/changelog
--- libsaxon-java-6.5.5/debian/changelog
+++ libsaxon-java-6.5.5/debian/changelog
@@ -1,3 +1,10 @@
+libsaxon-java (1:6.5.5-1.1) unstable; urgency=low
+
+  * NMU
+  * Rebuild with native code.
+
+ -- Daniel Leidert (dale) [EMAIL PROTECTED]  Sat, 22 Dec 2007 02:11:41 +0100
+
 libsaxon-java (1:6.5.5-1) unstable; urgency=low
 
   * New upstream release
diff -u libsaxon-java-6.5.5/debian/control libsaxon-java-6.5.5/debian/control
--- libsaxon-java-6.5.5/debian/control
+++ libsaxon-java-6.5.5/debian/control
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers [EMAIL PROTECTED]
 Uploaders: Arnaud Vandyck [EMAIL PROTECTED], Wolfgang Baer [EMAIL 
PROTECTED]
-Build-Depends-Indep: debhelper (= 4.2.30), kaffe (= 2:1.1.5-3), libjdom1-java
+Build-Depends-Indep: debhelper (= 4.2.30), java-gcj-compat-dev, libjdom1-java
 Standards-Version: 3.6.2
 
 Package: libsaxon-java
@@ -20,6 +20,19 @@
  .
  Homepage: http://saxon.sourceforge.net/
 
+Package: libsaxon-java-gcj
+Architecture: any
+Depends: libsaxon-java (= ${source:Version}), ${misc:Depends}, 
${shlibs:Depends}
+Description: The Saxon XSLT Processor (native code)
+ The saxon package is a collection of tools for processing XML documents and 
+ implements the XSLT 1.0 recommendation, including XPath 1.0, in its entirety.
+ .
+ Saxon is known to work well for processing DocBook XML documents
+ with the DocBook XSL Stylesheets. Related packages make the process
+ straightforward.
+ .
+ Homepage: http://saxon.sourceforge.net/
+
 Package: libsaxon-java-doc
 Section: doc
 Architecture: all
diff -u libsaxon-java-6.5.5/debian/rules libsaxon-java-6.5.5/debian/rules
--- libsaxon-java-6.5.5/debian/rules
+++ libsaxon-java-6.5.5/debian/rules
@@ -6,7 +6,7 @@
 #export DH_VERBOSE=1
 
 PACKAGE=libsaxon-java
-JAVA_HOME=/usr/lib/kaffe
+JAVA_HOME=/usr/lib/jvm/java-gcj
 BASE=debian/$(PACKAGE)
 JAVASHARE=usr/share/java
 SOURCES=src
@@ -16,11 +16,10 @@
 UPSTREAM_VERSION = 6.5.5
 CLASSPATH = /usr/share/java/jdom1.jar
 
-configure: configure-stamp
 configure-stamp:
dh_testdir
-   if [ ! -d $(BUILD) ]; then mkdir $(BUILD); mkdir $(APIDOC); fi  
-   touch configure-stamp
+   if [ ! -d $(BUILD) ]; then mkdir $(BUILD); mkdir $(APIDOC); fi
+   touch $@
 
 
 build: build-stamp
@@ -33,7 +32,7 @@
(cd $(BUILD); $(JAVA_HOME)/bin/jar -cfM ../saxon.jar META-INF `find . 
-name \*.class | egrep -v $(JDOM)`; \
 $(JAVA_HOME)/bin/jar -cfM ../saxon-jdom.jar $(JDOM)/*.class )
(cd $(APIDOC) ; gjdoc -sourcepath ../../$(SOURCES) 
@../../debian/libsaxon-java-doc.javadoc)
-   touch build-stamp
+   touch $@
 
 clean:
dh_testdir
@@ -59,24 +58,36 @@
 
 # Build architecture-independent files here.
 binary-indep: build install
-   dh_testdir
-   dh_testroot
-   dh_installchangelogs 
-   dh_installdocs
+   dh_testdir -i
+   dh_testroot -i
+   dh_installchangelogs -i
+   dh_installdocs -i
dh_installexamples -plibsaxon-java-doc samples/*
dh_link -plibsaxon-java $(JAVASHARE)/saxon-$(UPSTREAM_VERSION).jar 
$(JAVASHARE)/saxon.jar \
$(JAVASHARE)/saxon-jdom-$(UPSTREAM_VERSION).jar 
$(JAVASHARE)/saxon-jdom.jar
-   dh_compress
-   dh_fixperms
-   dh_installdeb
-   dh_shlibdeps
-

Bug#458247: Please provide a package with native code for GCJ/GIJ

2007-12-29 Thread Michael Koch 
On Sat, Dec 29, 2007 at 09:44:05PM +0100, Daniel Leidert wrote:
 Package: libsaxon-java
 Version: 1:6.5.5-1.1
 Severity: wishlist
 
 I would like to ask you, if you could/would be so kind to provide a
 package with native code for GCJ/GIJ. This would help me a lot to speed
 up the building of the docbook-defguide package.
 
 http://www.wgdd.de/?p=32
 http://www.wgdd.de/?p=31
 
 I prepared such packages locally, so the debdiff is attached. However,
 I prepared the package just as a proof-of-concept, so I might have
 missed necessary changes.

I will take care of this. Thanks for the initial patch.


Cheers,
Michael



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]