[pkg-java] r2904 - trunk/libxalan-java/debian

[Matthias Klose]

Author: doko
Date: 2007-01-03 14:28:20 +0100 (Wed, 03 Jan 2007)
New Revision: 2904

Modified:
   trunk/libxalan-java/debian/changelog
   trunk/libxalan-java/debian/control
   trunk/libxalan-java/debian/rules
Log:
  * Merge from Ubuntu:
    - build libxalan2-java-gcj and libxsltc-java-gcj packages.


Modified: trunk/libxalan-java/debian/changelog
===================================================================
--- trunk/libxalan-java/debian/changelog	2007-01-03 13:15:42 UTC (rev 2903)
+++ trunk/libxalan-java/debian/changelog	2007-01-03 13:28:20 UTC (rev 2904)
@@ -1,3 +1,10 @@
+libxalan2-java (2.7.0-2) unstable; urgency=low
+
+  * Merge from Ubuntu:
+    - build libxalan2-java-gcj and libxsltc-java-gcj packages.
+
+ -- Matthias Klose <doko at debian.org>  Wed,  3 Jan 2007 13:50:10 +0100
+
 libxalan2-java (2.7.0-1) unstable; urgency=low
 
   * debian/rules: Also install serializer.jar. (Closes: #390148)

Modified: trunk/libxalan-java/debian/control
===================================================================
--- trunk/libxalan-java/debian/control	2007-01-03 13:15:42 UTC (rev 2903)
+++ trunk/libxalan-java/debian/control	2007-01-03 13:28:20 UTC (rev 2904)
@@ -2,15 +2,15 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Stefan Gybas <sgybas at debian.org>, Wolfgang Baer <WBaer at gmx.de>, Arnaud Vandyck <avdyk at debian.org>, Jeroen van Wolffelaar <jeroen at wolffelaar.nl>, Marcus Better <marcus at better.se>
-Build-Depends: debhelper (>= 5.0.0), cdbs (>= 0.4.8)
-Build-Depends-Indep: java-gcj-compat-dev, ant (>= 1.6.3-1), libxerces2-java (>= 2.8.0), libbsf-java, libregexp-java, libbcel-java (>= 5.0), jlex, cup, libjaxp1.3-java
+Uploaders: Stefan Gybas <sgybas at debian.org>, Wolfgang Baer <WBaer at gmx.de>, Arnaud Vandyck <avdyk at debian.org>, Jeroen van Wolffelaar <jeroen at wolffelaar.nl>, Marcus Better <marcus at better.se>, Matthias Klose <doko at ubuntu.com>
+Build-Depends: debhelper (>= 5.0.0), cdbs (>= 0.4.8), java-gcj-compat-dev (>= 1.0.65-6), ant (>= 1.6.3-1), libxerces2-java (>= 2.8.0), libbsf-java, libregexp-java, libbcel-java (>= 5.0), jlex, cup, libjaxp1.3-java
 Standards-Version: 3.7.2
 
 Package: libxalan2-java
 Architecture: all
 Section: libs
 Depends: libjaxp1.3-java, libxerces2-java (>= 2.8.0)
+Recommends: libxalan2-java-gcj
 Suggests: libxalan2-java-doc, libbsf-java, libxsltc-java
 Description: XSL Transformations (XSLT) processor in Java
  Xalan-Java is an XSLT processor for transforming XML documents into HTML,
@@ -22,10 +22,24 @@
  See http://xml.apache.org/xalan-j/ for more information about the Xalan-Java
  project.
 
+Package: libxalan2-java-gcj
+Architecture: any
+Section: libs
+Depends: libxalan2-java (>= ${source:Version}), libjaxp1.2-java-gcj, libxerces2-java-gcj, ${misc:Depends}, ${shlibs:Depends}
+Description: XSL Transformations (XSLT) processor in Java (native code)
+ Xalan-Java is an XSLT processor for transforming XML documents into HTML,
+ text, or other XML document types. It implements the W3C Recommendations for
+ XSL Transformations (XSLT) and the XML Path Language (XPath). It can be used
+ from the command line, in an applet or a servlet, or as a module in other
+ programs.
+ .
+ This package contains the natively compiled code for use by gij.
+
 Package: libxsltc-java
 Architecture: all
 Section: libs
 Depends: libxalan2-java, libregexp-java, libbcel-java (>= 5.0), jlex, cup
+Recommends: libxsltc-java-gcj
 Description: XSL Transformations (XSLT) compiler from Xalan-Java
  XSLTC provides a compiler and a runtime processor. Use the compiler to
  compile an XSL stylesheet into a translet (i.e. a set of Java classes).
@@ -35,6 +49,18 @@
  XSLTC is part of the Xalan-Java project. See http://xml.apache.org/xalan-j/
  for more information about this project.
 
+Package: libxsltc-java-gcj
+Architecture: any
+Section: libs
+Depends: libxsltc-java (>= ${source:Version}), libxalan2-java-gcj, ${misc:Depends}, ${shlibs:Depends}
+Description: XSL Transformations (XSLT) compiler from Xalan-Java (native code)
+ XSLTC provides a compiler and a runtime processor. Use the compiler to
+ compile an XSL stylesheet into a translet (i.e. a set of Java classes).
+ Use the runtime processor to apply the translet to an XML document and
+ perform a transformation.
+ .
+ This package contains the natively compiled code for use by gij.
+
 Package: libxalan2-java-doc
 Architecture: all
 Section: doc

Modified: trunk/libxalan-java/debian/rules
===================================================================
--- trunk/libxalan-java/debian/rules	2007-01-03 13:15:42 UTC (rev 2903)
+++ trunk/libxalan-java/debian/rules	2007-01-03 13:28:20 UTC (rev 2904)
@@ -8,6 +8,11 @@
 JAVA_HOME := /usr/lib/jvm/java-gcj
 ANT_HOME := /usr/share/ant
 
+include /usr/share/gcj/debian_defaults
+ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
+  with_gcj_native := yes
+endif
+
 ANT_OPTS := -Dgnu.java.awt.peer.gtk.Graphics=Graphics2D
 DEB_JARS := xmlParserAPIs xercesImpl bsf bcel cup regexp
 
@@ -31,3 +36,10 @@
 	# make lintian happy and remove zero-byte files
 	rm -Rf $(CURDIR)/samples/extensions/instantdb/tables
 
+ifeq ($(with_gcj_native),yes)
+install/libxalan2-java-gcj:: install/libxalan2-java
+	dh_nativejava -plibxalan2-java-gcj
+
+install/libxsltc-java-gcj:: install/libxsltc-java
+	dh_nativejava -plibxsltc-java-gcj
+endif