CVS rhino/debian

[Arnaud Vandyck]

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

Modified Files:
	README.Debian changelog control rules 
Added Files:
	rhino-jsc.1 rhino-jsc.sh rhino.1 rhino.manpages 
Log Message:
java2-runtime as an alternative

--- /cvsroot/pkg-java/rhino/debian/README.Debian	2004/11/21 15:03:44	1.1.1.1
+++ /cvsroot/pkg-java/rhino/debian/README.Debian	2005/04/15 09:59:37	1.2
@@ -1,11 +1,3 @@
-rhino in main
--------------
- 
- Missing JTree seems to be the problem when trying to build rhino with
- free tools
- 
- -- Arnaud Vandyck <avdyk@debian.org>, Sun Nov 21 14:31:47 2004
-
 rhino for Debian
 ----------------
 
--- /cvsroot/pkg-java/rhino/debian/changelog	2004/11/21 15:03:44	1.1.1.1
+++ /cvsroot/pkg-java/rhino/debian/changelog	2005/04/15 09:59:38	1.2
@@ -1,3 +1,21 @@
+rhino (1.5.R5-3) unstable; urgency=low
+  
+  * Added java2-runtime to runtime choices
+  * Removed build.xml workaround patch which is no longer
+    needed with the current kaffe in sarge/unstable
+
+ -- Wolfgang Baer <WBaer@gmx.de>  Wed, 13 Apr 2005 19:30:40 +0200
+
+rhino (1.5.R5-2) unstable; urgency=low
+  
+  * Closes: #283651: alternative without a manpage
+  * upload to main: uses kaffe,jikes to build
+  * provide JavaScript compiler as rhino-jsc with manpage
+  * Arnaud Vandyck <avdyk@debian.org> did sponsor this package. As a
+    member of pkg-java Alioth's project, I added Wolfgang as uploaders
+
+ -- Wolfgang Baer <WBaer@gmx.de>  Sat, 12 Feb 2005 11:56:06 +0000
+
 rhino (1.5.R5-1) unstable; urgency=low
 
   * New upstream release
--- /cvsroot/pkg-java/rhino/debian/control	2004/11/21 15:03:44	1.1.1.1
+++ /cvsroot/pkg-java/rhino/debian/control	2005/04/15 09:59:38	1.2
@@ -1,14 +1,14 @@
 Source: rhino
-Section: contrib/interpreters
+Section: interpreters
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Takashi Okamoto <tora@debian.org>, Arnaud Vandyck <avdyk@debian.org>
-Build-Depends-Indep: debhelper (>> 4.0.0), cdbs, jikes, j2sdk1.3 | j2sdk1.4
+Uploaders: Takashi Okamoto <tora@debian.org>, Arnaud Vandyck <avdyk@debian.org>, Wolfgang Baer <WBaer@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
 
 Package: rhino
 Architecture: all
-Depends: java-common
+Depends: java-common, kaffe | java1-runtime | java2-runtime
 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 
--- /cvsroot/pkg-java/rhino/debian/rules	2004/11/21 15:03:44	1.1.1.1
+++ /cvsroot/pkg-java/rhino/debian/rules	2005/04/15 09:59:38	1.2
@@ -5,21 +5,13 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-export JITC_PROCESSOR_TYPE=6
-
-JAVA_HOME_DIRS := /usr/local/IBMJava2-ppc-142 /usr/lib/j2se/1.4
+JAVA_HOME := /usr/lib/kaffe
 ANT_HOME := /usr/share/ant1.6
 
-# Additional JARs to add to the class path, either full path or just the
-# basename for JARs in /usr/share/java. The ".jar" suffix may also be ommitted
 DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar
-
-# Build compiler
-DEB_ANT_COMPILER := modern
-
-# Ant targets to call
+DEB_ANT_COMPILER := jikes
 DEB_ANT_CLEAN_TARGET := clean
-DEB_ANT_BUILD_TARGET := jar javadoc
+DEB_ANT_BUILD_TARGET := jar javadoc 
 
 PNAME=js
 JARFILE=build/rhino1_5R5/${PNAME}.jar
@@ -32,4 +24,5 @@
 	rm -f build/rhino1_5R5/docs/apidocs/package-list
 	install -m 644 ${JARFILE} $(CURDIR)/debian/rhino/usr/share/java/${PNAME}-${VERSION}.jar
 	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