[pkg-java] r4288 - trunk/jakarta-log4j/debian

[kumanna-guest at alioth.debian.org]

Author: kumanna-guest
Date: 2007-09-27 18:22:26 +0000 (Thu, 27 Sep 2007)
New Revision: 4288

Modified:
   trunk/jakarta-log4j/debian/changelog
   trunk/jakarta-log4j/debian/control
   trunk/jakarta-log4j/debian/rules
Log:
  + Moved all build dependencencies to Build-Depends.
* debian/rules:
  + Move to cdbs.
  + Ensure we build native jars.


Modified: trunk/jakarta-log4j/debian/changelog
===================================================================
--- trunk/jakarta-log4j/debian/changelog	2007-09-27 13:59:15 UTC (rev 4287)
+++ trunk/jakarta-log4j/debian/changelog	2007-09-27 18:22:26 UTC (rev 4288)
@@ -5,7 +5,7 @@
   * debian/watch: Added file.
   * debian/control:
     + Added Kumar Appaiah and Varun Hiremath to Uploaders.
-    + Moved all build dependencencies (other than debhelper) to Build-Depends-Indep.
+    + Moved all build dependencencies to Build-Depends.
     + Depend on cdbs.
     + Added Homepage, XS-Vcs-Svn and XS-Vcs-Browser fields.
   * debian/liblog4j1.2-java-doc.doc-base: Specigy API doc location.
@@ -13,8 +13,10 @@
   * debian/orig-tar.sh: Added to ease repackaging.
   * debian/README.Debian-source: Added to explain repackaging.
   * debian/patches/01_build_fix.patch: Fix javadoc issues and compiler target versions.
-  * debian/rules: Move to cdbs.
-
+  * debian/rules:
+    + Move to cdbs.
+    + Ensure we build native jars.
+  
  -- Kumar Appaiah <akumar at ee.iitm.ac.in>  Wed, 26 Sep 2007 12:55:30 +0530
 
 jakarta-log4j (1.2.13-5) unstable; urgency=low

Modified: trunk/jakarta-log4j/debian/control
===================================================================
--- trunk/jakarta-log4j/debian/control	2007-09-27 13:59:15 UTC (rev 4287)
+++ trunk/jakarta-log4j/debian/control	2007-09-27 18:22:26 UTC (rev 4288)
@@ -3,8 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Kalle Kivimaa <killer at debian.org>, Michael Koch <konqueror at gmx.de>, Varun Hiremath <varunhiremath at gmail.com>, Kumar Appaiah <akumar at ee.iitm.ac.in>
-Build-Depends: debhelper (>= 5), cdbs
-Build-Depends-Indep: java-gcj-compat-dev, ant, libgnujaf-java, libgnumail-java
+Build-Depends: debhelper (>= 5), cdbs, java-gcj-compat-dev, ant, libgnujaf-java, libgnumail-java
 Standards-Version: 3.7.2
 Homepage: http://jakarta.apache.org/log4j
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jakarta-log4j

Modified: trunk/jakarta-log4j/debian/rules
===================================================================
--- trunk/jakarta-log4j/debian/rules	2007-09-27 13:59:15 UTC (rev 4287)
+++ trunk/jakarta-log4j/debian/rules	2007-09-27 18:22:26 UTC (rev 4288)
@@ -4,6 +4,13 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
+# Decide whether we need native jars.
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+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/
 ANT_HOME := /usr/share/ant
 
@@ -13,6 +20,9 @@
 install/liblog4j1.2-java::
 	dh_install dist/lib/log4j-$(DEB_UPSTREAM_VERSION).jar usr/share/java
 	dh_link usr/share/java/log4j-$(DEB_UPSTREAM_VERSION).jar usr/share/java/log4j-1.2.jar
+ifeq ($(with_gcj_native),yes)
+	dh_nativejava -pliblog4j1.2-java-gcj
+endif
 
 get-orig-source:
 	-uscan --upstream-version 0