r1846 - in trunk/ant/debian: . patches
Wolfgang Bär
wbaer-guest at costa.debian.org
Wed Feb 1 20:06:01 UTC 2006
Author: wbaer-guest
Date: 2006-02-01 20:05:50 +0000 (Wed, 01 Feb 2006)
New Revision: 1846
Added:
trunk/ant/debian/patches/05_TaskAvailabilityFix_ANT_PR38260.patch
Modified:
trunk/ant/debian/changelog
trunk/ant/debian/control
trunk/ant/debian/rules
Log:
kaffe transition upload
Modified: trunk/ant/debian/changelog
===================================================================
--- trunk/ant/debian/changelog 2006-02-01 20:03:23 UTC (rev 1845)
+++ trunk/ant/debian/changelog 2006-02-01 20:05:50 UTC (rev 1846)
@@ -1,3 +1,18 @@
+ant (1.6.5-5) unstable; urgency=low
+
+ * Added versioned build dependency on kaffe to fix the bootstrap process
+ (/usr/bin/ecj is only available sind 1.16.91-) (closes: #348647)
+
+ -- Wolfgang Baer <WBaer at gmx.de> Wed, 18 Jan 2006 14:42:45 +0100
+
+ant (1.6.5-4) unstable; urgency=low
+
+ * kaffe compiler transition
+ * Applied patch for upstream PR 38260 to fix build failure
+ of some package on free runtimes (Thanks, Stephan Michels)
+
+ -- Wolfgang Baer <WBaer at gmx.de> Mon, 16 Jan 2006 12:17:10 +0100
+
ant (1.6.5-3) unstable; urgency=low
* Fixed FTBS by adding bootstrap ANT_HOME (closes: #331081)
Modified: trunk/ant/debian/control
===================================================================
--- trunk/ant/debian/control 2006-02-01 20:03:23 UTC (rev 1845)
+++ trunk/ant/debian/control 2006-02-01 20:05:50 UTC (rev 1846)
@@ -2,8 +2,8 @@
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>, Takashi Okamoto <tora at debian.org>, Wolfgang Baer <WBaer at gmx.de>
-Build-Depends-Indep: cdbs (>= 0.4.8), debhelper (>= 4.2.0), kaffe, 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
+Uploaders: Stefan Gybas <sgybas at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>
+Build-Depends-Indep: cdbs (>= 0.4.8), debhelper (>= 4.2.0), kaffe (>= 2:1.1.6.91-1), 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.6.2
Package: ant
Added: trunk/ant/debian/patches/05_TaskAvailabilityFix_ANT_PR38260.patch
===================================================================
--- trunk/ant/debian/patches/05_TaskAvailabilityFix_ANT_PR38260.patch 2006-02-01 20:03:23 UTC (rev 1845)
+++ trunk/ant/debian/patches/05_TaskAvailabilityFix_ANT_PR38260.patch 2006-02-01 20:05:50 UTC (rev 1846)
@@ -0,0 +1,63 @@
+--- src/main/org/apache/tools/ant/taskdefs/Available.java.orig 2005-06-02 15:19:56.000000000 +0200
++++ src/main/org/apache/tools/ant/taskdefs/Available.java 2006-01-16 14:45:39.000000000 +0100
+@@ -253,32 +253,35 @@
+ appendix = " to set property " + property;
+ } else {
+ setTaskName("available");
+- }
+- if ((classname != null) && !checkClass(classname)) {
+- log("Unable to load class " + classname + appendix,
+- Project.MSG_VERBOSE);
+- return false;
+- }
+- if ((file != null) && !checkFile()) {
+- StringBuffer buf = new StringBuffer("Unable to find ");
+- if (type != null) {
+- buf.append(type).append(' ');
++ }
++ try {
++ if ((classname != null) && !checkClass(classname)) {
++ log("Unable to load class " + classname + appendix,
++ Project.MSG_VERBOSE);
++ return false;
+ }
+- buf.append(filename).append(appendix);
+- log(buf.toString(), Project.MSG_VERBOSE);
+- return false;
+- }
+- if ((resource != null) && !checkResource(resource)) {
+- log("Unable to load resource " + resource + appendix,
+- Project.MSG_VERBOSE);
+- return false;
+- }
+- if (loader != null) {
+- loader.cleanup();
+- loader = null;
+- }
+- if (!isTask) {
+- setTaskName(null);
++ if ((file != null) && !checkFile()) {
++ StringBuffer buf = new StringBuffer("Unable to find ");
++ if (type != null) {
++ buf.append(type).append(' ');
++ }
++ buf.append(filename).append(appendix);
++ log(buf.toString(), Project.MSG_VERBOSE);
++ return false;
++ }
++ if ((resource != null) && !checkResource(resource)) {
++ log("Unable to load resource " + resource + appendix,
++ Project.MSG_VERBOSE);
++ return false;
++ }
++ } finally {
++ if (loader != null) {
++ loader.cleanup();
++ loader = null;
++ }
++ if (!isTask) {
++ setTaskName(null);
++ }
+ }
+ return true;
+ }
Modified: trunk/ant/debian/rules
===================================================================
--- trunk/ant/debian/rules 2006-02-01 20:03:23 UTC (rev 1845)
+++ trunk/ant/debian/rules 2006-02-01 20:05:50 UTC (rev 1846)
@@ -9,17 +9,17 @@
# needs to be exported for direct ant call
export JAVA_HOME := /usr/lib/kaffe
# needed for bootstrap.sh
-export JAVAC=/usr/bin/jikes
+export JAVAC=/usr/bin/ecj
# needed for bootstrap
-export BOOTJAVAC_OPTS=-bootclasspath /usr/share/kaffe/Klasses.jar -source 1.3 -target 1.3 -nowarn
+export BOOTJAVAC_OPTS=-bootclasspath /usr/lib/kaffe/jre/lib/rt.jar -source 1.3 -target 1.3 -nowarn
# needed for building with bootstrap ant
export ANT_HOME := bootstrap
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- export ANT_OPTS=-Dbuild.compiler=jikes -Dcompile.debug=true -Dcompile.optimize=false
+ export ANT_OPTS=-Dcompile.debug=true -Dcompile.optimize=false
else
- export ANT_OPTS=-Dbuild.compiler=jikes -Dcompile.debug=true -Dcompile.optimize=true
+ export ANT_OPTS=-Dcompile.debug=true -Dcompile.optimize=true
endif
JAR_PATH := /usr/share/java
More information about the pkg-java-commits
mailing list