[pkg-java] r2899 - trunk/libjaxp1.2-java/debian
Matthias Klose
doko at alioth.debian.org
Wed Jan 3 13:01:48 CET 2007
Author: doko
Date: 2007-01-03 13:01:47 +0100 (Wed, 03 Jan 2007)
New Revision: 2899
Modified:
trunk/libjaxp1.2-java/debian/changelog
trunk/libjaxp1.2-java/debian/control
trunk/libjaxp1.2-java/debian/rules
Log:
* Merge from Ubuntu:
- Build a libjaxp1.2-java-gcj package. libjaxp1.2-java recommends
libjaxp1.2-java-gcj.
- Build depend on java-gcj-compat-dev, depend on java-gcj-compat.
- Add gij as alternative dependency.
Modified: trunk/libjaxp1.2-java/debian/changelog
===================================================================
--- trunk/libjaxp1.2-java/debian/changelog 2007-01-03 11:00:13 UTC (rev 2898)
+++ trunk/libjaxp1.2-java/debian/changelog 2007-01-03 12:01:47 UTC (rev 2899)
@@ -1,3 +1,13 @@
+libjaxp1.2-java (1.2.01-2) unstable; urgency=low
+
+ * Merge from Ubuntu:
+ - Build a libjaxp1.2-java-gcj package. libjaxp1.2-java recommends
+ libjaxp1.2-java-gcj.
+ - Build depend on java-gcj-compat-dev, depend on java-gcj-compat.
+ - Add gij as alternative dependency.
+
+ -- Matthias Klose <doko at debian.org> Wed, 3 Jan 2007 12:18:31 +0100
+
libjaxp1.2-java (1.2.01-1) unstable; urgency=low
* Initial release
Modified: trunk/libjaxp1.2-java/debian/control
===================================================================
--- trunk/libjaxp1.2-java/debian/control 2007-01-03 11:00:13 UTC (rev 2898)
+++ trunk/libjaxp1.2-java/debian/control 2007-01-03 12:01:47 UTC (rev 2899)
@@ -2,14 +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>
-Build-Depends: cdbs, debhelper (>= 4.1.0), classpath, jikes, fastjar
-Standards-Version: 3.6.1
+Uploaders: Stefan Gybas <sgybas 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.2-java
Architecture: all
Section: libs
-Depends: classpath | java1-runtime | java2-runtime
+Depends: gij | java-gcj-compat | java1-runtime | java2-runtime
+Recommends: libjaxp1.2-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:
@@ -23,3 +24,10 @@
.
Sun's JAXP home page: http://java.sun.com/xml/jaxp/index.jsp
+Package: libjaxp1.2-java-gcj
+Architecture: any
+Section: libs
+Depends: libjaxp1.2-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 and specifies these APIs
Modified: trunk/libjaxp1.2-java/debian/rules
===================================================================
--- trunk/libjaxp1.2-java/debian/rules 2007-01-03 11:00:13 UTC (rev 2898)
+++ trunk/libjaxp1.2-java/debian/rules 2007-01-03 12:01:47 UTC (rev 2899)
@@ -3,6 +3,13 @@
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/gcj/debian_defaults
+ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
+ with_gcj_native := yes
+endif
+
+JAVA_HOME:=/usr/lib/jvm/java-gcj
+
clean::
rm -rf build debian/build-stamp
@@ -12,8 +19,13 @@
# An alternative would be to build the classes using GCJ
#gcj -C -O2 -d build `find javax org -name \*.java`
- jikes -bootclasspath /usr/share/classpath/glibj.zip -d build `find javax org -name \*.java`
+ #jikes -bootclasspath /usr/share/classpath/glibj.zip -d build `find javax org -name \*.java`
+ $(JAVA_HOME)/bin/javac -d build `find javax org -name \*.java`
cp LICENSE.*.txt README.*.txt build/license
- cd build && fastjar -c -m ../manifest.commons -f jaxp-1.2.jar javax license org
+ cd build && $(JAVA_HOME)/bin/jar -c -m ../manifest.commons -f jaxp-1.2.jar javax license org
touch debian/build-stamp
+ifeq ($(with_gcj_native),yes)
+install/libjaxp1.2-java-gcj:: binary-install/libjaxp1.2-java
+ dh_nativejava -plibjaxp1.2-java-gcj
+endif
More information about the pkg-java-commits
mailing list