[pkg-java] r6791 - trunk/libgnujaf-java/debian

[doko at alioth.debian.org]

Author: doko
Date: 2008-07-30 17:35:20 +0000 (Wed, 30 Jul 2008)
New Revision: 6791

Modified:
   trunk/libgnujaf-java/debian/changelog
   trunk/libgnujaf-java/debian/control
   trunk/libgnujaf-java/debian/rules
Log:
* (Build-)depend on default-jre/-jdk.


Modified: trunk/libgnujaf-java/debian/changelog
===================================================================
--- trunk/libgnujaf-java/debian/changelog	2008-07-30 17:30:52 UTC (rev 6790)
+++ trunk/libgnujaf-java/debian/changelog	2008-07-30 17:35:20 UTC (rev 6791)
@@ -1,9 +1,13 @@
 libgnujaf-java (1.1.1-5) UNRELEASED; urgency=low
 
+  [Michael Koch]
   * Fixed watch file to match latest upstream release.
 
- -- Michael Koch <konqueror at gmx.de>  Thu, 03 Jan 2008 22:25:28 +0100
+  [Matthias Klose]
+  * (Build-)depend on default-jre/-jdk.
 
+ -- Matthias Klose <doko at debian.org>  Wed, 30 Jul 2008 17:31:25 +0000
+
 libgnujaf-java (1.1.1-4) unstable; urgency=low
 
   * Use java-gcj-compat instead of kaffe.

Modified: trunk/libgnujaf-java/debian/control
===================================================================
--- trunk/libgnujaf-java/debian/control	2008-07-30 17:30:52 UTC (rev 6790)
+++ trunk/libgnujaf-java/debian/control	2008-07-30 17:35:20 UTC (rev 6791)
@@ -3,12 +3,12 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 4.0.0), java-gcj-compat-dev
+Build-Depends: debhelper (>= 4.0.0), default-jdk
 Standards-Version: 3.7.2
 
 Package: libgnujaf-java
 Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime
+Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless
 Suggests: java-virtual-machine
 Description: free implementation of the javabeans activation framework
  With the javabeans activation framework developper can take advantage

Modified: trunk/libgnujaf-java/debian/rules
===================================================================
--- trunk/libgnujaf-java/debian/rules	2008-07-30 17:30:52 UTC (rev 6790)
+++ trunk/libgnujaf-java/debian/rules	2008-07-30 17:35:20 UTC (rev 6791)
@@ -15,7 +15,7 @@
 LIBRARY=activation
 VERSION=1.1.1
 
-JAVA_HOME=/usr/lib/jvm/java-gcj
+JAVA_HOME=/usr/lib/jvm/default-java
 
 CFLAGS = -Wall -g