[javacc] 22/44: * (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 javacc.

commit 8144abec819d00ced45e4d516191aa53dd03d7e4
Author: Matthias Klose <doko at debian.org>
Date:   Wed Jul 30 15:14:48 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 2d2781a..9d30630 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+javacc (4.0+cvs20080403-2) UNRELEASED; urgency=low
+
+  * (Build-)depend on default-jre/-jdk.
+
+ -- Matthias Klose <doko at debian.org>  Wed, 30 Jul 2008 15:13:07 +0000
+
 javacc (4.0+cvs20080403-1) unstable; urgency=low
 
   [ Paul Cager ]
diff --git a/debian/control b/debian/control
index 1329af7..2c5ceea 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Paul Cager <paul-debian at home.paulcager.org>
-Build-Depends-Indep: java-gcj-compat-dev (>=1.0.65), ant-optional, libxalan2-java, docbook-to-man, junit
+Build-Depends-Indep: default-jdk, ant-optional, libxalan2-java, docbook-to-man, junit
 Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3)
 Standards-Version: 3.7.3
 Homepage: http://javacc.dev.java.net/
@@ -12,7 +12,7 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/javacc
 
 Package: javacc
 Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime
+Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless
 Suggests: javacc-doc
 Description: A parser generator for use with Java
  Java Compiler Compiler (JavaCC) is (according to sun)
diff --git a/debian/rules b/debian/rules
index 725629d..8412902 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@ include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 PACKAGE              := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ')
-JAVA_HOME            := /usr/lib/jvm/java-gcj
+JAVA_HOME            := /usr/lib/jvm/default-java
 DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar junit
 DEB_ANT_BUILD_TARGET := jar
 DEB_ANT_CLEAN_TARGET := realclean

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