[pkg-java] r6855 - trunk/groovy/debian

[twerner at alioth.debian.org]

Author: twerner
Date: 2008-08-11 15:41:53 +0000 (Mon, 11 Aug 2008)
New Revision: 6855

Modified:
   trunk/groovy/debian/changelog
   trunk/groovy/debian/control
   trunk/groovy/debian/rules
Log:
* Build the package with openjdk-6-jdk now.
* Change Depends: openjdk-6-jre-headless | java5-runtime-headless.

Modified: trunk/groovy/debian/changelog
===================================================================
--- trunk/groovy/debian/changelog	2008-08-11 15:23:34 UTC (rev 6854)
+++ trunk/groovy/debian/changelog	2008-08-11 15:41:53 UTC (rev 6855)
@@ -1,3 +1,10 @@
+groovy (1.5.6-2) UNRELEASED; urgency=low
+
+  * Build the package with openjdk-6-jdk now.
+  * Change Depends: openjdk-6-jre-headless | java5-runtime-headless.
+
+ -- Torsten Werner <twerner at debian.org>  Mon, 11 Aug 2008 17:32:19 +0200
+
 groovy (1.5.6-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/groovy/debian/control
===================================================================
--- trunk/groovy/debian/control	2008-08-11 15:23:34 UTC (rev 6854)
+++ trunk/groovy/debian/control	2008-08-11 15:41:53 UTC (rev 6855)
@@ -4,7 +4,7 @@
 Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>, Varun Hiremath <varun at debian.org>
 Build-Depends: debhelper (>= 6), cdbs
-Build-Depends-Indep: ant-optional, sun-java6-jdk, bzip2, libasm2-java,
+Build-Depends-Indep: ant-optional, openjdk-6-jdk, bzip2, libasm2-java,
  libbsf-java, libclassworlds-java (>= 1.0.1), libcommons-cli-java (>=
  1.0), libcommons-collections3-java (>= 3.1), libcommons-logging-java
  (>= 1.0.3), junit4, libmockobjects-java (>= 0.09), libmx4j-java (>=
@@ -22,7 +22,7 @@
  (>= 3.1), libcommons-logging-java (>= 1.0.3), junit4,
  libmockobjects-java (>= 0.09), libmx4j-java (>= 2.0.1),
  libregexp-java (>= 1.2), libservlet2.4-java, libjline-java,
- libxpp3-java, libxstream-java, java-gcj-compat | java-virtual-machine
+ libxpp3-java, libxstream-java, openjdk-6-jre-headless | java5-runtime-headless
 Suggests: groovy-doc
 Description: Agile dynamic language for the Java Virtual Machine
  Groovy is an agile dynamic language for the JVM combining lots of great

Modified: trunk/groovy/debian/rules
===================================================================
--- trunk/groovy/debian/rules	2008-08-11 15:23:34 UTC (rev 6854)
+++ trunk/groovy/debian/rules	2008-08-11 15:41:53 UTC (rev 6855)
@@ -3,7 +3,7 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
-JAVA_HOME 		:= /usr/lib/jvm/java-6-sun
+JAVA_HOME 		:= /usr/lib/jvm/java-6-openjdk
 DEB_ANT_BUILDFILE	:= debian/build.xml
 DEB_ANT_BUILD_TARGET	:= jar javadoc
 DEB_JARS := mockobjects-core servlet-api jsp-api commons-cli antlr	\