[pkg-java] r6790 - trunk/libgnuinet-java/debian

[doko at alioth.debian.org]

Author: doko
Date: 2008-07-30 17:30:52 +0000 (Wed, 30 Jul 2008)
New Revision: 6790

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


Modified: trunk/libgnuinet-java/debian/changelog
===================================================================
--- trunk/libgnuinet-java/debian/changelog	2008-07-30 17:26:15 UTC (rev 6789)
+++ trunk/libgnuinet-java/debian/changelog	2008-07-30 17:30:52 UTC (rev 6790)
@@ -1,3 +1,9 @@
+libgnuinet-java (1.1.1-4) UNRELEASED; urgency=low
+
+  * (Build-)depend on default-jre/-jdk.
+
+ -- Matthias Klose <doko at debian.org>  Wed, 30 Jul 2008 17:27:56 +0000
+
 libgnuinet-java (1.1.1-3) unstable; urgency=low
 
   * Move to unstable.

Modified: trunk/libgnuinet-java/debian/control
===================================================================
--- trunk/libgnuinet-java/debian/control	2008-07-30 17:26:15 UTC (rev 6789)
+++ trunk/libgnuinet-java/debian/control	2008-07-30 17:30:52 UTC (rev 6790)
@@ -3,13 +3,13 @@
 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-Indep: java-gcj-compat-dev, ant
+Build-Depends-Indep: default-jdk, ant
 Build-Depends: debhelper (>= 4.2.30), cdbs (>= 0.4.8)
 Standards-Version: 3.7.2
 
 Package: libgnuinet-java
 Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime
+Depends: default-java-jre-headless | java1-runtime-headless | java2-runtime-headless
 Description: extension library to provide extra network protocol support
  GNU Classpath inetlib is an extension library to provide extra network
  protocol support for GNU Classpath and ClasspathX project, but it can

Modified: trunk/libgnuinet-java/debian/rules
===================================================================
--- trunk/libgnuinet-java/debian/rules	2008-07-30 17:26:15 UTC (rev 6789)
+++ trunk/libgnuinet-java/debian/rules	2008-07-30 17:30:52 UTC (rev 6790)
@@ -6,7 +6,7 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME            := /usr/lib/jvm/java-gcj
+JAVA_HOME            := /usr/lib/jvm/default-java
 DEB_ANT_BUILD_TARGET := inetlib.jar doc
 
 LIBRARY=gnuinet