[libxml-commons-resolver1.1-java] 13/35: libxml-commons-resolver1.1-java (1.2-1) unstable; urgency=low

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libxml-commons-resolver1.1-java.

commit 3af840ab7fd52e134efbda1b1c30afafe0b5a710
Author: Michael Koch <konqueror at gmx.de>
Date:   Sat Jan 5 22:08:39 2008 +0000

    libxml-commons-resolver1.1-java (1.2-1) unstable; urgency=low
    
      * New upstream release. Closes: #453777
      * Add libxml-commons-resolver1.1-java-gcj package for GCJ.
        Closes: #458248
      * Cleaned up debian/rules.
      * Added watch file.
      * Updated Standards-Version to 3.7.3.
      * Added Homepage, Vcs-Svn and Vcs-Browser fields.
    
     -- Michael Koch <konqueror at gmx.de>  Sat, 05 Jan 2008 22:57:45 +0100
---
 debian/changelog | 12 ++++++++++++
 debian/control   | 27 +++++++++++++++++++--------
 debian/rules     | 27 ++++++++++++---------------
 3 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e512538..1bcfe87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+libxml-commons-resolver1.1-java (1.2-1) unstable; urgency=low
+
+  * New upstream release. Closes: #453777
+  * Add libxml-commons-resolver1.1-java-gcj package for GCJ.
+    Closes: #458248
+  * Cleaned up debian/rules.
+  * Added watch file.
+  * Updated Standards-Version to 3.7.3.
+  * Added Homepage, Vcs-Svn and Vcs-Browser fields.
+
+ -- Michael Koch <konqueror at gmx.de>  Sat, 05 Jan 2008 22:57:45 +0100
+
 libxml-commons-resolver1.1-java (1.1-8) unstable; urgency=low
 
   * Removed unneeded Build-Depends on libxerces-java.
diff --git a/debian/control b/debian/control
index 6e0fd1d..4535f6b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,11 @@ Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Stefan Gybas <sgybas at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 4.2.0), cdbs (>= 0.4.8)
-Build-Depends-Indep: java-gcj-compat-dev, ant, libjaxp1.3-java
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 4.2.0), cdbs (>= 0.4.8), java-gcj-compat-dev, ant, libjaxp1.3-java
+Standards-Version: 3.7.3
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libxml-commons-resolver1.1-java
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libxml-commons-resolver1.1-java
+Homepage: http://xml.apache.org/commons/
 
 Package: libxml-commons-resolver1.1-java
 Architecture: all
@@ -16,8 +18,6 @@ Description: XML entity and URI resolver library
  Apache XML Commons Resolver simplifies the task of using XML catalog files to
  perform entity resolution. They are used by other Apache XML projects like
  Xerces-J and Xalan-J.
- .
-  Homepage: http://xml.apache.org/commons/
 
 Package: libxml-commons-resolver1.1-java-doc
 Architecture: all
@@ -25,7 +25,18 @@ Section: doc
 Suggests: libxml-commons-resolver1.1-java
 Description: XML entity and URI resolver library -- documentation
  Apache XML Commons Resolver simplifies the task of using XML catalog files to
- perform entity resolution. This package includes the HTML and Javadoc API
- documentation.
+ perform entity resolution. They are used by other Apache XML projects like
+ Xerces-J and Xalan-J.
+ .
+ This package includes the HTML and Javadoc API documentation.
+
+Package: libxml-commons-resolver1.1-java-gcj
+Architecture: any
+Section: libs
+Depends: libxml-commons-resolver1.1-java (= ${source:Version}), ${shlibs:Depends}
+Description: XML entity and URI resolver library -- native library
+ Apache XML Commons Resolver simplifies the task of using XML catalog files to
+ perform entity resolution. They are used by other Apache XML projects like
+ Xerces-J and Xalan-J.
  .
-  Homepage: http://xml.apache.org/commons/
+ This package contains the natively compiled code for use by gij.
diff --git a/debian/rules b/debian/rules
index 7ee46a2..9f7acc4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,25 +4,22 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-API_VERSION := 1.1
+include /usr/share/gcj/debian_defaults                                                                                                                                               
+ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))                                                                                                                             
+  with_gcj_native := yes
+endif
 
-# These two must be specified
-JAVA_HOME  := /usr/lib/jvm/java-gcj
+JAVA_HOME := /usr/lib/jvm/java-gcj
 
-# Additional JARs to add to the class path, either full path or just the
-# basename for JARs in /usr/share/java. The ".jar" suffix may also be ommitted
 DEB_JARS := xerces jaxp-1.3
-
-# Defaults to debian/ant.properties
-#DEB_ANT_PROPERTYFILE := build.properties
-
-# Defaults to build.xml (Ant default) in $(DEB_BUILDDIR)
 DEB_ANT_BUILDFILE := resolver.xml
-
 DEB_ANT_BUILD_TARGET := jar
 
+install/libxml-commons-resolver1.1-java:: build
+	mkdir -p debian/libxml-commons-resolver1.1-java/usr/share/java
+	install -m 644 build/resolver.jar debian/libxml-commons-resolver1.1-java/usr/share/java/xml-commons-resolver-1.1.jar
 
-install/libxml-commons-resolver${API_VERSION}-java::
-	mkdir -p debian/libxml-commons-resolver${API_VERSION}-java/usr/share/java
-	install -m 644 build/resolver.jar debian/libxml-commons-resolver${API_VERSION}-java/usr/share/java/xml-commons-resolver-${API_VERSION}.jar
-
+ifeq ($(with_gcj_native),yes)
+install/libxml-commons-resolver1.1-java-gcj:: install/libxml-commons-resolver1.1-java
+	dh_nativejava -plibxml-commons-resolver1.1-java-gcj
+endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libxml-commons-resolver1.1-java.git