[ant-contrib] 03/08: Removed the unused portions of 0001-Debianize-build.xml.patch
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue Aug 2 22:39:37 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository ant-contrib.
commit 1df8bb20d93058bbbf10c739f36a0130386afd7c
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Tue Aug 2 23:42:48 2016 +0200
Removed the unused portions of 0001-Debianize-build.xml.patch
---
debian/changelog | 1 +
debian/patches/0001-Debianize-build.xml.patch | 76 ---------------------------
debian/patches/0003-ivy-compatibility.patch | 24 +++++++++
debian/patches/series | 2 +-
4 files changed, 26 insertions(+), 77 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 79a17d4..7e7d538 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
ant-contrib (1.0~b3+svn177-8) UNRELEASED; urgency=medium
+ * Removed the unused portions of 0001-Debianize-build.xml.patch
* Moved the package to Git
* Standards-Version updated to 3.9.8
diff --git a/debian/patches/0001-Debianize-build.xml.patch b/debian/patches/0001-Debianize-build.xml.patch
deleted file mode 100644
index 6026c6c..0000000
--- a/debian/patches/0001-Debianize-build.xml.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From: Daniel Leidert (dale) <daniel.leidert at 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";
---
diff --git a/debian/patches/0003-ivy-compatibility.patch b/debian/patches/0003-ivy-compatibility.patch
new file mode 100644
index 0000000..ad755b8
--- /dev/null
+++ b/debian/patches/0003-ivy-compatibility.patch
@@ -0,0 +1,24 @@
+Description: Fixes the compatibility with the version of Ivy in Debian
+Author: Daniel Leidert (dale) <daniel.leidert at wgdd.de>
+Forwarded: no
+--- a/src/main/java/net/sf/antcontrib/net/URLImportTask.java
++++ b/src/main/java/net/sf/antcontrib/net/URLImportTask.java
+@@ -158,7 +158,7 @@
+ adapter = new Ivy20Adapter();
+ }
+ catch (ClassNotFoundException e) {
+- adapter = new Ivy14Adapter();
++ // adapter = new Ivy14Adapter();
+ }
+
+ String setId = org + "." + module + "." + rev + ".fileset";
+--- a/build.xml
++++ b/build.xml
+@@ -109,6 +109,7 @@
+ classpathref="compile.classpath"
+ source="${jdk.source}"
+ target="${jdk.target}"
++ excludes="**/Ivy14Adapter.java"
+ />
+
+ <copy todir="${target.classes.dir}">
diff --git a/debian/patches/series b/debian/patches/series
index bf024b4..2c9f19d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-0001-Debianize-build.xml.patch
0002-Ensure-for-task-is-specified-correctly.patch
+0003-ivy-compatibility.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ant-contrib.git
More information about the pkg-java-commits
mailing list