[pkg-java] r10337 - trunk/jlgui/debian

[Torsten Werner]

Author: twerner
Date: 2009-09-11 19:17:36 +0000 (Fri, 11 Sep 2009)
New Revision: 10337

Modified:
   trunk/jlgui/debian/changelog
   trunk/jlgui/debian/control
   trunk/jlgui/debian/rules
Log:
* Change Build-Depends: default-jdk.
* Change Depends: openjdk6-jre.

Modified: trunk/jlgui/debian/changelog
===================================================================
--- trunk/jlgui/debian/changelog	2009-09-11 09:20:44 UTC (rev 10336)
+++ trunk/jlgui/debian/changelog	2009-09-11 19:17:36 UTC (rev 10337)
@@ -1,3 +1,10 @@
+jlgui (3.0-9) unstable; urgency=low
+
+  * Change Build-Depends: default-jdk.
+  * Change Depends: openjdk6-jre.
+
+ -- Torsten Werner <twerner at debian.org>  Fri, 11 Sep 2009 21:12:15 +0200
+
 jlgui (3.0-8) unstable; urgency=low
 
   * Change Maintainer: Debian Java Maintainers.

Modified: trunk/jlgui/debian/control
===================================================================
--- trunk/jlgui/debian/control	2009-09-11 09:20:44 UTC (rev 10336)
+++ trunk/jlgui/debian/control	2009-09-11 19:17:36 UTC (rev 10337)
@@ -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: ant, cdbs, debhelper (>= 5), java-gcj-compat-dev, libbasicplayer-java,
+Build-Depends: ant, cdbs, debhelper (>= 5), default-jdk, libbasicplayer-java,
  libcommons-logging-java, libjlayer-java, libkjdsp-java,
  libtritonus-java, libjmac-java, quilt
 Standards-Version: 3.8.2
@@ -14,8 +14,7 @@
 Package: jlgui
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends},
- java-gcj-compat | java1-runtime | java2-runtime, kaffe,
- libbasicplayer-java, libcommons-logging-java,
+ openjdk6-jre, libbasicplayer-java, libcommons-logging-java,
  libjlayer-java, libkjdsp-java, libmp3spi-java, libtritonus-java,
  libvorbisspi-java, libjmac-java
 Recommends: kdebase-data, libjflac-java, libjspeex-java

Modified: trunk/jlgui/debian/rules
===================================================================
--- trunk/jlgui/debian/rules	2009-09-11 09:20:44 UTC (rev 10336)
+++ trunk/jlgui/debian/rules	2009-09-11 19:17:36 UTC (rev 10337)
@@ -4,7 +4,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-JAVA_HOME 		:= /usr/lib/jvm/java-gcj
+JAVA_HOME 		:= /usr/lib/jvm/default-java
 DEB_ANT_BUILD_TARGET	:= all
 DEB_JARS		:= basicplayer commons-logging jlayer kj_dsp tritonus_share