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

[Matthias Klose]

Author: doko
Date: 2007-02-03 16:50:59 +0100 (Sat, 03 Feb 2007)
New Revision: 2974

Modified:
   trunk/rhino/debian/changelog
   trunk/rhino/debian/rhino-doc.docs
   trunk/rhino/debian/rhino.links
   trunk/rhino/debian/rules
   trunk/rhino/debian/watch
Log:
  * New upstream maintenance release.


Modified: trunk/rhino/debian/changelog
===================================================================
--- trunk/rhino/debian/changelog	2007-02-02 23:04:10 UTC (rev 2973)
+++ trunk/rhino/debian/changelog	2007-02-03 15:50:59 UTC (rev 2974)
@@ -1,3 +1,9 @@
+rhino (1.6.R5-1) unstable; urgency=low
+
+  * New upstream maintenance release.
+
+ -- Matthias Klose <doko at debian.org>  Sat,  3 Feb 2007 16:46:28 +0100
+
 rhino (1.6R2-3) unstable; urgency=low
 
   * debian/patches/02-dont_build-toolsrc.patch: added. Don't build toolsrc

Modified: trunk/rhino/debian/rhino-doc.docs
===================================================================
--- trunk/rhino/debian/rhino-doc.docs	2007-02-02 23:04:10 UTC (rev 2973)
+++ trunk/rhino/debian/rhino-doc.docs	2007-02-03 15:50:59 UTC (rev 2974)
@@ -1 +1 @@
-build/rhino1_6R2/docs/*
+build/rhino1_6R5/docs/*

Modified: trunk/rhino/debian/rhino.links
===================================================================
--- trunk/rhino/debian/rhino.links	2007-02-02 23:04:10 UTC (rev 2973)
+++ trunk/rhino/debian/rhino.links	2007-02-03 15:50:59 UTC (rev 2974)
@@ -1 +1 @@
-/usr/share/java/js-1.6R2.jar  /usr/share/java/js.jar 
+/usr/share/java/js-1.6R5.jar  /usr/share/java/js.jar 

Modified: trunk/rhino/debian/rules
===================================================================
--- trunk/rhino/debian/rules	2007-02-02 23:04:10 UTC (rev 2973)
+++ trunk/rhino/debian/rules	2007-02-03 15:50:59 UTC (rev 2974)
@@ -12,20 +12,27 @@
 DEB_ANT_BUILD_TARGET := jar javadoc 
 
 PNAME=js
-JARFILE=build/rhino1_6R2/${PNAME}.jar
-VERSION=1.6R2
+JARFILE=build/rhino1_6R5/${PNAME}.jar
+VERSION=1.6R5
 
 clean::
-	-rm -fr build
+	rm -rf build
 
 install/rhino::
-	rm -f build/rhino1_6R2/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
+	rm -f build/rhino1*/docs/apidocs/package-list
+	install -m 644 ${JARFILE} debian/rhino/usr/share/java/${PNAME}-${VERSION}.jar
+	install -m 744 debian/rhino.sh debian/rhino/usr/bin/rhino
+	install -m 744 debian/rhino-jsc.sh debian/rhino/usr/bin/rhino-jsc
 	dh_movefiles --sourcedir=debian/rhino
 
-install/rhino-doc::
+install/rhino-doc:: install/rhino
 	# 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
+	install -d debian/rhino-doc/usr/share/lintian/overrides/
+	install -m 644 debian/rhino-doc.lintian \
+		debian/rhino-doc/usr/share/lintian/overrides/rhino-doc
+
+binary/rhino-doc::
+	mkdir -p debian/rhino-doc/usr/share/doc/rhino
+	mv debian/rhino-doc/usr/share/doc/rhino-doc/apidocs \
+		debian/rhino-doc/usr/share/doc/rhino/api
+	ln -s ../rhino/api debian/rhino-doc/usr/share/doc/rhino-doc/api

Modified: trunk/rhino/debian/watch
===================================================================
--- trunk/rhino/debian/watch	2007-02-02 23:04:10 UTC (rev 2973)
+++ trunk/rhino/debian/watch	2007-02-03 15:50:59 UTC (rev 2974)
@@ -1,2 +1,3 @@
 version=3
-ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino(.*)_(.*)\.zip debian uupdate
+opts=dversionmangle=s/\.R/R/ \
+  ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino(.*)_(.*)\.zip debian uupdate