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

[twerner at alioth.debian.org]

Author: twerner
Date: 2008-08-11 02:04:10 +0000 (Mon, 11 Aug 2008)
New Revision: 6849

Added:
   trunk/gant/debian/patches/
   trunk/gant/debian/patches/build.diff
   trunk/gant/debian/patches/series
Modified:
   trunk/gant/debian/changelog
   trunk/gant/debian/control
   trunk/gant/debian/rules
Log:
Disable target -test with patch build.diff.

Modified: trunk/gant/debian/changelog
===================================================================
--- trunk/gant/debian/changelog	2008-08-10 20:38:08 UTC (rev 6848)
+++ trunk/gant/debian/changelog	2008-08-11 02:04:10 UTC (rev 6849)
@@ -1,9 +1,9 @@
 gant (1.4.0-1) UNRELEASED; urgency=low
 
-  DOES NOT BUILD
   * New upstream release
+  * Disable target -test with patch build.diff.
 
- -- Torsten Werner <twerner at debian.org>  Thu, 24 Jul 2008 21:53:39 +0200
+ -- Torsten Werner <twerner at debian.org>  Mon, 11 Aug 2008 03:59:06 +0200
 
 gant (1.3.0-1) unstable; urgency=low
 

Modified: trunk/gant/debian/control
===================================================================
--- trunk/gant/debian/control	2008-08-10 20:38:08 UTC (rev 6848)
+++ trunk/gant/debian/control	2008-08-11 02:04:10 UTC (rev 6849)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>
-Build-Depends: cdbs, debhelper (>= 6)
+Build-Depends: cdbs, debhelper (>= 6), quilt
 Build-Depends-Indep: ant, groovy, java-gcj-compat-dev
 Standards-Version: 3.8.0
 Homepage: http://gant.codehaus.org/

Added: trunk/gant/debian/patches/build.diff
===================================================================
--- trunk/gant/debian/patches/build.diff	                        (rev 0)
+++ trunk/gant/debian/patches/build.diff	2008-08-11 02:04:10 UTC (rev 6849)
@@ -0,0 +1,13 @@
+Index: gant-1.4.0.orig/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>
+   </target>
+ 
+-  <target name="-package" depends="-test,-compile">
++  <target name="-package" depends="-compile">
+     <mkdir dir="${buildMetadataDirectory}"/>
+     <copy todir="${buildMetadataDirectory}" file="LICENCE.txt"/>
+     <manifest file="${buildMetadataDirectory}/MANIFEST.MF">

Added: trunk/gant/debian/patches/series
===================================================================
--- trunk/gant/debian/patches/series	                        (rev 0)
+++ trunk/gant/debian/patches/series	2008-08-11 02:04:10 UTC (rev 6849)
@@ -0,0 +1 @@
+build.diff

Modified: trunk/gant/debian/rules
===================================================================
--- trunk/gant/debian/rules	2008-08-10 20:38:08 UTC (rev 6848)
+++ trunk/gant/debian/rules	2008-08-11 02:04:10 UTC (rev 6849)
@@ -1,7 +1,8 @@
 #!/usr/bin/make -f
 
+include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 JAVA_HOME 		:= /usr/lib/jvm/java-gcj
 DEB_ANT_BUILD_TARGET	:= package