[cup] 10/36: * (Build-)depend on default-jre/-jdk.

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository cup.

commit edded76b015213cfffaaf5109bc5c78f3721a5a4
Author: Matthias Klose <doko at debian.org>
Date:   Wed Jul 30 15:09:29 2008 +0000

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

diff --git a/debian/Makefile b/debian/Makefile
index d1e5649..d6acc91 100644
--- a/debian/Makefile
+++ b/debian/Makefile
@@ -1,6 +1,7 @@
-export JAVA_HOME=/usr/lib/jvm/java-gcj
+export JAVA_HOME=/usr/lib/jvm/default-java
 
 cup.jar:
+	mkdir -p classes
 	${JAVA_HOME}/bin/javac -d classes java_cup/*.java java_cup/*/*.java
 	${JAVA_HOME}/bin/jar mcvf debian/manifest cup.jar -C classes java_cup
 
diff --git a/debian/changelog b/debian/changelog
index a14986d..32a7885 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cup (0.10k-8) UNRELEASED; urgency=low
+
+  * (Build-)depend on default-jre/-jdk.
+
+ -- Matthias Klose <doko at debian.org>  Wed, 30 Jul 2008 16:58:53 +0200
+
 cup (0.10k-7) unstable; urgency=low
 
   * Fixed program name. Closes: #415139.
diff --git a/debian/control b/debian/control
index 0ecb082..0cad895 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: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 4.2.30), java-gcj-compat-dev
+Build-Depends: debhelper (>= 4.2.30), default-jdk
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/cup
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/cup
@@ -12,7 +12,7 @@ Homepage: http://www2.cs.tum.edu/projects/cup/
 Package: cup
 Architecture: all
 Section: devel
-Depends: java-gcj-compat | java1-runtime | java2-runtime
+Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless
 Suggests: java-compiler
 Description: LALR parser generator for Java(tm)
  CUP is the "Constructor of Useful Parsers", a system for generating

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