This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libjaxp1.3-java.
commit 3823fa0a51fbbba754eefbc5208c2d4e71c19429 Author: Matthias Klose <[email protected]> Date: Wed Jan 3 12:15:17 2007 +0000 * Merge from Ubuntu: - Build a libjaxp1.3-java-gcj package. libjaxp1.3-java recommends libjaxp1.3-java-gcj. - Add gij as alternative dependency. --- debian/changelog | 9 +++++++++ debian/control | 15 +++++++++++---- debian/rules | 9 +++++++++ 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1960a4c..9c91030 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 <[email protected]> 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 diff --git a/debian/control b/debian/control index cf8416c..fd855f6 100644 --- a/debian/control +++ b/debian/control @@ -2,15 +2,15 @@ Source: libjaxp1.3-java Section: libs Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Arnaud Vandyck <[email protected]> -Build-Depends: cdbs, debhelper (>= 4.1.0) -Build-Depends-Indep: java-gcj-compat-dev +Uploaders: Arnaud Vandyck <[email protected]>, Matthias Klose <[email protected]> +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 @@ Description: Java XML parser and transformer APIs (DOM, SAX, JAXP, TrAX) . 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. diff --git a/debian/rules b/debian/rules index 0d9dace..afb82cd 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,11 @@ include /usr/share/cdbs/1/rules/debhelper.mk 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 @@ debian/build-stamp: -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 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjaxp1.3-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
