[pkg-java] r7655 - in trunk/gant/debian: . patches

[twerner at alioth.debian.org]

Author: twerner
Date: 2008-12-14 11:04:17 +0000 (Sun, 14 Dec 2008)
New Revision: 7655

Modified:
   trunk/gant/debian/changelog
   trunk/gant/debian/patches/build.diff
   trunk/gant/debian/rules
Log:
* New upstream release
* Refresh patch build.diff.
* Minor build fixes

Modified: trunk/gant/debian/changelog
===================================================================
--- trunk/gant/debian/changelog	2008-12-12 12:06:18 UTC (rev 7654)
+++ trunk/gant/debian/changelog	2008-12-14 11:04:17 UTC (rev 7655)
@@ -1,3 +1,11 @@
+gant (1.5.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Refresh patch build.diff.
+  * Minor build fixes
+
+ -- Torsten Werner <twerner at debian.org>  Sun, 14 Dec 2008 12:03:48 +0100
+
 gant (1.4.0+dak1-1) unstable; urgency=low
 
   * Upload missing orig tarball.

Modified: trunk/gant/debian/patches/build.diff
===================================================================
--- trunk/gant/debian/patches/build.diff	2008-12-12 12:06:18 UTC (rev 7654)
+++ trunk/gant/debian/patches/build.diff	2008-12-14 11:04:17 UTC (rev 7655)
@@ -1,13 +1,13 @@
-Index: gant-1.4.0.orig/build.xml
+Index: gant-1.5.0/build.xml
 ===================================================================
---- gant-1.4.0.orig.orig/build.xml	2008-08-11 03:58:05.000000000 +0200
-+++ gant-1.4.0.orig/build.xml	2008-08-11 03:58:19.000000000 +0200
-@@ -194,7 +194,7 @@
-     </junit>
+--- gant-1.5.0.orig/build.xml	2008-12-11 10:40:48.000000000 +0100
++++ gant-1.5.0/build.xml	2008-12-14 11:59:49.000000000 +0100
+@@ -197,7 +197,7 @@
+     <delete file="groovyAntTaskTestVersion.properties"/>
    </target>
  
--  <target name="-package" depends="-test,-compile">
-+  <target name="-package" depends="-compile">
+-  <target name="-package" depends="-compile,-test" unless="testsFailed">
++  <target name="-package" depends="-compile" unless="testsFailed">
      <mkdir dir="${buildMetadataDirectory}"/>
      <copy todir="${buildMetadataDirectory}" file="LICENCE.txt"/>
      <manifest file="${buildMetadataDirectory}/MANIFEST.MF">

Modified: trunk/gant/debian/rules
===================================================================
--- trunk/gant/debian/rules	2008-12-12 12:06:18 UTC (rev 7654)
+++ trunk/gant/debian/rules	2008-12-14 11:04:17 UTC (rev 7655)
@@ -9,10 +9,10 @@
 UPSTREAM_VERSION     := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -e's,+dak.*,,')
 
 install/gant::
-	dh_install target/gant-$(UPSTREAM_VERSION).jar /usr/share/groovy/lib/
+	dh_install target_gant/gant-$(UPSTREAM_VERSION).jar /usr/share/groovy/lib/
 	dh_link /usr/share/groovy/lib/gant-$(UPSTREAM_VERSION).jar /usr/share/java/gant.jar
 	install -D -m755 debian/gant.sh $(DEB_DESTDIR)/usr/share/groovy/bin/gant
 	dh_link /usr/share/groovy/bin/gant /usr/bin/gant
 
 get-orig-source:
-	-uscan --upstream-version 0 --rename
+	uscan --force-download --rename