[pkg-java] r3744 - trunk/ant/debian

[mkoch at alioth.debian.org]

Author: mkoch
Date: 2007-06-26 15:52:07 +0000 (Tue, 26 Jun 2007)
New Revision: 3744

Modified:
   trunk/ant/debian/changelog
   trunk/ant/debian/control
   trunk/ant/debian/rules
Log:
ant (1.6.5-8) unstable; urgency=low

  * Only compile to native on certain archs. Closes: #430662.
  * Use ${source:Version} instead of ${Source-Version}.
  * Removed Wolfgang from Uploaders.

 -- Michael Koch <konqueror at gmx.de>  Tue, 26 Jun 2007 14:30:53 -0100



Modified: trunk/ant/debian/changelog
===================================================================
--- trunk/ant/debian/changelog	2007-06-26 08:55:29 UTC (rev 3743)
+++ trunk/ant/debian/changelog	2007-06-26 15:52:07 UTC (rev 3744)
@@ -1,3 +1,11 @@
+ant (1.6.5-8) unstable; urgency=low
+
+  * Only compile to native on certain archs. Closes: #430662.
+  * Use ${source:Version} instead of ${Source-Version}.
+  * Removed Wolfgang from Uploaders.
+
+ -- Michael Koch <konqueror at gmx.de>  Tue, 26 Jun 2007 14:30:53 -0100
+
 ant (1.6.5-7) unstable; urgency=low
 
   [ Arnaud Vandyck ]

Modified: trunk/ant/debian/control
===================================================================
--- trunk/ant/debian/control	2007-06-26 08:55:29 UTC (rev 3743)
+++ trunk/ant/debian/control	2007-06-26 15:52:07 UTC (rev 3744)
@@ -2,7 +2,7 @@
 Section: devel
 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>, Wolfgang Baer <WBaer at gmx.de>, Michael Koch <konqueror at gmx.de>
+Uploaders: Stefan Gybas <sgybas at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>
 Build-Depends: cdbs (>= 0.4.8), debhelper (>= 4.2.0), java-gcj-compat-dev, libxerces2-java, libbsf-java (>= 2.3.0rc1-1), liboro-java, libxalan2-java (>= 2.4.0-1), junit, antlr, liblog4j1.2-java, libregexp-java, libbcel-java (>= 5.0), libcommons-logging-java, libjdepend-java, libgnumail-java, libxml-commons-resolver1.1-java, libcommons-net-java, libjsch-java
 Standards-Version: 3.7.2
 
@@ -38,7 +38,7 @@
 Architecture: all
 Section: devel
 Priority: optional
-Depends: ant (= ${Source-Version})
+Depends: ant (= ${source:Version})
 Recommends: ant-optional-gcj
 Suggests: libbsf-java, liboro-java, libxalan2-java (>= 2.4.0-1), junit, liblog4j1.2-java, libregexp-java, jython, antlr, libbcel-java (>= 5.0), libcommons-logging-java, libjdepend-java, libgnumail-java, libxml-commons-resolver1.1-java, libcommons-net-java, libjsch-java, javacc
 Conflicts: libant1.6-java

Modified: trunk/ant/debian/rules
===================================================================
--- trunk/ant/debian/rules	2007-06-26 08:55:29 UTC (rev 3743)
+++ trunk/ant/debian/rules	2007-06-26 15:52:07 UTC (rev 3744)
@@ -6,6 +6,11 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
+include /usr/share/gcj/debian_defaults
+ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
+  with_gcj_native := yes
+endif
+
 # needs to be exported for direct ant call
 export JAVA_HOME := /usr/lib/jvm/java-gcj
 # needed for bootstrap.sh
@@ -43,11 +48,15 @@
 	install -m 755 src/script/antRun  debian/ant/usr/share/ant/bin
 	install -m 755 src/script/*.pl    debian/ant/usr/share/ant/bin
 
+ifeq ($(with_gcj_native),yes)
 install/ant-gcj:: install/ant
 	dh_nativejava -pant-gcj
+endif
 
+ifeq ($(with_gcj_native),yes)
 install/ant-optional-gcj:: install/ant-optional
 	dh_nativejava -pant-optional-gcj
+endif
 
 install/ant-doc::
 	-rm -f docs/manual/LICENSE