[pkg-java] r13654 - in trunk/ant/debian: . patches
James Page
jamespage-guest at alioth.debian.org
Thu May 5 08:14:25 UTC 2011
Author: jamespage-guest
Date: 2011-05-05 08:14:22 +0000 (Thu, 05 May 2011)
New Revision: 13654
Modified:
trunk/ant/debian/ant-optional.poms
trunk/ant/debian/changelog
trunk/ant/debian/control
trunk/ant/debian/patches/0001-detect-classpath-based-JVM.patch
trunk/ant/debian/patches/0002-do-not-build-test-jars.patch
trunk/ant/debian/patches/0005-add-gjdoc-task.patch
trunk/ant/debian/patches/0007-use-build.classpath.patch
trunk/ant/debian/rules
Log:
* New upstream release (Closes: #613914).
- Fix FTBFS for jug with ant 1.8.1 (Closes: #610320).
* Bumped Standards-Version to 3.9.2, no changes.
* Removed ant-nodeps.jar from install as now part of ant core.
* Added myself to Uploaders.
Modified: trunk/ant/debian/ant-optional.poms
===================================================================
--- trunk/ant/debian/ant-optional.poms 2011-05-05 03:51:19 UTC (rev 13653)
+++ trunk/ant/debian/ant-optional.poms 2011-05-05 08:14:22 UTC (rev 13654)
@@ -1,4 +1,3 @@
-src/etc/poms/ant-nodeps/pom.xml
src/etc/poms/ant-antlr/pom.xml
src/etc/poms/ant-apache-bcel/pom.xml
src/etc/poms/ant-apache-bsf/pom.xml
Modified: trunk/ant/debian/changelog
===================================================================
--- trunk/ant/debian/changelog 2011-05-05 03:51:19 UTC (rev 13653)
+++ trunk/ant/debian/changelog 2011-05-05 08:14:22 UTC (rev 13654)
@@ -1,3 +1,13 @@
+ant (1.8.2-1) unstable; urgency=low
+
+ * New upstream release (Closes: #613914).
+ - Fix FTBFS for jug with ant 1.8.1 (Closes: #610320).
+ * Bumped Standards-Version to 3.9.2, no changes.
+ * Removed ant-nodeps.jar from install as now part of ant core.
+ * Added myself to Uploaders.
+
+ -- James Page <james.page at canonical.com> Wed, 04 May 2011 15:16:42 +0100
+
ant (1.8.1-1) experimental; urgency=low
[ Niels Thykier ]
Modified: trunk/ant/debian/control
===================================================================
--- trunk/ant/debian/control 2011-05-05 03:51:19 UTC (rev 13653)
+++ trunk/ant/debian/control 2011-05-05 08:14:22 UTC (rev 13654)
@@ -3,13 +3,14 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Michael Koch <konqueror at gmx.de>, Matthias Klose <doko at debian.org>,
- Ludovic Claude <ludovic.claude at laposte.net>, Torsten Werner <twerner at debian.org>
+ Ludovic Claude <ludovic.claude at laposte.net>, Torsten Werner <twerner at debian.org>,
+ James Page <james.page at canonical.com>
Build-Depends: cdbs (>= 0.4.8), debhelper (>= 6), default-jdk, maven-repo-helper (>> 1.0),
libxerces2-java, libbsf-java (>= 2.3.0rc1), liboro-java, libxalan2-java (>= 2.4.0), 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, libjaxp1.3-java,
gcj-native-helper
-Standards-Version: 3.8.4
+Standards-Version: 3.9.2
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/ant
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/ant/
Homepage: http://ant.apache.org/
Modified: trunk/ant/debian/patches/0001-detect-classpath-based-JVM.patch
===================================================================
--- trunk/ant/debian/patches/0001-detect-classpath-based-JVM.patch 2011-05-05 03:51:19 UTC (rev 13653)
+++ trunk/ant/debian/patches/0001-detect-classpath-based-JVM.patch 2011-05-05 08:14:22 UTC (rev 13654)
@@ -8,11 +8,11 @@
.../org/apache/tools/ant/util/JavaEnvUtils.java | 14 ++++++++++++++
3 files changed, 17 insertions(+), 2 deletions(-)
-diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.java b/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.java
-index 7383f64..8c0a8e1 100644
---- 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,6 +32,7 @@ public final class KaffeNative2Ascii extends DefaultNative2Ascii {
+Index: apache-ant-1.8.2/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.java
+===================================================================
+--- apache-ant-1.8.2.orig/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.java 2010-12-20 18:48:16.000000000 +0000
++++ apache-ant-1.8.2/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.java 2011-05-04 15:19:49.235567112 +0100
+@@ -32,6 +32,7 @@
// sorted by newest Kaffe version first
private static final String[] N2A_CLASSNAMES = new String[] {
@@ -20,11 +20,11 @@
"gnu.classpath.tools.native2ascii.Native2Ascii",
// pre Kaffe 1.1.5
"kaffe.tools.native2ascii.Native2Ascii",
-diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.java b/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.java
-index e31c727..4ffcf43 100644
---- 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 @@ public class Native2AsciiAdapterFactory {
+Index: apache-ant-1.8.2/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.java
+===================================================================
+--- apache-ant-1.8.2.orig/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.java 2010-12-20 18:48:16.000000000 +0000
++++ apache-ant-1.8.2/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.java 2011-05-04 15:19:49.235567112 +0100
+@@ -40,7 +40,7 @@
* vendor
*/
public static String getDefault() {
@@ -33,7 +33,7 @@
return KaffeNative2Ascii.IMPLEMENTATION_NAME;
}
return SunNative2Ascii.IMPLEMENTATION_NAME;
-@@ -79,7 +79,7 @@ public class Native2AsciiAdapterFactory {
+@@ -79,7 +79,7 @@
ProjectComponent log,
Path classpath)
throws BuildException {
@@ -42,23 +42,24 @@
|| KaffeNative2Ascii.IMPLEMENTATION_NAME.equals(choice)) {
return new KaffeNative2Ascii();
} else if (SunNative2Ascii.IMPLEMENTATION_NAME.equals(choice)) {
-diff --git a/src/main/org/apache/tools/ant/util/JavaEnvUtils.java b/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
-index 11e8dd7..fa2ce42 100644
---- a/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
-+++ b/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
-@@ -91,6 +91,9 @@ public final class JavaEnvUtils {
+Index: apache-ant-1.8.2/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
+===================================================================
+--- apache-ant-1.8.2.orig/src/main/org/apache/tools/ant/util/JavaEnvUtils.java 2010-12-20 18:48:17.000000000 +0000
++++ apache-ant-1.8.2/src/main/org/apache/tools/ant/util/JavaEnvUtils.java 2011-05-04 15:20:36.905590251 +0100
+@@ -96,6 +96,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;
- /** array of packages in the runtime */
- private static Vector jrePackages;
-@@ -138,6 +141,13 @@ public final class JavaEnvUtils {
+@@ -165,6 +169,13 @@
} catch (Throwable t) {
- // swallow as this simply doesn't seem to be Kaffe
+ // swallow as this simply doesn't seem to be Apache Harmony
}
+ classpathDetected = false;
+ try {
@@ -70,7 +71,7 @@
}
/**
-@@ -197,6 +207,10 @@ public final class JavaEnvUtils {
+@@ -224,6 +235,10 @@
public static boolean isKaffe() {
return kaffeDetected;
}
@@ -80,5 +81,4 @@
+ }
/**
- * Finds an executable that is part of a JRE installation based on
---
+ * Checks whether the current Java VM is the GNU interpreter gij
Modified: trunk/ant/debian/patches/0002-do-not-build-test-jars.patch
===================================================================
--- trunk/ant/debian/patches/0002-do-not-build-test-jars.patch 2011-05-05 03:51:19 UTC (rev 13653)
+++ trunk/ant/debian/patches/0002-do-not-build-test-jars.patch 2011-05-05 08:14:22 UTC (rev 13654)
@@ -6,11 +6,11 @@
build.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
-diff --git a/build.xml b/build.xml
-index e4c0ed3..558cbda 100644
---- a/build.xml
-+++ b/build.xml
-@@ -792,7 +792,7 @@
+Index: apache-ant-1.8.2/build.xml
+===================================================================
+--- apache-ant-1.8.2.orig/build.xml 2011-05-04 15:32:03.355912171 +0100
++++ apache-ant-1.8.2/build.xml 2011-05-04 15:32:09.565914993 +0100
+@@ -791,7 +791,7 @@
===================================================================
-->
<target name="dist-lite"
@@ -19,4 +19,3 @@
description="--> creates a minimum distribution to run Apache Ant">
<mkdir dir="${dist.dir}"/>
---
Modified: trunk/ant/debian/patches/0005-add-gjdoc-task.patch
===================================================================
--- trunk/ant/debian/patches/0005-add-gjdoc-task.patch 2011-05-05 03:51:19 UTC (rev 13653)
+++ trunk/ant/debian/patches/0005-add-gjdoc-task.patch 2011-05-05 08:14:22 UTC (rev 13654)
@@ -8,11 +8,10 @@
2 files changed, 2147 insertions(+), 0 deletions(-)
create mode 100644 main/org/apache/tools/ant/taskdefs/Gjdoc.java
-diff --git a/main/org/apache/tools/ant/taskdefs/Gjdoc.java b/main/org/apache/tools/ant/taskdefs/Gjdoc.java
-new file mode 100644
-index 0000000..0fa7ff2
---- /dev/null
-+++ b/main/org/apache/tools/ant/taskdefs/Gjdoc.java
+Index: apache-ant-1.8.2/main/org/apache/tools/ant/taskdefs/Gjdoc.java
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ apache-ant-1.8.2/main/org/apache/tools/ant/taskdefs/Gjdoc.java 2011-05-04 15:31:43.065902942 +0100
@@ -0,0 +1,2146 @@
+/*
+ * Copyright 2000-2005 The Apache Software Foundation
@@ -2160,11 +2159,11 @@
+ }
+
+}
-diff --git a/src/main/org/apache/tools/ant/taskdefs/defaults.properties b/src/main/org/apache/tools/ant/taskdefs/defaults.properties
-index d444cb9..95dd836 100644
---- a/src/main/org/apache/tools/ant/taskdefs/defaults.properties
-+++ b/src/main/org/apache/tools/ant/taskdefs/defaults.properties
-@@ -64,6 +64,7 @@ jar=org.apache.tools.ant.taskdefs.Jar
+Index: apache-ant-1.8.2/src/main/org/apache/tools/ant/taskdefs/defaults.properties
+===================================================================
+--- apache-ant-1.8.2.orig/src/main/org/apache/tools/ant/taskdefs/defaults.properties 2011-05-04 15:31:38.195900724 +0100
++++ apache-ant-1.8.2/src/main/org/apache/tools/ant/taskdefs/defaults.properties 2011-05-04 15:31:43.065902942 +0100
+@@ -65,6 +65,7 @@
java=org.apache.tools.ant.taskdefs.Java
javac=org.apache.tools.ant.taskdefs.Javac
javadoc=org.apache.tools.ant.taskdefs.Javadoc
@@ -2172,4 +2171,3 @@
length=org.apache.tools.ant.taskdefs.Length
loadfile=org.apache.tools.ant.taskdefs.LoadFile
loadproperties=org.apache.tools.ant.taskdefs.LoadProperties
---
Modified: trunk/ant/debian/patches/0007-use-build.classpath.patch
===================================================================
--- trunk/ant/debian/patches/0007-use-build.classpath.patch 2011-05-05 03:51:19 UTC (rev 13653)
+++ trunk/ant/debian/patches/0007-use-build.classpath.patch 2011-05-05 08:14:22 UTC (rev 13654)
@@ -6,11 +6,11 @@
build.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
-diff --git a/build.xml b/build.xml
-index 85d6386..55cd671 100644
---- a/build.xml
-+++ b/build.xml
-@@ -120,7 +120,7 @@
+Index: apache-ant-1.8.2/build.xml
+===================================================================
+--- apache-ant-1.8.2.orig/build.xml 2011-05-04 15:31:54.275908042 +0100
++++ apache-ant-1.8.2/build.xml 2011-05-04 15:31:54.325908066 +0100
+@@ -119,7 +119,7 @@
===================================================================
-->
<path id="classpath">
@@ -19,4 +19,3 @@
</path>
<path id="tests-classpath">
---
Modified: trunk/ant/debian/rules
===================================================================
--- trunk/ant/debian/rules 2011-05-05 03:51:19 UTC (rev 13653)
+++ trunk/ant/debian/rules 2011-05-05 08:14:22 UTC (rev 13654)
@@ -77,7 +77,6 @@
mh_installjar -pant-optional -l src/etc/poms/ant-jmf/pom.xml build/lib/ant-jmf.jar /usr/share/ant/lib/ant-jmf.jar
mh_installjar -pant-optional -l src/etc/poms/ant-jsch/pom.xml build/lib/ant-jsch.jar /usr/share/ant/lib/ant-jsch.jar
mh_installjar -pant-optional -l src/etc/poms/ant-junit/pom.xml build/lib/ant-junit.jar /usr/share/ant/lib/ant-junit.jar
- mh_installjar -pant-optional -l src/etc/poms/ant-nodeps/pom.xml build/lib/ant-nodeps.jar /usr/share/ant/lib/ant-nodeps.jar
mh_installjar -pant-optional -l src/etc/poms/ant-swing/pom.xml build/lib/ant-swing.jar /usr/share/ant/lib/ant-swing.jar
#mh_installjar -pant-optional src/etc/poms/ant-testutil/pom.xml ant-testutil/build/ant-testutil-$(VERSION).jar
#mh_installjar -pant-optional src/etc/poms/ant-jai/pom.xml ant-jai/build/ant-jai-$(VERSION).jar
More information about the pkg-java-commits
mailing list