diff -u rhino-1.7R1/debian/control rhino-1.7R1/debian/control
--- rhino-1.7R1/debian/control
+++ rhino-1.7R1/debian/control
@@ -1,7 +1,8 @@
 Source: rhino
 Section: interpreters
 Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk@debian.org>, Paul Cager <paul-debian@home.paulcager.org>, Marcus Better <marcus@better.se>, Michael Koch <konqueror@gmx.de>
 Build-Depends: debhelper (>= 5), cdbs, ant, default-jdk
 Standards-Version: 3.7.3
@@ -11,7 +12,7 @@
 
 Package: rhino
 Architecture: all
-Depends: default-jre | java1-runtime | java2-runtime
+Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless
 Suggests: rhino-doc
 Description: JavaScript engine written in Java
  Rhino is an open-source implementation of JavaScript written
diff -u rhino-1.7R1/debian/changelog rhino-1.7R1/debian/changelog
--- rhino-1.7R1/debian/changelog
+++ rhino-1.7R1/debian/changelog
@@ -1,3 +1,10 @@
+rhino (1.7R1-1ubuntu2) intrepid; urgency=low
+
+  * Depend on default-jre-headless (fixes LP: #249598)
+  * Changed Maintainer to conform to DebianMaintainer spec
+
+ -- Thierry Carrez <thierry.carrez@ubuntu.com>  Thu, 31 Jul 2008 10:38:13 +0200
+
 rhino (1.7R1-1ubuntu1) intrepid; urgency=low
 
   * (Build-)depend on default-jre/-jdk.