[libregexp-java] 06/26: * (Build-)depend on default-jre/-jdk.

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libregexp-java.

commit 6d16eafd18e86c710a2ea7314fadb71e5172a747
Author: Matthias Klose <doko at debian.org>
Date:   Wed Jul 30 18:44:57 2008 +0000

    * (Build-)depend on default-jre/-jdk.
---
 debian/changelog | 6 ++++++
 debian/control   | 4 ++--
 debian/rules     | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2fb77b9..2fa230e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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.
diff --git a/debian/control b/debian/control
index b6b51d4..3ad27ca 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,12 @@ Section: libs
 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.
diff --git a/debian/rules b/debian/rules
index f0b9b06..cee6fd6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 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 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libregexp-java.git