[pkg-java] r6776 - trunk/javacc/debian

[doko at alioth.debian.org]

Author: doko
Date: 2008-07-30 15:14:48 +0000 (Wed, 30 Jul 2008)
New Revision: 6776

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


Modified: trunk/javacc/debian/changelog
===================================================================
--- trunk/javacc/debian/changelog	2008-07-30 15:09:29 UTC (rev 6775)
+++ trunk/javacc/debian/changelog	2008-07-30 15:14:48 UTC (rev 6776)
@@ -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 ]

Modified: trunk/javacc/debian/control
===================================================================
--- trunk/javacc/debian/control	2008-07-30 15:09:29 UTC (rev 6775)
+++ trunk/javacc/debian/control	2008-07-30 15:14:48 UTC (rev 6776)
@@ -3,7 +3,7 @@
 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 @@
 
 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)

Modified: trunk/javacc/debian/rules
===================================================================
--- trunk/javacc/debian/rules	2008-07-30 15:09:29 UTC (rev 6775)
+++ trunk/javacc/debian/rules	2008-07-30 15:14:48 UTC (rev 6776)
@@ -5,7 +5,7 @@
 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