[pkg-java] r2900 - trunk/libjaxp1.3-java/debian

[Matthias Klose]

Author: doko
Date: 2007-01-03 13:15:17 +0100 (Wed, 03 Jan 2007)
New Revision: 2900

Modified:
   trunk/libjaxp1.3-java/debian/changelog
   trunk/libjaxp1.3-java/debian/control
   trunk/libjaxp1.3-java/debian/rules
Log:
  * Merge from Ubuntu:
    - Build a libjaxp1.3-java-gcj package. libjaxp1.3-java recommends
      libjaxp1.3-java-gcj.
    - Add gij as alternative dependency.


Modified: trunk/libjaxp1.3-java/debian/changelog
===================================================================
--- trunk/libjaxp1.3-java/debian/changelog	2007-01-03 12:01:47 UTC (rev 2899)
+++ trunk/libjaxp1.3-java/debian/changelog	2007-01-03 12:15:17 UTC (rev 2900)
@@ -1,3 +1,12 @@
+libjaxp1.3-java (1.3.03-5) unstable; urgency=low
+
+  * Merge from Ubuntu:
+    - Build a libjaxp1.3-java-gcj package. libjaxp1.3-java recommends
+      libjaxp1.3-java-gcj.
+    - Add gij as alternative dependency.
+
+ -- Matthias Klose <doko at debian.org>  Wed,  3 Jan 2007 13:14:17 +0100
+
 libjaxp1.3-java (1.3.03-4) unstable; urgency=low
 
   * debian/rules: using /usr/lib/jvm/java-gcj/bin/javac to build, not gcj

Modified: trunk/libjaxp1.3-java/debian/control
===================================================================
--- trunk/libjaxp1.3-java/debian/control	2007-01-03 12:01:47 UTC (rev 2899)
+++ trunk/libjaxp1.3-java/debian/control	2007-01-03 12:15:17 UTC (rev 2900)
@@ -2,15 +2,15 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <avdyk at debian.org>
-Build-Depends: cdbs, debhelper (>= 4.1.0)
-Build-Depends-Indep: java-gcj-compat-dev
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Matthias Klose <doko at ubuntu.com>
+Build-Depends: cdbs, debhelper (>= 4.1.0), java-gcj-compat-dev (>= 1.0.65-6)
 Standards-Version: 3.7.2
 
 Package: libjaxp1.3-java
 Architecture: all
 Section: libs
-Depends: java-gcj-compat | java1-runtime | java2-runtime
+Depends: gij | java-gcj-compat | java1-runtime | java2-runtime
+Recommends: libjaxp1.3-java-gcj
 Description: Java XML parser and transformer APIs (DOM, SAX, JAXP, TrAX)
  xml-apis.jar from the Apache XML Commons project is used by the Xerces-J XML
  parser and Xalan-J XSLT processor and specifies these APIs:
@@ -26,3 +26,10 @@
  .
  Sun's JAXP home page: http://java.sun.com/xml/jaxp/index.jsp
 
+Package: libjaxp1.3-java-gcj
+Architecture: any
+Section: libs
+Depends: libjaxp1.3-java (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
+Description: Java XML parser and transformer APIs (DOM, SAX, JAXP, TrAX)
+ xml-apis.jar from the Apache XML Commons project is used by the Xerces-J XML
+ parser and Xalan-J XSLT processor.

Modified: trunk/libjaxp1.3-java/debian/rules
===================================================================
--- trunk/libjaxp1.3-java/debian/rules	2007-01-03 12:01:47 UTC (rev 2899)
+++ trunk/libjaxp1.3-java/debian/rules	2007-01-03 12:15:17 UTC (rev 2900)
@@ -5,6 +5,11 @@
 
 JAVA_HOME := /usr/lib/jvm/java-gcj
 
+include /usr/share/gcj/debian_defaults
+ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
+  with_gcj_native := yes
+endif
+
 clean::
 	rm -rf build debian/build-stamp
 
@@ -19,3 +24,7 @@
 		-f jaxp-1.3.jar javax license org
 	touch debian/build-stamp
 
+ifeq ($(with_gcj_native),yes)
+install/libjaxp1.3-java-gcj:: binary-install/libjaxp1.3-java
+	dh_nativejava -plibjaxp1.3-java-gcj
+endif