[pkg-java] r6802 - trunk/rhino/debian

[doko at alioth.debian.org]

Author: doko
Date: 2008-07-30 18:51:03 +0000 (Wed, 30 Jul 2008)
New Revision: 6802

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


Modified: trunk/rhino/debian/changelog
===================================================================
--- trunk/rhino/debian/changelog	2008-07-30 18:48:30 UTC (rev 6801)
+++ trunk/rhino/debian/changelog	2008-07-30 18:51:03 UTC (rev 6802)
@@ -1,9 +1,13 @@
 rhino (1.7R2~pre-3) UNRELEASED; urgency=low
 
+  [Marcus Better]
   * Updated package descriptions.
 
- -- Marcus Better <marcus at better.se>  Sat, 05 Apr 2008 23:35:29 +0200
+  [Matthias Klose]
+  * (Build-)depend on default-jre/-jdk.
 
+ -- Matthias Klose <doko at ubuntu.com>  Wed, 30 Jul 2008 18:48:41 +0000
+
 rhino (1.7R2~pre-2) experimental; urgency=low
 
   * Really include the debugger. Closes: #474046. 

Modified: trunk/rhino/debian/control
===================================================================
--- trunk/rhino/debian/control	2008-07-30 18:48:30 UTC (rev 6801)
+++ trunk/rhino/debian/control	2008-07-30 18:51:03 UTC (rev 6802)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>, Paul Cager <paul-debian at home.paulcager.org>, Marcus Better <marcus at better.se>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 5), cdbs, ant, java-gcj-compat-dev
+Build-Depends: debhelper (>= 5), cdbs, ant, default-jdk
 Standards-Version: 3.7.3
 Homepage: http://www.mozilla.org/rhino/
 Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/rhino
@@ -11,7 +11,7 @@
 
 Package: rhino
 Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime
+Depends: default-jre | java1-runtime | java2-runtime
 Suggests: rhino-doc
 Description: JavaScript engine written in Java
  Rhino is an implementation of the JavaScript language written

Modified: trunk/rhino/debian/rules
===================================================================
--- trunk/rhino/debian/rules	2008-07-30 18:48:30 UTC (rev 6801)
+++ trunk/rhino/debian/rules	2008-07-30 18:51:03 UTC (rev 6802)
@@ -4,7 +4,7 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME := /usr/lib/jvm/java-gcj
+JAVA_HOME := /usr/lib/jvm/default-java
 
 DEB_ANT_BUILD_TARGET := jar compile-debugger javadoc