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

[Varun Hiremath]

Author: varun
Date: 2009-06-25 09:21:13 +0000 (Thu, 25 Jun 2009)
New Revision: 8610

Modified:
   trunk/gant/debian/changelog
   trunk/gant/debian/control
   trunk/gant/debian/copyright
   trunk/gant/debian/patches/build.diff
   trunk/gant/debian/rules
Log:
* Switch to openjdk which fixes FTBFS (Closes: #533952)
* Bump Standards-Version to 3.8.2 (no changes)

Modified: trunk/gant/debian/changelog
===================================================================
--- trunk/gant/debian/changelog	2009-06-24 20:47:09 UTC (rev 8609)
+++ trunk/gant/debian/changelog	2009-06-25 09:21:13 UTC (rev 8610)
@@ -1,3 +1,10 @@
+gant (1.6.1-2) unstable; urgency=low
+
+  * Switch to openjdk which fixes FTBFS (Closes: #533952)
+  * Bump Standards-Version to 3.8.2 (no changes)
+
+ -- Varun Hiremath <varun at debian.org>  Thu, 25 Jun 2009 05:17:35 -0400
+
 gant (1.6.1-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/gant/debian/control
===================================================================
--- trunk/gant/debian/control	2009-06-24 20:47:09 UTC (rev 8609)
+++ trunk/gant/debian/control	2009-06-25 09:21:13 UTC (rev 8610)
@@ -4,15 +4,15 @@
 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), quilt
-Build-Depends-Indep: ant, groovy, java-gcj-compat-dev
-Standards-Version: 3.8.0
+Build-Depends-Indep: ant, groovy, openjdk-6-jdk
+Standards-Version: 3.8.2
 Homepage: http://gant.codehaus.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/gant
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/gant
 
 Package: gant
 Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime, groovy
+Depends: ${misc:Depends}, default-jre | java2-runtime, groovy
 Description: Groovy build framework based on scripting Ant tasks
  Gant is a build tool for scripting Ant tasks using Groovy instead of
  XML to specify the build logic. A Gant build specification is a

Modified: trunk/gant/debian/copyright
===================================================================
--- trunk/gant/debian/copyright	2009-06-24 20:47:09 UTC (rev 8609)
+++ trunk/gant/debian/copyright	2009-06-25 09:21:13 UTC (rev 8610)
@@ -13,5 +13,5 @@
    On Debian systems, full text of the Apache 2.0 license can be found
    at `/usr/share/common-licenses/Apache-2.0'.
 
-The Debian packaging is (C) 2007, Varun Hiremath <varun at debian.org> and
+The Debian packaging is © 2007, Varun Hiremath <varun at debian.org> and
 is licensed under the GPL, see `/usr/share/common-licenses/GPL'.

Modified: trunk/gant/debian/patches/build.diff
===================================================================
--- trunk/gant/debian/patches/build.diff	2009-06-24 20:47:09 UTC (rev 8609)
+++ trunk/gant/debian/patches/build.diff	2009-06-25 09:21:13 UTC (rev 8610)
@@ -1,3 +1,5 @@
+Author: Varun Hiremath <varun at debian.org>
+Description: Disable test build
 Index: gant-1.5.0/build.xml
 ===================================================================
 --- gant-1.5.0.orig/build.xml	2008-12-11 10:40:48.000000000 +0100

Modified: trunk/gant/debian/rules
===================================================================
--- trunk/gant/debian/rules	2009-06-24 20:47:09 UTC (rev 8609)
+++ trunk/gant/debian/rules	2009-06-25 09:21:13 UTC (rev 8610)
@@ -4,7 +4,7 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-JAVA_HOME 	     := /usr/lib/jvm/java-gcj
+JAVA_HOME 	     := /usr/lib/jvm/java-6-openjdk
 DEB_ANT_BUILD_TARGET := package
 UPSTREAM_VERSION     := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -e's,+dak.*,,')