[pkg-java] r16724 - in trunk/ant/debian: . patches
Emmanuel Bourg
ebourg-guest at alioth.debian.org
Wed May 22 16:02:29 UTC 2013
Author: ebourg-guest
Date: 2013-05-22 16:02:29 +0000 (Wed, 22 May 2013)
New Revision: 16724
Removed:
trunk/ant/debian/patches/0001-detect-classpath-based-JVM.patch
Modified:
trunk/ant/debian/changelog
trunk/ant/debian/patches/0002-do-not-build-test-jars.patch
trunk/ant/debian/patches/0005-add-gjdoc-task.patch
trunk/ant/debian/patches/0006-fix-ANT_HOME-path.patch
trunk/ant/debian/patches/series
Log:
New upstream release (1.9.1)
- Refreshed the patches
- Removed the patch 0001-detect-classpath-based-JVM.patch (merged upstream)
Enabled hardening for the -gcj packages
Upload to unstable
Modified: trunk/ant/debian/changelog
===================================================================
--- trunk/ant/debian/changelog 2013-05-22 15:46:22 UTC (rev 16723)
+++ trunk/ant/debian/changelog 2013-05-22 16:02:29 UTC (rev 16724)
@@ -1,3 +1,13 @@
+ant (1.9.1-1) unstable; urgency=low
+
+ * New upstream release
+ - Refreshed the patches
+ - Removed the patch 0001-detect-classpath-based-JVM.patch (merged upstream)
+ * Enabled hardening for the -gcj packages
+ * Upload to unstable
+
+ -- Emmanuel Bourg <ebourg at apache.org> Wed, 15 May 2013 16:19:56 +0200
+
ant (1.9.0-1) experimental; urgency=low
* Team upload.
Deleted: trunk/ant/debian/patches/0001-detect-classpath-based-JVM.patch
===================================================================
--- trunk/ant/debian/patches/0001-detect-classpath-based-JVM.patch 2013-05-22 15:46:22 UTC (rev 16723)
+++ trunk/ant/debian/patches/0001-detect-classpath-based-JVM.patch 2013-05-22 16:02:29 UTC (rev 16724)
@@ -1,72 +0,0 @@
-Description: Detect Classpath based JVM
-Origin: vendor
-Bug: https://issues.apache.org/bugzilla/show_bug.cgi?id=54760
---- a/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.java
-+++ b/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.java
-@@ -32,7 +32,7 @@
-
- // sorted by newest Kaffe version first
- private static final String[] N2A_CLASSNAMES = new String[] {
-- "gnu.classpath.tools.native2ascii.Native2Ascii",
-+ "gnu.classpath.tools.native2ascii.Native2ASCII",
- // pre Kaffe 1.1.5
- "kaffe.tools.native2ascii.Native2Ascii",
- };
---- a/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.java
-+++ b/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.java
-@@ -40,7 +40,7 @@
- * vendor
- */
- public static String getDefault() {
-- if (JavaEnvUtils.isKaffe()) {
-+ if (JavaEnvUtils.isKaffe() || JavaEnvUtils.isClasspathBased()) {
- return KaffeNative2Ascii.IMPLEMENTATION_NAME;
- }
- return SunNative2Ascii.IMPLEMENTATION_NAME;
-@@ -79,7 +79,7 @@
- ProjectComponent log,
- Path classpath)
- throws BuildException {
-- if ((JavaEnvUtils.isKaffe() && choice == null)
-+ if (((JavaEnvUtils.isKaffe() || JavaEnvUtils.isClasspathBased()) && choice == null)
- || KaffeNative2Ascii.IMPLEMENTATION_NAME.equals(choice)) {
- return new KaffeNative2Ascii();
- } else if (SunNative2Ascii.IMPLEMENTATION_NAME.equals(choice)) {
---- a/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
-+++ b/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
-@@ -101,6 +101,10 @@
-
- /** Whether this is the Kaffe VM */
- private static boolean kaffeDetected;
-+
-+ /** Wheter this is a GNU Classpath based VM */
-+ private static boolean classpathDetected;
-+
- /** Whether this is the GNU VM (gcj/gij) */
- private static boolean gijDetected;
-
-@@ -159,6 +163,13 @@
- } catch (Throwable t) {
- // swallow as this simply doesn't seem to be Kaffe
- }
-+ classpathDetected = false;
-+ try {
-+ Class.forName("gnu.classpath.Configuration");
-+ classpathDetected = true;
-+ } catch (Throwable t) {
-+ // swallow as this simply doesn't seem to be GNU classpath based.
-+ }
- gijDetected = false;
- try {
- Class.forName("gnu.gcj.Core");
-@@ -233,6 +244,10 @@
- return kaffeDetected;
- }
-
-+ public static boolean isClasspathBased() {
-+ return classpathDetected;
-+ }
-+
- /**
- * Checks whether the current Java VM is the GNU interpreter gij
- * or we are running in a gcj precompiled binary.
Modified: trunk/ant/debian/patches/0002-do-not-build-test-jars.patch
===================================================================
--- trunk/ant/debian/patches/0002-do-not-build-test-jars.patch 2013-05-22 15:46:22 UTC (rev 16723)
+++ trunk/ant/debian/patches/0002-do-not-build-test-jars.patch 2013-05-22 16:02:29 UTC (rev 16724)
@@ -8,7 +8,7 @@
--- a/build.xml
+++ b/build.xml
-@@ -867,7 +867,7 @@
+@@ -873,7 +873,7 @@
===================================================================
-->
<target name="dist-lite"
Modified: trunk/ant/debian/patches/0005-add-gjdoc-task.patch
===================================================================
--- trunk/ant/debian/patches/0005-add-gjdoc-task.patch 2013-05-22 15:46:22 UTC (rev 16723)
+++ trunk/ant/debian/patches/0005-add-gjdoc-task.patch 2013-05-22 16:02:29 UTC (rev 16724)
@@ -2159,7 +2159,7 @@
+}
--- a/src/main/org/apache/tools/ant/taskdefs/defaults.properties
+++ b/src/main/org/apache/tools/ant/taskdefs/defaults.properties
-@@ -66,6 +66,7 @@
+@@ -67,6 +67,7 @@
java=org.apache.tools.ant.taskdefs.Java
javac=org.apache.tools.ant.taskdefs.Javac
javadoc=org.apache.tools.ant.taskdefs.Javadoc
Modified: trunk/ant/debian/patches/0006-fix-ANT_HOME-path.patch
===================================================================
--- trunk/ant/debian/patches/0006-fix-ANT_HOME-path.patch 2013-05-22 15:46:22 UTC (rev 16723)
+++ trunk/ant/debian/patches/0006-fix-ANT_HOME-path.patch 2013-05-22 16:02:29 UTC (rev 16724)
@@ -6,11 +6,9 @@
src/script/ant | 22 +++-------------------
1 files changed, 3 insertions(+), 19 deletions(-)
-diff --git a/src/script/ant b/src/script/ant
-index 7415eeb..f2ba9de 100644
--- a/src/script/ant
+++ b/src/script/ant
-@@ -92,25 +92,9 @@ case "`uname`" in
+@@ -96,25 +96,9 @@
esac
if [ -z "$ANT_HOME" -o ! -d "$ANT_HOME" ] ; then
@@ -39,4 +37,3 @@
fi
# For Cygwin and Mingw, ensure paths are in UNIX format before
---
Modified: trunk/ant/debian/patches/series
===================================================================
--- trunk/ant/debian/patches/series 2013-05-22 15:46:22 UTC (rev 16723)
+++ trunk/ant/debian/patches/series 2013-05-22 16:02:29 UTC (rev 16724)
@@ -1,4 +1,3 @@
-0001-detect-classpath-based-JVM.patch
0002-do-not-build-test-jars.patch
0003-add-Xerces-from-Debian-s-path.patch
0005-add-gjdoc-task.patch
More information about the pkg-java-commits
mailing list