Commit 0c5e30c32ce76ff25c3131b1fa501b1ab2e6929d - ant

+0

-1

debian/ant-optional.poms less more

0		src/etc/poms/ant-nodeps/pom.xml
1	0	src/etc/poms/ant-antlr/pom.xml
2	1	src/etc/poms/ant-apache-bcel/pom.xml
3	2	src/etc/poms/ant-apache-bsf/pom.xml

+10

-0

debian/changelog less more

	0	ant (1.8.2-1) unstable; urgency=low
	1
	2	* New upstream release (Closes: #613914).
	3	- Fix FTBFS for jug with ant 1.8.1 (Closes: #610320).
	4	* Bumped Standards-Version to 3.9.2, no changes.
	5	* Removed ant-nodeps.jar from install as now part of ant core.
	6	* Added myself to Uploaders.
	7
	8	-- James Page <james.page@canonical.com> Wed, 04 May 2011 15:16:42 +0100
	9
0	10	ant (1.8.1-1) experimental; urgency=low
1	11
2	12	[ Niels Thykier ]

+3

-2

debian/control less more

2	2	Priority: optional
3	3	Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
4	4	Uploaders: Michael Koch <konqueror@gmx.de>, Matthias Klose <doko@debian.org>,
5		Ludovic Claude <ludovic.claude@laposte.net>, Torsten Werner <twerner@debian.org>
	5	Ludovic Claude <ludovic.claude@laposte.net>, Torsten Werner <twerner@debian.org>,
	6	James Page <james.page@canonical.com>
6	7	Build-Depends: cdbs (>= 0.4.8), debhelper (>= 6), default-jdk, maven-repo-helper (>> 1.0),
7	8	libxerces2-java, libbsf-java (>= 2.3.0rc1), liboro-java, libxalan2-java (>= 2.4.0), junit, antlr,
8	9	liblog4j1.2-java, libregexp-java, libbcel-java (>= 5.0), libcommons-logging-java, libjdepend-java,
9	10	libgnumail-java, libxml-commons-resolver1.1-java, libcommons-net-java, libjsch-java, libjaxp1.3-java,
10	11	gcj-native-helper
11		Standards-Version: 3.8.4
	12	Standards-Version: 3.9.2
12	13	Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/ant
13	14	Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/ant/
14	15	Homepage: http://ant.apache.org/

+23

-23

debian/patches/0001-detect-classpath-based-JVM.patch less more

7	7	.../org/apache/tools/ant/util/JavaEnvUtils.java \| 14 ++++++++++++++
8	8	3 files changed, 17 insertions(+), 2 deletions(-)
9	9
10		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
11		index 7383f64..8c0a8e1 100644
12		--- a/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.java
13		+++ b/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.java
14		@@ -32,6 +32,7 @@ public final class KaffeNative2Ascii extends DefaultNative2Ascii {
	10	Index: apache-ant-1.8.2/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.java
	11	===================================================================
	12	--- 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
	13	+++ apache-ant-1.8.2/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.java 2011-05-04 15:19:49.235567112 +0100
	14	@@ -32,6 +32,7 @@
15	15
16	16	// sorted by newest Kaffe version first
17	17	private static final String[] N2A_CLASSNAMES = new String[] {

19	19	"gnu.classpath.tools.native2ascii.Native2Ascii",
20	20	// pre Kaffe 1.1.5
21	21	"kaffe.tools.native2ascii.Native2Ascii",
22		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
23		index e31c727..4ffcf43 100644
24		--- a/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.java
25		+++ b/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.java
26		@@ -40,7 +40,7 @@ public class Native2AsciiAdapterFactory {
	22	Index: apache-ant-1.8.2/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.java
	23	===================================================================
	24	--- 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
	25	+++ apache-ant-1.8.2/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.java 2011-05-04 15:19:49.235567112 +0100
	26	@@ -40,7 +40,7 @@
27	27	* vendor
28	28	*/
29	29	public static String getDefault() {

32	32	return KaffeNative2Ascii.IMPLEMENTATION_NAME;
33	33	}
34	34	return SunNative2Ascii.IMPLEMENTATION_NAME;
35		@@ -79,7 +79,7 @@ public class Native2AsciiAdapterFactory {
	35	@@ -79,7 +79,7 @@
36	36	ProjectComponent log,
37	37	Path classpath)
38	38	throws BuildException {

41	41	\|\| KaffeNative2Ascii.IMPLEMENTATION_NAME.equals(choice)) {
42	42	return new KaffeNative2Ascii();
43	43	} else if (SunNative2Ascii.IMPLEMENTATION_NAME.equals(choice)) {
44		diff --git a/src/main/org/apache/tools/ant/util/JavaEnvUtils.java b/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
45		index 11e8dd7..fa2ce42 100644
46		--- a/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
47		+++ b/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
48		@@ -91,6 +91,9 @@ public final class JavaEnvUtils {
	44	Index: apache-ant-1.8.2/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
	45	===================================================================
	46	--- apache-ant-1.8.2.orig/src/main/org/apache/tools/ant/util/JavaEnvUtils.java 2010-12-20 18:48:17.000000000 +0000
	47	+++ apache-ant-1.8.2/src/main/org/apache/tools/ant/util/JavaEnvUtils.java 2011-05-04 15:20:36.905590251 +0100
	48	@@ -96,6 +96,10 @@
49	49
50	50	/** Whether this is the Kaffe VM */
51	51	private static boolean kaffeDetected;
52	52	+
53	53	+ /** Wheter this is a GNU Classpath based VM */
54	54	+ private static boolean classpathDetected;
	55	+
	56	/** Whether this is the GNU VM (gcj/gij) */
	57	private static boolean gijDetected;
55	58
56		/** array of packages in the runtime */
57		private static Vector jrePackages;
58		@@ -138,6 +141,13 @@ public final class JavaEnvUtils {
	59	@@ -165,6 +169,13 @@
59	60	} catch (Throwable t) {
60		// swallow as this simply doesn't seem to be Kaffe
	61	// swallow as this simply doesn't seem to be Apache Harmony
61	62	}
62	63	+ classpathDetected = false;
63	64	+ try {

69	70	}
70	71
71	72	/**
72		@@ -197,6 +207,10 @@ public final class JavaEnvUtils {
	73	@@ -224,6 +235,10 @@
73	74	public static boolean isKaffe() {
74	75	return kaffeDetected;
75	76	}

79	80	+ }
80	81
81	82	/**
82		* Finds an executable that is part of a JRE installation based on
83		--
	83	* Checks whether the current Java VM is the GNU interpreter gij

+5

-6

debian/patches/0002-do-not-build-test-jars.patch less more

5	5	build.xml \| 2 +-
6	6	1 files changed, 1 insertions(+), 1 deletions(-)
7	7
8		diff --git a/build.xml b/build.xml
9		index e4c0ed3..558cbda 100644
10		--- a/build.xml
11		+++ b/build.xml
12		@@ -792,7 +792,7 @@
	8	Index: apache-ant-1.8.2/build.xml
	9	===================================================================
	10	--- apache-ant-1.8.2.orig/build.xml 2011-05-04 15:32:03.355912171 +0100
	11	+++ apache-ant-1.8.2/build.xml 2011-05-04 15:32:09.565914993 +0100
	12	@@ -791,7 +791,7 @@
13	13	===================================================================
14	14	-->
15	15	<target name="dist-lite"

18	18	description="--> creates a minimum distribution to run Apache Ant">
19	19
20	20	<mkdir dir="${dist.dir}"/>
21		--

+9

-11

debian/patches/0005-add-gjdoc-task.patch less more

7	7	2 files changed, 2147 insertions(+), 0 deletions(-)
8	8	create mode 100644 main/org/apache/tools/ant/taskdefs/Gjdoc.java
9	9
10		diff --git a/main/org/apache/tools/ant/taskdefs/Gjdoc.java b/main/org/apache/tools/ant/taskdefs/Gjdoc.java
11		new file mode 100644
12		index 0000000..0fa7ff2
13		--- /dev/null
14		+++ b/main/org/apache/tools/ant/taskdefs/Gjdoc.java
	10	Index: apache-ant-1.8.2/main/org/apache/tools/ant/taskdefs/Gjdoc.java
	11	===================================================================
	12	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
	13	+++ apache-ant-1.8.2/main/org/apache/tools/ant/taskdefs/Gjdoc.java 2011-05-04 15:31:43.065902942 +0100
15	14	@@ -0,0 +1,2146 @@
16	15	+/*
17	16	+ * Copyright 2000-2005 The Apache Software Foundation

2159	2158	+ }
2160	2159	+
2161	2160	+}
2162		diff --git a/src/main/org/apache/tools/ant/taskdefs/defaults.properties b/src/main/org/apache/tools/ant/taskdefs/defaults.properties
2163		index d444cb9..95dd836 100644
2164		--- a/src/main/org/apache/tools/ant/taskdefs/defaults.properties
2165		+++ b/src/main/org/apache/tools/ant/taskdefs/defaults.properties
2166		@@ -64,6 +64,7 @@ jar=org.apache.tools.ant.taskdefs.Jar
	2161	Index: apache-ant-1.8.2/src/main/org/apache/tools/ant/taskdefs/defaults.properties
	2162	===================================================================
	2163	--- apache-ant-1.8.2.orig/src/main/org/apache/tools/ant/taskdefs/defaults.properties 2011-05-04 15:31:38.195900724 +0100
	2164	+++ apache-ant-1.8.2/src/main/org/apache/tools/ant/taskdefs/defaults.properties 2011-05-04 15:31:43.065902942 +0100
	2165	@@ -65,6 +65,7 @@
2167	2166	java=org.apache.tools.ant.taskdefs.Java
2168	2167	javac=org.apache.tools.ant.taskdefs.Javac
2169	2168	javadoc=org.apache.tools.ant.taskdefs.Javadoc

2171	2170	length=org.apache.tools.ant.taskdefs.Length
2172	2171	loadfile=org.apache.tools.ant.taskdefs.LoadFile
2173	2172	loadproperties=org.apache.tools.ant.taskdefs.LoadProperties
2174		--

+5

-6

debian/patches/0007-use-build.classpath.patch less more

5	5	build.xml \| 2 +-
6	6	1 files changed, 1 insertions(+), 1 deletions(-)
7	7
8		diff --git a/build.xml b/build.xml
9		index 85d6386..55cd671 100644
10		--- a/build.xml
11		+++ b/build.xml
12		@@ -120,7 +120,7 @@
	8	Index: apache-ant-1.8.2/build.xml
	9	===================================================================
	10	--- apache-ant-1.8.2.orig/build.xml 2011-05-04 15:31:54.275908042 +0100
	11	+++ apache-ant-1.8.2/build.xml 2011-05-04 15:31:54.325908066 +0100
	12	@@ -119,7 +119,7 @@
13	13	===================================================================
14	14	-->
15	15	<path id="classpath">

18	18	</path>
19	19
20	20	<path id="tests-classpath">
21		--

+0

-1

debian/rules less more

76	76	mh_installjar -pant-optional -l src/etc/poms/ant-jmf/pom.xml build/lib/ant-jmf.jar /usr/share/ant/lib/ant-jmf.jar
77	77	mh_installjar -pant-optional -l src/etc/poms/ant-jsch/pom.xml build/lib/ant-jsch.jar /usr/share/ant/lib/ant-jsch.jar
78	78	mh_installjar -pant-optional -l src/etc/poms/ant-junit/pom.xml build/lib/ant-junit.jar /usr/share/ant/lib/ant-junit.jar
79		mh_installjar -pant-optional -l src/etc/poms/ant-nodeps/pom.xml build/lib/ant-nodeps.jar /usr/share/ant/lib/ant-nodeps.jar
80	79	mh_installjar -pant-optional -l src/etc/poms/ant-swing/pom.xml build/lib/ant-swing.jar /usr/share/ant/lib/ant-swing.jar
81	80	#mh_installjar -pant-optional src/etc/poms/ant-testutil/pom.xml ant-testutil/build/ant-testutil-$(VERSION).jar
82	81	#mh_installjar -pant-optional src/etc/poms/ant-jai/pom.xml ant-jai/build/ant-jai-$(VERSION).jar