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

Fri Oct 2 21:09:02 UTC 2009

Author: drazzib
Date: 2009-10-02 21:09:02 +0000 (Fri, 02 Oct 2009)
New Revision: 10746

Removed:
   trunk/rhino/debian/rhino-doc.dirs
Modified:
   trunk/rhino/debian/changelog
   trunk/rhino/debian/control
   trunk/rhino/debian/copyright
   trunk/rhino/debian/rhino-debugger.1
   trunk/rhino/debian/rhino-doc.doc-base
   trunk/rhino/debian/rules
Log:
* Bump Standards-Version to 3.8.3:
  because we don't build a native GCJ package
* Move api documentation to /usr/share/doc/rhino/api/
* debian/control: Improve rhino-doc package long description
* debian/copyright: Add missing BSD licence (3 clauses) for files under
  toolsrc/org/mozilla/javascript/tools/debugger/treetable
* Update my email address

Modified: trunk/rhino/debian/changelog
===================================================================

--- trunk/rhino/debian/changelog	2009-10-02 20:54:28 UTC (rev 10745)
+++ trunk/rhino/debian/changelog	2009-10-02 21:09:02 UTC (rev 10746)
@@ -1,16 +1,21 @@
-rhino (1.7R2-2) UNRELEASED; urgency=low
+rhino (1.7R2-2) unstable; urgency=low
 
   * Switch to Quilt patch system:
     - Refresh all patches
     - Add B-D on quilt
     - Include patchsys-quilt.mk in debian/rules
-  * Bump Standards-Version to 3.8.2:
+  * Bump Standards-Version to 3.8.3:
     - Add a README.source to describe patch system
   * Add a manpage for rhino-debugger script
   * Build-Depends on default-jdk instead of default-jdk-builddep
-    because we don't build a native GCJ package.
+    because we don't build a native GCJ package
+  * Move api documentation to /usr/share/doc/rhino/api/
+  * debian/control: Improve rhino-doc package long description
+  * debian/copyright: Add missing BSD licence (3 clauses) for files under
+    toolsrc/org/mozilla/javascript/tools/debugger/treetable
+  * Update my email address
 
- -- Damien Raude-Morvan <drazzib at drazzib.com>  Fri, 17 Jul 2009 15:52:12 +0200
+ -- Damien Raude-Morvan <drazzib at debian.org>  Fri, 02 Oct 2009 22:23:46 +0200
 
 rhino (1.7R2-1) unstable; urgency=low
 

Modified: trunk/rhino/debian/control
===================================================================
--- trunk/rhino/debian/control	2009-10-02 20:54:28 UTC (rev 10745)
+++ trunk/rhino/debian/control	2009-10-02 21:09:02 UTC (rev 10746)
@@ -3,9 +3,9 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>, Paul Cager <paul-debian at home.paulcager.org>,
-  Marcus Better <marcus at better.se>, Michael Koch <konqueror at gmx.de>, Damien Raude-Morvan <drazzib at drazzib.com>
+  Marcus Better <marcus at better.se>, Michael Koch <konqueror at gmx.de>, Damien Raude-Morvan <drazzib at debian.org>
 Build-Depends: debhelper (>= 5), cdbs, ant, default-jdk, quilt
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 Homepage: http://www.mozilla.org/rhino/
 Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/rhino/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/rhino/
@@ -25,5 +25,9 @@
 Depends: ${misc:Depends}
 Suggests: rhino
 Description: Documentation 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 is the documentation, including API JavaDoc, for the Rhino
  JavaScript engine.

Modified: trunk/rhino/debian/copyright
===================================================================
--- trunk/rhino/debian/copyright	2009-10-02 20:54:28 UTC (rev 10745)
+++ trunk/rhino/debian/copyright	2009-10-02 21:09:02 UTC (rev 10746)
@@ -13,7 +13,7 @@
 later.
 
 On Debian GNU systems, the complete text of the GNU General Public
-License can be found in `/usr/share/common-licenses/GPL'.
+License 2.0 can be found in `/usr/share/common-licenses/GPL'.
 
                           MOZILLA PUBLIC LICENSE
                                 Version 1.1
@@ -484,3 +484,40 @@
      use the text of this Exhibit A rather than the text found in the
      Original Code Source Code for Your Modifications.]
 
+
+
+Additionally, some files (currently the contents of
+toolsrc/org/mozilla/javascript/tools/debugger/treetable/) are available
+only under the following license:
+
+============================================================================
+ * Copyright 1997, 1998 Sun Microsystems, Inc.  All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   - Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   - Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *
+ *   - Neither the name of Sun Microsystems nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+============================================================================
+

Modified: trunk/rhino/debian/rhino-debugger.1
===================================================================
--- trunk/rhino/debian/rhino-debugger.1	2009-10-02 20:54:28 UTC (rev 10745)
+++ trunk/rhino/debian/rhino-debugger.1	2009-10-02 21:09:02 UTC (rev 10746)
@@ -56,5 +56,5 @@
 The online documentation under http://www.mozilla.org/rhino/debugger.html
 
 .SH AUTHOR
-This manual page was written by Damien Raude-Morvan <drazzib at drazzib.com>,
+This manual page was written by Damien Raude-Morvan <drazzib at debian.org>,
 for the Debian project (but may be used by others).

Deleted: trunk/rhino/debian/rhino-doc.dirs
===================================================================
--- trunk/rhino/debian/rhino-doc.dirs	2009-10-02 20:54:28 UTC (rev 10745)
+++ trunk/rhino/debian/rhino-doc.dirs	2009-10-02 21:09:02 UTC (rev 10746)
@@ -1 +0,0 @@
-usr/share/doc/rhino-doc

Modified: trunk/rhino/debian/rhino-doc.doc-base
===================================================================
--- trunk/rhino/debian/rhino-doc.doc-base	2009-10-02 20:54:28 UTC (rev 10745)
+++ trunk/rhino/debian/rhino-doc.doc-base	2009-10-02 21:09:02 UTC (rev 10746)
@@ -6,5 +6,5 @@
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/rhino-doc/apidocs/index.html
-Files: /usr/share/doc/rhino-doc/apidocs/*.html
+Index: /usr/share/doc/rhino/api/index.html
+Files: /usr/share/doc/rhino/api/*.html

Modified: trunk/rhino/debian/rules
===================================================================
--- trunk/rhino/debian/rules	2009-10-02 20:54:28 UTC (rev 10745)
+++ trunk/rhino/debian/rules	2009-10-02 21:09:02 UTC (rev 10746)
@@ -35,7 +35,8 @@
 	dh_link -prhino usr/share/java/js-$(UVERSION).jar usr/share/java/js.jar
 
 install/rhino-doc::
-	mv $(BUILDDIR)/javadoc debian/rhino-doc/usr/share/doc/rhino-doc/apidocs
+	mv $(BUILDDIR)/javadoc $(BUILDDIR)/api
+	dh_install -prhino-doc $(BUILDDIR)/api /usr/share/doc/rhino/
 
 get-orig-source:
 	uscan --force-download --repack


