Author: doko Date: 2008-09-30 17:10:11 +0000 (Tue, 30 Sep 2008) New Revision: 7070
Removed: trunk/ant/debian/patches/05_ant-bug433444.patch Modified: trunk/ant/debian/changelog trunk/ant/debian/control trunk/ant/debian/patches/01_ant_home_path.patch trunk/ant/debian/rules Log: ant (1.7.1-1) UNRELEASED; urgency=low * XXX Please use .orig.tar.gz from http://ppa.launchpad.net/ubuntu-java/ubuntu/pool/main/a/ant/ * New upstream version (bug fix release). - mainly a bugfix release. - has extended support for Java6 features. - <script> now has support for JavaFX. - release notes: http://apache.linux-mirror.org/ant/README.html * Remove debian/patches/05_ant-bug433444.patch. Obsoleted. * Merge from Ubuntu: - ant: Depend on default-jre-headless, drop dependency on jvm. - Set java source and target version to 1.4. - ant: Recommend default-jdk | java-compiler | java-sdk. -- Matthias Klose <[EMAIL PROTECTED]> Tue, 30 Sep 2008 19:11:32 +0200 Modified: trunk/ant/debian/changelog =================================================================== --- trunk/ant/debian/changelog 2008-09-30 07:48:29 UTC (rev 7069) +++ trunk/ant/debian/changelog 2008-09-30 17:10:11 UTC (rev 7070) @@ -1,9 +1,20 @@ -ant (1.7.0-7) UNRELEASED; urgency=low +ant (1.7.1-1) UNRELEASED; urgency=low - * ant: Depend on default-jre-headless, drop dependency on jvm. + * XXX Please use .orig.tar.gz from http://ppa.launchpad.net/ubuntu-java/ubuntu/pool/main/a/ant/ - -- Matthias Klose <[EMAIL PROTECTED]> Thu, 31 Jul 2008 09:39:46 +0000 + * New upstream version (bug fix release). + - mainly a bugfix release. + - has extended support for Java6 features. + - <script> now has support for JavaFX. + - release notes: http://apache.linux-mirror.org/ant/README.html + * Remove debian/patches/05_ant-bug433444.patch. Obsoleted. + * Merge from Ubuntu: + - ant: Depend on default-jre-headless, drop dependency on jvm. + - Set java source and target version to 1.4. + - ant: Recommend default-jdk | java-compiler | java-sdk. + -- Matthias Klose <[EMAIL PROTECTED]> Tue, 30 Sep 2008 19:11:32 +0200 + ant (1.7.0-6) unstable; urgency=low * Moved ant-bootstrap.jar to /usr/share/ant/etc/. Closes: #353586 Modified: trunk/ant/debian/control =================================================================== --- trunk/ant/debian/control 2008-09-30 07:48:29 UTC (rev 7069) +++ trunk/ant/debian/control 2008-09-30 17:10:11 UTC (rev 7070) @@ -14,7 +14,7 @@ Section: devel Priority: optional Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless, libxerces2-java -Recommends: ant-optional, ant-gcj +Recommends: ant-optional, ant-gcj, default-jdk | java-compiler | java-sdk Suggests: ant-doc Conflicts: libant1.6-java, ant-doc (<= 1.6.5-1) Replaces: libant1.6-java, ant-doc (<= 1.6.5-1) Modified: trunk/ant/debian/patches/01_ant_home_path.patch =================================================================== --- trunk/ant/debian/patches/01_ant_home_path.patch 2008-09-30 07:48:29 UTC (rev 7069) +++ trunk/ant/debian/patches/01_ant_home_path.patch 2008-09-30 17:10:11 UTC (rev 7070) @@ -1,6 +1,6 @@ ---- src/script/ant.orig 2005-05-19 14:40:48.000000000 +0200 -+++ src/script/ant 2005-06-23 16:00:12.000000000 +0200 -@@ -87,25 +87,9 @@ +--- src/script/ant~ 2008-06-27 07:05:19.000000000 +0200 ++++ src/script/ant 2008-09-30 14:51:50.000000000 +0200 +@@ -90,25 +90,9 @@ esac if [ -z "$ANT_HOME" -o ! -d "$ANT_HOME" ] ; then @@ -22,7 +22,7 @@ - ANT_HOME=`dirname "$PRG"`/.. - - # make it fully qualified -- ANT_HOME=`cd "$ANT_HOME" && pwd` +- ANT_HOME=`cd "$ANT_HOME" > /dev/null && pwd` + if [ -d /usr/share/ant ] ; then + ANT_HOME=/usr/share/ant + fi Deleted: trunk/ant/debian/patches/05_ant-bug433444.patch =================================================================== --- trunk/ant/debian/patches/05_ant-bug433444.patch 2008-09-30 07:48:29 UTC (rev 7069) +++ trunk/ant/debian/patches/05_ant-bug433444.patch 2008-09-30 17:10:11 UTC (rev 7070) @@ -1,18 +0,0 @@ ---- ./src/main/org/apache/tools/ant/types/resources/comparators/Date.java.orig 2007-07-17 13:21:17.000000000 -0100 -+++ ./src/main/org/apache/tools/ant/types/resources/comparators/Date.java 2007-07-17 13:22:02.000000000 -0100 -@@ -32,7 +32,14 @@ - * argument is less than, equal to, or greater than the second. - */ - protected int resourceCompare(Resource foo, Resource bar) { -- return (int) (foo.getLastModified() - bar.getLastModified()); -+ long diff = foo.getLastModified() - bar.getLastModified(); -+ if (diff > 0) { -+ return +1; -+ } else if (diff < 0) { -+ return -1; -+ } else { -+ return 0; -+ } - } - - } Modified: trunk/ant/debian/rules =================================================================== --- trunk/ant/debian/rules 2008-09-30 07:48:29 UTC (rev 7069) +++ trunk/ant/debian/rules 2008-09-30 17:10:11 UTC (rev 7070) @@ -38,7 +38,7 @@ /bin/sh bootstrap.sh # the rest - /bin/sh bootstrap/bin/ant -lib ${CLASSPATH} -propertyfile debian/ant.properties jars javadocs + /bin/sh bootstrap/bin/ant -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4 -lib ${CLASSPATH} -propertyfile debian/ant.properties jars javadocs touch stamp-build-ant _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
