[pkg-java] r6800 - trunk/libregexp-java/debian

[doko at alioth.debian.org]

Author: doko
Date: 2008-07-30 18:44:57 +0000 (Wed, 30 Jul 2008)
New Revision: 6800

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


Modified: trunk/libregexp-java/debian/changelog
===================================================================
--- trunk/libregexp-java/debian/changelog	2008-07-30 18:42:29 UTC (rev 6799)
+++ trunk/libregexp-java/debian/changelog	2008-07-30 18:44:57 UTC (rev 6800)
@@ -1,3 +1,9 @@
+libregexp-java (1.4-5) UNRELASED; urgency=low
+
+  * (Build-)depend on default-jre/-jdk.
+
+ -- Matthias Klose <doko at debian.org>  Wed, 30 Jul 2008 18:42:51 +0000
+
 libregexp-java (1.4-4) unstable; urgency=low
 
   * Use java-gcj-compat instead of kaffe.

Modified: trunk/libregexp-java/debian/control
===================================================================
--- trunk/libregexp-java/debian/control	2008-07-30 18:42:29 UTC (rev 6799)
+++ trunk/libregexp-java/debian/control	2008-07-30 18:44:57 UTC (rev 6800)
@@ -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.2.30), java-gcj-compat-dev, ant, cdbs
+Build-Depends: debhelper (>= 4.2.30), default-jdk, ant, cdbs
 Standards-Version: 3.7.2
 
 Package: libregexp-java
 Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime
+Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless
 Description: regular expression library for Java
  Regexp is a 100% Pure Java Regular Expression package. Regular expressions
  are pattern descriptions which enable sophisticated matching of strings.

Modified: trunk/libregexp-java/debian/rules
===================================================================
--- trunk/libregexp-java/debian/rules	2008-07-30 18:42:29 UTC (rev 6799)
+++ trunk/libregexp-java/debian/rules	2008-07-30 18:44:57 UTC (rev 6800)
@@ -7,7 +7,7 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME_DIRS := /usr/lib/jvm/java-gcj
+JAVA_HOME_DIRS := /usr/lib/jvm/default-java
 ANT_HOME := /usr/share/ant
 
 DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar