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

[Torsten Werner]

Author: twerner
Date: 2010-02-27 17:23:29 +0000 (Sat, 27 Feb 2010)
New Revision: 11745

Modified:
   trunk/ant/debian/changelog
   trunk/ant/debian/control
   trunk/ant/debian/rules
Log:
* Use default-java in $(JAVA_HOME).
* Do no longer build the -gcj packages because of bus error in gij. Such
  packages are provided by the ant1.7 source package. (Closes: #570889)
* Remove Arnaud from the Uploaders list.

Modified: trunk/ant/debian/changelog
===================================================================
--- trunk/ant/debian/changelog	2010-02-27 17:03:35 UTC (rev 11744)
+++ trunk/ant/debian/changelog	2010-02-27 17:23:29 UTC (rev 11745)
@@ -1,3 +1,12 @@
+ant (1.8.0-4) unstable; urgency=low
+
+  * Use default-java in $(JAVA_HOME).
+  * Do no longer build the -gcj packages because of bus error in gij. Such
+    packages are provided by the ant1.7 source package. (Closes: #570889)
+  * Remove Arnaud from the Uploaders list.
+
+ -- Torsten Werner <twerner at debian.org>  Sat, 27 Feb 2010 18:16:14 +0100
+
 ant (1.8.0-3) UNRELEASED; urgency=low
 
   [ Ludovic Claude ]

Modified: trunk/ant/debian/control
===================================================================
--- trunk/ant/debian/control	2010-02-27 17:03:35 UTC (rev 11744)
+++ trunk/ant/debian/control	2010-02-27 17:23:29 UTC (rev 11745)
@@ -2,7 +2,7 @@
 Section: java
 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>,
+Uploaders: Stefan Gybas <sgybas at debian.org>, Michael Koch <konqueror at gmx.de>,
  Matthias Klose <doko at debian.org>, Ludovic Claude <ludovic.claude at laposte.net>
 Build-Depends: cdbs (>= 0.4.8), debhelper (>= 6), quilt, default-jdk-builddep, maven-repo-helper (>> 1.0),
  libxerces2-java, libbsf-java (>= 2.3.0rc1), liboro-java, libxalan2-java (>= 2.4.0), junit, antlr,
@@ -11,7 +11,7 @@
  libstylebook-java
 Standards-Version: 3.8.4
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/ant
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/ant
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/ant/
 Homepage: http://ant.apache.org/
 
 Package: ant
@@ -20,7 +20,8 @@
 Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless | java5-runtime-headless |
  java6-runtime-headless, libxerces2-java
 Recommends: ant-optional
-Suggests: default-jdk | java-compiler | java-sdk, ant-gcj, ant-doc
+#Suggests: default-jdk | java-compiler | java-sdk, ant-gcj, ant-doc
+Suggests: default-jdk | java-compiler | java-sdk, ant-doc
 Conflicts: libant1.6-java, ant-doc (<= 1.6.5-1)
 Replaces: libant1.6-java, ant-doc (<= 1.6.5-1)
 Description: Java based build tool like make
@@ -28,35 +29,36 @@
  files as "Makefiles". This package contains the scripts and the core
  tasks libraries. 
 
-Package: ant-gcj
-Architecture: any
-Priority: optional
-Depends: ant, ${misc:Depends}, ${shlibs:Depends}
-Description: Java based build tool like make
- A system independent (i.e. not shell based) build tool that uses XML
- files as "Makefiles".
- .
- This package contains a native version of ant built using gcj.
+#Package: ant-gcj
+#Architecture: any
+#Priority: optional
+#Depends: ant, ${misc:Depends}, ${shlibs:Depends}
+#Description: Java based build tool like make
+# A system independent (i.e. not shell based) build tool that uses XML
+# files as "Makefiles".
+# .
+# This package contains a native version of ant built using gcj.
 
 Package: ant-optional
 Architecture: all
 Priority: optional
 Depends: ${misc:Depends}, ant (= ${source:Version})
-Suggests: libbsf-java, liboro-java, libxalan2-java (>= 2.4.0-1), libjaxp1.3-java, 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, ant-optional-gcj
+#Suggests: libbsf-java, liboro-java, libxalan2-java (>= 2.4.0-1), libjaxp1.3-java, 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, ant-optional-gcj
+Suggests: libbsf-java, liboro-java, libxalan2-java (>= 2.4.0-1), libjaxp1.3-java, 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
 Replaces: libant1.6-java
 Description: Java based build tool like make - optional libraries
  A system independent (i.e. not shell based) build tool that uses XML
  files as "Makefiles". This package contains the optional tasks libraries.
 
-Package: ant-optional-gcj
-Architecture: any
-Priority: optional
-Depends: ant-optional, ${misc:Depends}, ${shlibs:Depends}
-Description: Java based build tool like make - API documentation and manual
- A system independent (i.e. not shell based) build tool that uses XML
- files as "Makefiles". This package contains the optional tasks libraries
- compiled natively.
+#Package: ant-optional-gcj
+#Architecture: any
+#Priority: optional
+#Depends: ant-optional, ${misc:Depends}, ${shlibs:Depends}
+#Description: Java based build tool like make - API documentation and manual
+# A system independent (i.e. not shell based) build tool that uses XML
+# files as "Makefiles". This package contains the optional tasks libraries
+# compiled natively.
 
 Package: ant-doc
 Architecture: all

Modified: trunk/ant/debian/rules
===================================================================
--- trunk/ant/debian/rules	2010-02-27 17:03:35 UTC (rev 11744)
+++ trunk/ant/debian/rules	2010-02-27 17:23:29 UTC (rev 11745)
@@ -7,9 +7,9 @@
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 include /usr/share/gcj/debian_defaults
-ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
-  with_gcj_native := yes
-endif
+#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/default-java