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

Damien Raude-Morvan drazzib at alioth.debian.org
Sat Mar 12 01:09:43 UTC 2011 

Author: drazzib
Date: 2011-03-12 01:09:41 +0000 (Sat, 12 Mar 2011)
New Revision: 13409

Added:
   trunk/rhino/debian/librhino-java-doc.doc-base
   trunk/rhino/debian/librhino-java-doc.examples
Removed:
   trunk/rhino/debian/rhino-doc.doc-base
   trunk/rhino/debian/rhino-doc.examples
   trunk/rhino/debian/rhino.poms
Modified:
   trunk/rhino/debian/changelog
   trunk/rhino/debian/control
   trunk/rhino/debian/rhino-debugger.1
   trunk/rhino/debian/rhino-jsc.1
   trunk/rhino/debian/rules
Log:
  Thanks to Chris Lamb and Chris West for bugreport and patch
  (Closes: #609965).
* Update rhino packaging to follow latest Debian Java Policy:
  - move javadoc to a librhino-java-doc package.
  - make rhino-doc package an empty transitional package.
  - move jar/pom to a librhino-java package (which doesn't depends
    on any java runtime).
  - keep rhino interpreter in his own rhino package with a depends
    on java5-runtime.

Modified: trunk/rhino/debian/changelog
===================================================================
--- trunk/rhino/debian/changelog	2011-03-12 01:07:06 UTC (rev 13408)
+++ trunk/rhino/debian/changelog	2011-03-12 01:09:41 UTC (rev 13409)
@@ -1,9 +1,17 @@
-rhino (1.7R3~pre-2) UNRELEASED; urgency=low
+rhino (1.7R3~pre-2) experimental; urgency=low
 
   * Fix parsing of command line arguments by using quotes.
-    Thanks to Chris Lamb and Chris West for bugreport and patch.
+    Thanks to Chris Lamb and Chris West for bugreport and patch
+    (Closes: #609965).
+  * Update rhino packaging to follow latest Debian Java Policy:
+    - move javadoc to a librhino-java-doc package.
+    - make rhino-doc package an empty transitional package.
+    - move jar/pom to a librhino-java package (which doesn't depends
+      on any java runtime).
+    - keep rhino interpreter in his own rhino package with a depends
+      on java5-runtime.
 
- -- Damien Raude-Morvan <drazzib at debian.org>  Sun, 06 Mar 2011 01:39:45 +0100
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 12 Mar 2011 02:08:43 +0100
 
 rhino (1.7R3~pre-1) experimental; urgency=low
 

Modified: trunk/rhino/debian/control
===================================================================
--- trunk/rhino/debian/control	2011-03-12 01:07:06 UTC (rev 13408)
+++ trunk/rhino/debian/control	2011-03-12 01:09:41 UTC (rev 13409)
@@ -12,16 +12,45 @@
 
 Package: rhino
 Architecture: all
-Depends: ${misc:Depends}, default-jre-headless (>= 1.5) | java5-runtime-headless, libjline-java
-Suggests: rhino-doc
+Depends: ${misc:Depends}, default-jre-headless (>= 1.5) | java5-runtime-headless, libjline-java,
+ librhino-java (= ${source:Version})
+Suggests: librhino-java-doc
 Description: JavaScript engine written in Java
  Rhino is an implementation of the JavaScript language written
  entirely in Java. It is typically embedded into Java applications to
  provide scripting to end users.
 
+Package: librhino-java
+Section: java
+Architecture: all
+Replaces: rhino (<< 1.7R3~pre-2)
+Conflicts: rhino (<< 1.7R3~pre-2)
+Depends: ${misc:Depends}
+Suggests: rhino
+Description: Libraries for rhino Java Script Engine
+ Rhino is an implementation of the JavaScript language written
+ entirely in Java. It is typically embedded into Java applications to
+ provide scripting to end users.
+ .
+ This package contains only Java library and no interpreter. For
+ Rhino interpreter, you install rhino package.
+
 Package: rhino-doc
+Depends: librhino-java-doc, ${misc:Depends}
+Architecture: all
+Section: oldlibs
+Description: transitional dummy package for new librhino-java-doc
+ Rhino is an implementation of the JavaScript language written
+ entirely in Java. It is typically embedded into Java applications to
+ provide scripting to end users.
+ .
+ This is a dummy package for transition to new librhino-java-doc.
+
+Package: librhino-java-doc
 Section: doc
 Architecture: all
+Replaces: rhino-doc (<< 1.7R3~pre-2)
+Conflicts: rhino-doc (<< 1.7R3~pre-2)
 Depends: ${misc:Depends}
 Suggests: rhino
 Description: Documentation for rhino Java Script Engine

Copied: trunk/rhino/debian/librhino-java-doc.doc-base (from rev 13406, trunk/rhino/debian/rhino-doc.doc-base)
===================================================================
--- trunk/rhino/debian/librhino-java-doc.doc-base	                        (rev 0)
+++ trunk/rhino/debian/librhino-java-doc.doc-base	2011-03-12 01:09:41 UTC (rev 13409)
@@ -0,0 +1,10 @@
+Document: rhino-doc1
+Title: API JavaDoc for Rhino
+Author: The Mozilla Rhino Developers
+Abstract: This is the API JavaDoc of Rhino, a JavaScript 
+ engine written in Java.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/rhino/api/index.html
+Files: /usr/share/doc/rhino/api/*.html

Copied: trunk/rhino/debian/librhino-java-doc.examples (from rev 13406, trunk/rhino/debian/rhino-doc.examples)
===================================================================
--- trunk/rhino/debian/librhino-java-doc.examples	                        (rev 0)
+++ trunk/rhino/debian/librhino-java-doc.examples	2011-03-12 01:09:41 UTC (rev 13409)
@@ -0,0 +1 @@
+examples/*

Modified: trunk/rhino/debian/rhino-debugger.1
===================================================================
--- trunk/rhino/debian/rhino-debugger.1	2011-03-12 01:07:06 UTC (rev 13408)
+++ trunk/rhino/debian/rhino-debugger.1	2011-03-12 01:09:41 UTC (rev 13409)
@@ -48,7 +48,7 @@
 
 .SH EXAMPLE
 
-Example debugging the NervousText.js applet written in JavaScript. The example is provided in the rhino-doc package.
+Example debugging the NervousText.js applet written in JavaScript. The example is provided in the librhino-java-doc package.
 
 $ rhino-debugger NervousText.js 
 

Deleted: trunk/rhino/debian/rhino-doc.doc-base
===================================================================
--- trunk/rhino/debian/rhino-doc.doc-base	2011-03-12 01:07:06 UTC (rev 13408)
+++ trunk/rhino/debian/rhino-doc.doc-base	2011-03-12 01:09:41 UTC (rev 13409)
@@ -1,10 +0,0 @@
-Document: rhino-doc1
-Title: API JavaDoc for Rhino
-Author: The Mozilla Rhino Developers
-Abstract: This is the API JavaDoc of Rhino, a JavaScript 
- engine written in Java.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/rhino/api/index.html
-Files: /usr/share/doc/rhino/api/*.html

Deleted: trunk/rhino/debian/rhino-doc.examples
===================================================================
--- trunk/rhino/debian/rhino-doc.examples	2011-03-12 01:07:06 UTC (rev 13408)
+++ trunk/rhino/debian/rhino-doc.examples	2011-03-12 01:09:41 UTC (rev 13409)
@@ -1 +0,0 @@
-examples/*

Modified: trunk/rhino/debian/rhino-jsc.1
===================================================================
--- trunk/rhino/debian/rhino-jsc.1	2011-03-12 01:07:06 UTC (rev 13408)
+++ trunk/rhino/debian/rhino-jsc.1	2011-03-12 01:09:41 UTC (rev 13409)
@@ -55,7 +55,7 @@
 
 .SH EXAMPLE
 
-Example compiling the NervousText.js applet written in JavaScript. The example is provided in the rhino-doc package.
+Example compiling the NervousText.js applet written in JavaScript. The example is provided in the librhino-java-doc package.
 
 $ rhino-jsc \-extends java.applet.Applet \-implements java.lang.Runnable NervousText.js 
 

Deleted: trunk/rhino/debian/rhino.poms
===================================================================
--- trunk/rhino/debian/rhino.poms	2011-03-12 01:07:06 UTC (rev 13408)
+++ trunk/rhino/debian/rhino.poms	2011-03-12 01:09:41 UTC (rev 13409)
@@ -1 +0,0 @@
-debian/pom.xml

Modified: trunk/rhino/debian/rules
===================================================================
--- trunk/rhino/debian/rules	2011-03-12 01:07:06 UTC (rev 13408)
+++ trunk/rhino/debian/rules	2011-03-12 01:09:41 UTC (rev 13409)
@@ -32,13 +32,13 @@
 	cp debian/src_from_treetable_article_see_bug409629/TreeTableModel.java toolsrc/org/mozilla/javascript/tools/debugger/downloaded/
 	cp debian/src_from_treetable_article_see_bug409629/TreeTableModelAdapter.java toolsrc/org/mozilla/javascript/tools/debugger/downloaded/
 
-install/rhino::
-	mh_installpoms -prhino -e$(UVERSION)
-	mh_installjar -prhino -e$(UVERSION) -l debian/pom.xml $(BUILDDIR)/js.jar
+install/librhino-java::
+	mh_installpom -plibrhino-java -e$(UVERSION) debian/pom.xml
+	mh_installjar -plibrhino-java -e$(UVERSION) -l debian/pom.xml $(BUILDDIR)/js.jar
 
-install/rhino-doc::
+install/librhino-java-doc::
 	mv $(BUILDDIR)/javadoc $(BUILDDIR)/api
-	dh_install -prhino-doc $(BUILDDIR)/api /usr/share/doc/rhino/
+	dh_install -plibrhino-java-doc $(BUILDDIR)/api /usr/share/doc/rhino/
 
 get-orig-source:
 	uscan --force-download --repack

More information about the pkg-java-commits mailing list