Author: twerner
Date: 2011-09-24 22:27:08 +0000 (Sat, 24 Sep 2011)
New Revision: 15025
Added:
trunk/ant-contrib/debian/patches/0001-Debianize-build.xml.patch
trunk/ant-contrib/debian/patches/0002-Ensure-for-task-is-specified-correctly.patch
Removed:
trunk/ant-contrib/debian/patches/02_592182_fortask.diff
trunk/ant-contrib/debian/patches/debianize_build_xml.diff
Modified:
trunk/ant-contrib/debian/changelog
trunk/ant-contrib/debian/patches/series
Log:
Refresh patches.
Modified: trunk/ant-contrib/debian/changelog
===================================================================
--- trunk/ant-contrib/debian/changelog 2011-09-24 22:20:26 UTC (rev 15024)
+++ trunk/ant-contrib/debian/changelog 2011-09-24 22:27:08 UTC (rev 15025)
@@ -3,8 +3,9 @@
* Team upload.
* Really switch to default-jdk. (Closes: #642748)
* Install pom file with maven-repo-helper.
+ * Refresh patches.
- -- Torsten Werner <twer...@debian.org> Sun, 25 Sep 2011 00:16:39 +0200
+ -- Torsten Werner <twer...@debian.org> Sun, 25 Sep 2011 00:26:51 +0200
ant-contrib (1.0~b3+svn177-3) unstable; urgency=low
Copied: trunk/ant-contrib/debian/patches/0001-Debianize-build.xml.patch (from
rev 15022, trunk/ant-contrib/debian/patches/debianize_build_xml.diff)
===================================================================
--- trunk/ant-contrib/debian/patches/0001-Debianize-build.xml.patch
(rev 0)
+++ trunk/ant-contrib/debian/patches/0001-Debianize-build.xml.patch
2011-09-24 22:27:08 UTC (rev 15025)
@@ -0,0 +1,76 @@
+From: Daniel Leidert (dale) <daniel.leid...@wgdd.de>
+Date: Sun, 25 Sep 2011 00:22:25 +0200
+Subject: Debianize build.xml
+
+---
+ build.xml | 15 +++++++++------
+ ivysettings.xml | 4 ++--
+ .../java/net/sf/antcontrib/net/URLImportTask.java | 2 +-
+ 3 files changed, 12 insertions(+), 9 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index e16b5a8..e8a2db8 100644
+--- a/build.xml
++++ b/build.xml
+@@ -49,16 +49,18 @@
+ <property name="junit.jar"
value="${m2_repo}/junit/junit/${junit.version}/junit-${junit.version}.jar"/>
+ <property name="ant.jar.version" value="1.6.5"/>
+ <property name="ant.jar"
value="${m2_repo}/ant/ant/${ant.jar.version}/ant-${ant.jar.version}.jar"/>
++
++ <property name="debian.java.dir" location="/usr/share/java" />
+
+
+ <target name="init" unless="no-ivy">
+ <path id="ivy.lib.path">
+- <fileset dir="lib/ivy/jars" includes="ivy-2.0.0.jar"/>
+- <fileset dir="lib/commons-cli/jars"
includes="commons-cli-1.0.jar"/>
+- <fileset dir="lib/commons-codec/jars"
includes="commons-codec-1.3.jar"/>
+- <fileset dir="lib/commons-httpclient/jars"
includes="commons-httpclient-3.0.1.jar"/>
+- <fileset dir="lib/commons-logging/jars"
includes="commons-logging-1.0.4.jar"/>
+- <fileset dir="lib/oro/jars" includes="oro-2.0.8.jar"/>
++ <fileset dir="${debian.java.dir}" includes="ivy.jar"/>
++ <fileset dir="${debian.java.dir}" includes="commons-cli.jar"/>
++ <fileset dir="${debian.java.dir}" includes="commons-codec.jar"/>
++ <fileset dir="${debian.java.dir}"
includes="commons-httpclient.jar"/>
++ <fileset dir="${debian.java.dir}" includes="commons-logging.jar"/>
++ <fileset dir="${debian.java.dir}" includes="oro.jar"/>
+ </path>
+
+ <taskdef resource="org/apache/ivy/ant/antlib.xml"
+@@ -109,6 +111,7 @@
+ classpathref="compile.classpath"
+ source="${jdk.source}"
+ target="${jdk.target}"
++ excludes="**/Ivy14Adapter.java"
+ />
+
+ <copy todir="${target.classes.dir}">
+diff --git a/ivysettings.xml b/ivysettings.xml
+index 0eacca7..5f7aac7 100644
+--- a/ivysettings.xml
++++ b/ivysettings.xml
+@@ -5,8 +5,8 @@
+
+ <resolvers>
+ <filesystem name="local">
+- <ivy pattern="${ivy.conf.dir}/lib/[module]/ivy-[revision].xml" />
+- <artifact
pattern="${ivy.conf.dir}/lib/[module]/[ext]s/[artifact]-[revision].[ext]" />
++ <ivy pattern="${ivy.conf.dir}/ivy-[revision].xml" />
++ <artifact pattern="/usr/share/java/[artifact].[ext]" />
+ </filesystem>
+
+
+diff --git a/src/main/java/net/sf/antcontrib/net/URLImportTask.java
b/src/main/java/net/sf/antcontrib/net/URLImportTask.java
+index 4792ef4..a1e81c4 100755
+--- a/src/main/java/net/sf/antcontrib/net/URLImportTask.java
++++ b/src/main/java/net/sf/antcontrib/net/URLImportTask.java
+@@ -158,7 +158,7 @@ public class URLImportTask
+ adapter = new Ivy20Adapter();
+ }
+ catch (ClassNotFoundException e) {
+- adapter = new Ivy14Adapter();
++ // adapter = new Ivy14Adapter();
+ }
+
+ String setId = org + "." + module + "." + rev + ".fileset";
+--
Copied:
trunk/ant-contrib/debian/patches/0002-Ensure-for-task-is-specified-correctly.patch
(from rev 15022, trunk/ant-contrib/debian/patches/02_592182_fortask.diff)
===================================================================
---
trunk/ant-contrib/debian/patches/0002-Ensure-for-task-is-specified-correctly.patch
(rev 0)
+++
trunk/ant-contrib/debian/patches/0002-Ensure-for-task-is-specified-correctly.patch
2011-09-24 22:27:08 UTC (rev 15025)
@@ -0,0 +1,21 @@
+From: Michael Gilbert <michael.s.gilbert (at) gmail.com>
+Date: Sun, 25 Sep 2011 00:22:25 +0200
+Subject: Ensure 'for' task is specified correctly.
+
+---
+ .../net/sf/antcontrib/antcontrib.properties | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/main/resources/net/sf/antcontrib/antcontrib.properties
b/src/main/resources/net/sf/antcontrib/antcontrib.properties
+index b42b4ec..0759b01 100644
+--- a/src/main/resources/net/sf/antcontrib/antcontrib.properties
++++ b/src/main/resources/net/sf/antcontrib/antcontrib.properties
+@@ -14,6 +14,7 @@ inifile=net.sf.antcontrib.inifile.IniFileTask
+
+ # Logic tasks
+ if=net.sf.antcontrib.logic.IfTask
++for=net.sf.antcontrib.logic.ForTask
+ foreach=net.sf.antcontrib.logic.ForEach
+ throw=net.sf.antcontrib.logic.Throw
+ trycatch=net.sf.antcontrib.logic.TryCatchTask
+--
Deleted: trunk/ant-contrib/debian/patches/02_592182_fortask.diff
===================================================================
--- trunk/ant-contrib/debian/patches/02_592182_fortask.diff 2011-09-24
22:20:26 UTC (rev 15024)
+++ trunk/ant-contrib/debian/patches/02_592182_fortask.diff 2011-09-24
22:27:08 UTC (rev 15025)
@@ -1,14 +0,0 @@
-Description: Ensure 'for' task is specified correctly.
-Author: Michael Gilbert <michael.s.gilbert (at) gmail.com>
-Forwarded: not-needed
-
----
ant-contrib-1.0~b3+svn177~/src/main/resources/net/sf/antcontrib/antcontrib.properties
2009-09-25 13:23:13.000000000 -0700
-+++
ant-contrib-1.0~b3+svn177/src/main/resources/net/sf/antcontrib/antcontrib.properties
2010-08-08 09:21:30.000000000 -0700
-@@ -14,6 +14,7 @@
-
- # Logic tasks
- if=net.sf.antcontrib.logic.IfTask
-+for=net.sf.antcontrib.logic.ForTask
- foreach=net.sf.antcontrib.logic.ForEach
- throw=net.sf.antcontrib.logic.Throw
- trycatch=net.sf.antcontrib.logic.TryCatchTask
Deleted: trunk/ant-contrib/debian/patches/debianize_build_xml.diff
===================================================================
--- trunk/ant-contrib/debian/patches/debianize_build_xml.diff 2011-09-24
22:20:26 UTC (rev 15024)
+++ trunk/ant-contrib/debian/patches/debianize_build_xml.diff 2011-09-24
22:27:08 UTC (rev 15025)
@@ -1,66 +0,0 @@
-Description: Debianize build.xml
-Author: Daniel Leidert (dale) <daniel.leid...@wgdd.de>
-Forwarded: not-needed
-
-diff -urNad pkg-ant-contrib~/build.xml pkg-ant-contrib/build.xml
---- pkg-ant-contrib~/build.xml 2009-03-20 05:27:52.000000000 +0100
-+++ pkg-ant-contrib/build.xml 2009-06-09 14:27:35.000000000 +0200
-@@ -49,16 +49,18 @@
- <property name="junit.jar"
value="${m2_repo}/junit/junit/${junit.version}/junit-${junit.version}.jar"/>
- <property name="ant.jar.version" value="1.6.5"/>
- <property name="ant.jar"
value="${m2_repo}/ant/ant/${ant.jar.version}/ant-${ant.jar.version}.jar"/>
-+
-+ <property name="debian.java.dir" location="/usr/share/java" />
-
-
- <target name="init" unless="no-ivy">
- <path id="ivy.lib.path">
-- <fileset dir="lib/ivy/jars" includes="ivy-2.0.0.jar"/>
-- <fileset dir="lib/commons-cli/jars"
includes="commons-cli-1.0.jar"/>
-- <fileset dir="lib/commons-codec/jars"
includes="commons-codec-1.3.jar"/>
-- <fileset dir="lib/commons-httpclient/jars"
includes="commons-httpclient-3.0.1.jar"/>
-- <fileset dir="lib/commons-logging/jars"
includes="commons-logging-1.0.4.jar"/>
-- <fileset dir="lib/oro/jars" includes="oro-2.0.8.jar"/>
-+ <fileset dir="${debian.java.dir}" includes="ivy.jar"/>
-+ <fileset dir="${debian.java.dir}" includes="commons-cli.jar"/>
-+ <fileset dir="${debian.java.dir}" includes="commons-codec.jar"/>
-+ <fileset dir="${debian.java.dir}"
includes="commons-httpclient.jar"/>
-+ <fileset dir="${debian.java.dir}" includes="commons-logging.jar"/>
-+ <fileset dir="${debian.java.dir}" includes="oro.jar"/>
- </path>
-
- <taskdef resource="org/apache/ivy/ant/antlib.xml"
-@@ -109,6 +111,7 @@
- classpathref="compile.classpath"
- source="${jdk.source}"
- target="${jdk.target}"
-+ excludes="**/Ivy14Adapter.java"
- />
-
- <copy todir="${target.classes.dir}">
-diff -urNad pkg-ant-contrib~/ivysettings.xml pkg-ant-contrib/ivysettings.xml
---- pkg-ant-contrib~/ivysettings.xml 2009-03-20 05:27:52.000000000 +0100
-+++ pkg-ant-contrib/ivysettings.xml 2009-06-09 14:27:35.000000000 +0200
-@@ -5,8 +5,8 @@
-
- <resolvers>
- <filesystem name="local">
-- <ivy pattern="${ivy.conf.dir}/lib/[module]/ivy-[revision].xml" />
-- <artifact
pattern="${ivy.conf.dir}/lib/[module]/[ext]s/[artifact]-[revision].[ext]" />
-+ <ivy pattern="${ivy.conf.dir}/ivy-[revision].xml" />
-+ <artifact pattern="/usr/share/java/[artifact].[ext]" />
- </filesystem>
-
-
-diff -urNad
pkg-ant-contrib~/src/main/java/net/sf/antcontrib/net/URLImportTask.java
pkg-ant-contrib/src/main/java/net/sf/antcontrib/net/URLImportTask.java
---- pkg-ant-contrib~/src/main/java/net/sf/antcontrib/net/URLImportTask.java
2008-06-16 19:38:26.000000000 +0200
-+++ pkg-ant-contrib/src/main/java/net/sf/antcontrib/net/URLImportTask.java
2009-06-09 14:27:35.000000000 +0200
-@@ -158,7 +158,7 @@
- adapter = new Ivy20Adapter();
- }
- catch (ClassNotFoundException e) {
-- adapter = new Ivy14Adapter();
-+ // adapter = new Ivy14Adapter();
- }
-
- String setId = org + "." + module + "." + rev + ".fileset";
Modified: trunk/ant-contrib/debian/patches/series
===================================================================
--- trunk/ant-contrib/debian/patches/series 2011-09-24 22:20:26 UTC (rev
15024)
+++ trunk/ant-contrib/debian/patches/series 2011-09-24 22:27:08 UTC (rev
15025)
@@ -1,2 +1,2 @@
-debianize_build_xml.diff
-02_592182_fortask.diff
+0001-Debianize-build.xml.patch
+0002-Ensure-for-task-is-specified-correctly.patch
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
