CVS rhino/debian

[Wolfgang B??r]

Update of /cvsroot/pkg-java/rhino/debian
In directory haydn:/tmp/cvs-serv9128/debian

Modified Files:
	changelog control rhino.postinst rules 
Added Files:
	rhino-doc.doc-base.1 rhino-doc.doc-base.2 rhino-doc.lintian 
Log Message:
rhino (1.5.R5-4) unstable; urgency=low

  * libant1.6-java to ant transition
  * Removed dependency on java-common
  * Added suggests to rhino-doc and other way round
  * Registered documentation with doc-base
  * Fixed lintian warning in postinst and added override
    for false positive lintian warning
  * Standards-Version 3.6.2 (no changes)


--- /cvsroot/pkg-java/rhino/debian/changelog	2005/04/15 09:59:38	1.2
+++ /cvsroot/pkg-java/rhino/debian/changelog	2005/09/24 23:38:57	1.3
@@ -1,3 +1,15 @@
+rhino (1.5.R5-4) unstable; urgency=low
+
+  * libant1.6-java to ant transition
+  * Removed dependency on java-common
+  * Added suggests to rhino-doc and other way round
+  * Registered documentation with doc-base
+  * Fixed lintian warning in postinst and added override
+    for false positive lintian warning
+  * Standards-Version 3.6.2 (no changes)
+
+ -- Wolfgang Baer <WBaer at gmx.de>  Sat, 24 Sep 2005 23:31:36 +0200
+
 rhino (1.5.R5-3) unstable; urgency=low
   
   * Added java2-runtime to runtime choices
--- /cvsroot/pkg-java/rhino/debian/control	2005/04/15 09:59:38	1.2
+++ /cvsroot/pkg-java/rhino/debian/control	2005/09/24 23:38:57	1.3
@@ -3,12 +3,13 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Takashi Okamoto <tora at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>
-Build-Depends-Indep: debhelper (>= 4.2.30), cdbs, libant1.6-java, kaffe (>= 2:1.1.4.PRECVS12-1) 
-Standards-Version: 3.6.1
+Build-Depends-Indep: debhelper (>= 4.2.30), cdbs, ant, kaffe (>= 2:1.1.5-3) 
+Standards-Version: 3.6.2
 
 Package: rhino
 Architecture: all
-Depends: java-common, kaffe | java1-runtime | java2-runtime
+Depends: kaffe | java1-runtime | java2-runtime
+Suggests: rhino-doc
 Description: JavaScript engine written in Java
  Rhino is an open-source implementation of JavaScript written
  entirely in Java. It is typically embedded into Java applications 
@@ -16,6 +17,7 @@
 
 Package: rhino-doc
 Architecture: all
+Suggests: rhino
 Description: Documentation for rhino Java Script Engine
  This is the documentation for rhino which is JavaScript Engine 
  written entirely in Java.
--- /cvsroot/pkg-java/rhino/debian/rhino.postinst	2004/11/21 15:03:44	1.1.1.1
+++ /cvsroot/pkg-java/rhino/debian/rhino.postinst	2005/09/24 23:38:57	1.2
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 if [ "$1" = "configure" -o "$1" = "abort-upgrade" ]; then
   update-alternatives --install /usr/bin/js js /usr/bin/rhino 100 \
--- /cvsroot/pkg-java/rhino/debian/rules	2005/04/15 09:59:38	1.2
+++ /cvsroot/pkg-java/rhino/debian/rules	2005/09/24 23:38:57	1.3
@@ -6,7 +6,7 @@
 include /usr/share/cdbs/1/class/ant.mk
 
 JAVA_HOME := /usr/lib/kaffe
-ANT_HOME := /usr/share/ant1.6
+ANT_HOME := /usr/share/ant
 
 DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar
 DEB_ANT_COMPILER := jikes
@@ -26,3 +26,8 @@
 	install -m 744 debian/rhino.sh $(CURDIR)/debian/rhino/usr/bin/rhino
 	install -m 744 debian/rhino-jsc.sh $(CURDIR)/debian/rhino/usr/bin/rhino-jsc
 	dh_movefiles --sourcedir=debian/rhino
+
+install/rhino-doc::
+	# install lintian overrides
+	install -d $(CURDIR)/debian/rhino-doc/usr/share/lintian/overrides/
+	install -m 644 $(CURDIR)/debian/rhino-doc.lintian $(CURDIR)/debian/rhino-doc/usr/share/lintian/overrides/rhino-doc