[ant] 04/17: Removed 0006-fix-ANT_HOME-path.patch (not required)
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Jan 12 14:39:03 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository ant.
commit 00662f234cf97db0b40f75771c165614cc0e3dab
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Jan 12 10:52:00 2017 +0100
Removed 0006-fix-ANT_HOME-path.patch (not required)
---
debian/changelog | 1 +
debian/patches/0006-fix-ANT_HOME-path.patch | 39 -----------------------------
debian/patches/series | 1 -
3 files changed, 1 insertion(+), 40 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 15147a7..0566ac5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ant (1.9.8-2) UNRELEASED; urgency=medium
* Team upload.
* Removed activation.jar and inetlib.jar from the build classpath
* Fixed a typo in the man pages
+ * Removed 0006-fix-ANT_HOME-path.patch (not required)
* Removed 0008-junit4-replace-assumeFalse.patch
-- Emmanuel Bourg <ebourg at apache.org> Wed, 11 Jan 2017 17:46:06 +0100
diff --git a/debian/patches/0006-fix-ANT_HOME-path.patch b/debian/patches/0006-fix-ANT_HOME-path.patch
deleted file mode 100644
index bbe68e0..0000000
--- a/debian/patches/0006-fix-ANT_HOME-path.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Date: Thu, 11 Mar 2010 21:50:12 +0100
-Subject: [PATCH] fix $ANT_HOME path
-
----
- src/script/ant | 22 +++-------------------
- 1 files changed, 3 insertions(+), 19 deletions(-)
-
---- a/src/script/ant
-+++ b/src/script/ant
-@@ -153,25 +153,9 @@
- esac
-
- if [ -z "$ANT_HOME" -o ! -d "$ANT_HOME" ] ; then
-- ## resolve links - $0 may be a link to ant's home
-- PRG="$0"
-- progname=`basename "$0"`
--
-- # need this for relative symlinks
-- while [ -h "$PRG" ] ; do
-- ls=`ls -ld "$PRG"`
-- link=`expr "$ls" : '.*-> \(.*\)$'`
-- if expr "$link" : '/.*' > /dev/null; then
-- PRG="$link"
-- else
-- PRG=`dirname "$PRG"`"/$link"
-- fi
-- done
--
-- ANT_HOME=`dirname "$PRG"`/..
--
-- # make it fully qualified
-- ANT_HOME=`cd "$ANT_HOME" > /dev/null && pwd`
-+ if [ -d /usr/share/ant ] ; then
-+ ANT_HOME=/usr/share/ant
-+ fi
- fi
-
- # For Cygwin and Mingw, ensure paths are in UNIX format before
diff --git a/debian/patches/series b/debian/patches/series
index 3c4d544..77eb504 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
0002-do-not-build-test-jars.patch
-0006-fix-ANT_HOME-path.patch
0007-use-build.classpath.patch
0009-reproducible-timestamp-task.patch
0010-reproducible-javadoc-task.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ant.git
More information about the pkg-java-commits
mailing list