[pkg-java] r4349 - in trunk/rhino/debian: . bin
marcusb-guest at alioth.debian.org
marcusb-guest at alioth.debian.org
Fri Oct 12 07:43:16 UTC 2007
Author: marcusb-guest
Date: 2007-10-12 07:43:16 +0000 (Fri, 12 Oct 2007)
New Revision: 4349
Added:
trunk/rhino/debian/ant.properties
trunk/rhino/debian/bin/
trunk/rhino/debian/bin/rhino-jsc.sh
trunk/rhino/debian/bin/rhino.sh
trunk/rhino/debian/rhino-doc.dirs
trunk/rhino/debian/rhino.install
Removed:
trunk/rhino/debian/README.Debian
trunk/rhino/debian/dirs
trunk/rhino/debian/patches/
trunk/rhino/debian/rhino-doc.doc-base.2
trunk/rhino/debian/rhino-doc.docs
trunk/rhino/debian/rhino-jsc.sh
trunk/rhino/debian/rhino.sh
Modified:
trunk/rhino/debian/changelog
trunk/rhino/debian/compat
trunk/rhino/debian/control
trunk/rhino/debian/copyright
trunk/rhino/debian/rhino-doc.doc-base.1
trunk/rhino/debian/rhino.links
trunk/rhino/debian/rules
Log:
New upstream version.
Deleted: trunk/rhino/debian/README.Debian
===================================================================
--- trunk/rhino/debian/README.Debian 2007-10-12 05:18:55 UTC (rev 4348)
+++ trunk/rhino/debian/README.Debian 2007-10-12 07:43:16 UTC (rev 4349)
@@ -1,10 +0,0 @@
-rhino for Debian
-----------------
-
- The Debian rhino package doesn't support xml implementation, as
- the xmlbeans Jar is not available in Debian.
-
- This package provide /usr/bin/rhino which is wrapper for excuting rhino.
-
- -- Takashi Okamoto <tora at debian.org>, Fri, 16 Nov 2001 23:51:38 +0900
- -- Paul Cager <paul-debian at home.paulcager.org> Sun, 15 Jul 2007 00:32:12 +0100
Added: trunk/rhino/debian/ant.properties
===================================================================
--- trunk/rhino/debian/ant.properties (rev 0)
+++ trunk/rhino/debian/ant.properties 2007-10-12 07:43:16 UTC (rev 4349)
@@ -0,0 +1 @@
+without-xmlimpl=true
Copied: trunk/rhino/debian/bin/rhino-jsc.sh (from rev 4345, trunk/rhino/debian/rhino-jsc.sh)
===================================================================
--- trunk/rhino/debian/bin/rhino-jsc.sh (rev 0)
+++ trunk/rhino/debian/bin/rhino-jsc.sh 2007-10-12 07:43:16 UTC (rev 4349)
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+/usr/bin/java -cp .:/usr/share/java/js.jar org.mozilla.javascript.tools.jsc.Main $@
+
Copied: trunk/rhino/debian/bin/rhino.sh (from rev 4345, trunk/rhino/debian/rhino.sh)
===================================================================
--- trunk/rhino/debian/bin/rhino.sh (rev 0)
+++ trunk/rhino/debian/bin/rhino.sh 2007-10-12 07:43:16 UTC (rev 4349)
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+/usr/bin/java -jar /usr/share/java/js.jar $@
+
Modified: trunk/rhino/debian/changelog
===================================================================
--- trunk/rhino/debian/changelog 2007-10-12 05:18:55 UTC (rev 4348)
+++ trunk/rhino/debian/changelog 2007-10-12 07:43:16 UTC (rev 4349)
@@ -1,3 +1,9 @@
+rhino (1.6.R7-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Marcus Better <marcus at better.se> Thu, 11 Oct 2007 15:50:42 +0200
+
rhino (1.6.R5-3) unstable; urgency=low
* Removed Wolfgang Baer from Uploaders and added myself.
@@ -114,7 +120,3 @@
* Initial Release.
-- Takashi Okamoto <tora at debian.org> Fri, 16 Nov 2001 23:51:38 +0900
-
-Local variables:
-mode: debian-changelog
-End:
Modified: trunk/rhino/debian/compat
===================================================================
--- trunk/rhino/debian/compat 2007-10-12 05:18:55 UTC (rev 4348)
+++ trunk/rhino/debian/compat 2007-10-12 07:43:16 UTC (rev 4349)
@@ -1 +1 @@
-4
+5
Modified: trunk/rhino/debian/control
===================================================================
--- trunk/rhino/debian/control 2007-10-12 05:18:55 UTC (rev 4348)
+++ trunk/rhino/debian/control 2007-10-12 07:43:16 UTC (rev 4349)
@@ -2,10 +2,13 @@
Section: interpreters
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>
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Paul Cager <paul-debian at home.paulcager.org>, Marcus Better <marcus at better.se>
Build-Depends: debhelper (>= 4.2.30), cdbs
Build-Depends-Indep: ant, java-gcj-compat-dev
Standards-Version: 3.7.2
+XS-Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/rhino
+XS-Vcs-Browse: http://svn.debian.org/wsvn/pkg-java/trunk/rhino/
+XSB-Homepage: http://www.mozilla.org/rhino/
Package: rhino
Architecture: all
Modified: trunk/rhino/debian/copyright
===================================================================
--- trunk/rhino/debian/copyright 2007-10-12 05:18:55 UTC (rev 4348)
+++ trunk/rhino/debian/copyright 2007-10-12 07:43:16 UTC (rev 4349)
@@ -1,107 +1,20 @@
This package was debianized by Takashi Okamoto <tora at debian.org> on
Fri, 16 Nov 2001 23:51:38 +0900.
-It was downloaded from ftp://ftp.mozilla.org/pub/mozilla.org/js/.
+It is currently maintained by the Debian Java Maintainers
+<pkg-java-maintainers at lists.alioth.debian.org>.
-Copyright:
- AMENDMENTS
+It was downloaded from <http://www.mozilla.org/rhino/>.
- The Netscape Public License Version 1.1 ("NPL") consists of the
- Mozilla Public License Version 1.1 with the following Amendments,
- including Exhibit A-Netscape Public License. Files identified with
- "Exhibit A-Netscape Public License" are governed by the Netscape
- Public License Version 1.1.
+Copyright (C) 2007 Marcus Better <marcus at better.se> (Debian packaging)
- Additional Terms applicable to the Netscape Public License.
- I. Effect.
- These additional terms described in this Netscape Public
- License -- Amendments shall apply to the Mozilla Communicator
- client code and to all Covered Code under this License.
+This software licensed under the Mozilla Public License version 1.1
+or, at your option, under the GNU General Public License version 2 or
+later.
- II. "Netscape's Branded Code" means Covered Code that Netscape
- distributes and/or permits others to distribute under one or more
- trademark(s) which are controlled by Netscape but which are not
- licensed for use under this License.
+On Debian GNU systems, the complete text of the GNU General Public
+License can be found in `/usr/share/common-licenses/GPL'.
- III. Netscape and logo.
- This License does not grant any rights to use the trademarks
- "Netscape", the "Netscape N and horizon" logo or the "Netscape
- lighthouse" logo, "Netcenter", "Gecko", "Java" or "JavaScript",
- "Smart Browsing" even if such marks are included in the Original
- Code or Modifications.
-
- IV. Inability to Comply Due to Contractual Obligation.
- Prior to licensing the Original Code under this License, Netscape
- has licensed third party code for use in Netscape's Branded Code.
- To the extent that Netscape is limited contractually from making
- such third party code available under this License, Netscape may
- choose to reintegrate such code into Covered Code without being
- required to distribute such code in Source Code form, even if
- such code would otherwise be considered "Modifications" under
- this License.
-
- V. Use of Modifications and Covered Code by Initial Developer.
- V.1. In General.
- The obligations of Section 3 apply to Netscape, except to
- the extent specified in this Amendment, Section V.2 and V.3.
-
- V.2. Other Products.
- Netscape may include Covered Code in products other than the
- Netscape's Branded Code which are released by Netscape
- during the two (2) years following the release date of the
- Original Code, without such additional products becoming
- subject to the terms of this License, and may license such
- additional products on different terms from those contained
- in this License.
-
- V.3. Alternative Licensing.
- Netscape may license the Source Code of Netscape's Branded
- Code, including Modifications incorporated therein, without
- such Netscape Branded Code becoming subject to the terms of
- this License, and may license such Netscape Branded Code on
- different terms from those contained in this License.
-
- VI. Litigation.
- Notwithstanding the limitations of Section 11 above, the
- provisions regarding litigation in Section 11(a), (b) and (c) of
- the License shall apply to all disputes relating to this License.
-
- EXHIBIT A-Netscape Public License.
-
- "The contents of this file are subject to the Netscape Public
- License Version 1.1 (the "License"); you may not use this file
- except in compliance with the License. You may obtain a copy of
- the License at http://www.mozilla.org/NPL/
-
- Software distributed under the License is distributed on an "AS
- IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- implied. See the License for the specific language governing
- rights and limitations under the License.
-
- The Original Code is Mozilla Communicator client code, released
- March 31, 1998.
-
- The Initial Developer of the Original Code is Netscape
- Communications Corporation. Portions created by Netscape are
- Copyright (C) 1998-1999 Netscape Communications Corporation. All
- Rights Reserved.
-
- Contributor(s): ______________________________________.
-
- Alternatively, the contents of this file may be used under the
- terms of the _____ license (the "[___] License"), in which case
- the provisions of [______] License are applicable instead of
- those above. If you wish to allow use of your version of this
- file only under the terms of the [____] License and not to allow
- others to use your version of this file under the NPL, indicate
- your decision by deleting the provisions above and replace them
- with the notice and other provisions required by the [___]
- License. If you do not delete the provisions above, a recipient
- may use your version of this file under either the NPL or the
- [___] License."
-
- ----------------------------------------------------------------------
-
MOZILLA PUBLIC LICENSE
Version 1.1
@@ -438,8 +351,7 @@
(a) such Participant's Contributor Version directly or indirectly
infringes any patent, then any and all rights granted by such
Participant to You under Sections 2.1 and/or 2.2 of this License
- shall, upon 60 days notice from Participant terminate prospectively,
- unless if within 60 days after receipt of notice You either: (i)
+ shall, upon 60 days notice from Particiunless if within 60 days after receipt of notice You either: (i)
agree in writing to pay Participant a mutually agreeable reasonable
royalty for Your past and future use of Modifications made by such
Participant, or (ii) withdraw Your litigation claim with respect to
Deleted: trunk/rhino/debian/dirs
===================================================================
--- trunk/rhino/debian/dirs 2007-10-12 05:18:55 UTC (rev 4348)
+++ trunk/rhino/debian/dirs 2007-10-12 07:43:16 UTC (rev 4349)
@@ -1,2 +0,0 @@
-usr/bin
-usr/share/java
Added: trunk/rhino/debian/rhino-doc.dirs
===================================================================
--- trunk/rhino/debian/rhino-doc.dirs (rev 0)
+++ trunk/rhino/debian/rhino-doc.dirs 2007-10-12 07:43:16 UTC (rev 4349)
@@ -0,0 +1 @@
+usr/share/doc/rhino-doc
Modified: trunk/rhino/debian/rhino-doc.doc-base.1
===================================================================
--- trunk/rhino/debian/rhino-doc.doc-base.1 2007-10-12 05:18:55 UTC (rev 4348)
+++ trunk/rhino/debian/rhino-doc.doc-base.1 2007-10-12 07:43:16 UTC (rev 4349)
@@ -1,7 +1,7 @@
Document: rhino-doc1
-Title: Programmer API for rhino
+Title: API JavaDoc for Rhino
Author: The Mozilla Rhino Developers
-Abstract: This is the programmer API of Rhino, a JavaScript
+Abstract: This is the API JavaDoc of Rhino, a JavaScript
engine written in Java.
Section: Programming
Deleted: trunk/rhino/debian/rhino-doc.doc-base.2
===================================================================
--- trunk/rhino/debian/rhino-doc.doc-base.2 2007-10-12 05:18:55 UTC (rev 4348)
+++ trunk/rhino/debian/rhino-doc.doc-base.2 2007-10-12 07:43:16 UTC (rev 4349)
@@ -1,10 +0,0 @@
-Document: rhino-doc2
-Title: Manual for rhino
-Author: The Mozilla Rhino Developers
-Abstract: This is the manual of Rhino, a JavaScript
- engine written in Java.
-Section: Apps/Programming
-
-Format: HTML
-Index: /usr/share/doc/rhino-doc/index.html
-Files: /usr/share/doc/rhino-doc/*.html
Deleted: trunk/rhino/debian/rhino-doc.docs
===================================================================
--- trunk/rhino/debian/rhino-doc.docs 2007-10-12 05:18:55 UTC (rev 4348)
+++ trunk/rhino/debian/rhino-doc.docs 2007-10-12 07:43:16 UTC (rev 4349)
@@ -1 +0,0 @@
-build/rhino1_6R5/docs/*
Deleted: trunk/rhino/debian/rhino-jsc.sh
===================================================================
--- trunk/rhino/debian/rhino-jsc.sh 2007-10-12 05:18:55 UTC (rev 4348)
+++ trunk/rhino/debian/rhino-jsc.sh 2007-10-12 07:43:16 UTC (rev 4349)
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-/usr/bin/java -cp .:/usr/share/java/js.jar org.mozilla.javascript.tools.jsc.Main $@
-
Added: trunk/rhino/debian/rhino.install
===================================================================
--- trunk/rhino/debian/rhino.install (rev 0)
+++ trunk/rhino/debian/rhino.install 2007-10-12 07:43:16 UTC (rev 4349)
@@ -0,0 +1 @@
+debian/rhino*.sh usr/bin
Modified: trunk/rhino/debian/rhino.links
===================================================================
--- trunk/rhino/debian/rhino.links 2007-10-12 05:18:55 UTC (rev 4348)
+++ trunk/rhino/debian/rhino.links 2007-10-12 07:43:16 UTC (rev 4349)
@@ -1 +1 @@
-/usr/share/java/js-1.6R5.jar /usr/share/java/js.jar
+/usr/share/java/js-1.6.R7.jar /usr/share/java/js.jar
Deleted: trunk/rhino/debian/rhino.sh
===================================================================
--- trunk/rhino/debian/rhino.sh 2007-10-12 05:18:55 UTC (rev 4348)
+++ trunk/rhino/debian/rhino.sh 2007-10-12 07:43:16 UTC (rev 4349)
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-/usr/bin/java -jar /usr/share/java/js.jar $@
-
Modified: trunk/rhino/debian/rules
===================================================================
--- trunk/rhino/debian/rules 2007-10-12 05:18:55 UTC (rev 4348)
+++ trunk/rhino/debian/rules 2007-10-12 07:43:16 UTC (rev 4349)
@@ -2,7 +2,6 @@
# debian/rules file for rhino (uses cdbs)
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/ant.mk
JAVA_HOME := /usr/lib/jvm/java-gcj
@@ -12,8 +11,9 @@
DEB_ANT_BUILD_TARGET := jar javadoc
PNAME=js
-JARFILE=build/rhino1_6R5/${PNAME}.jar
-VERSION=1.6R5
+BUILDDIR=build/rhino1_6R7
+JARFILE=${BUILDDIR}/${PNAME}.jar
+VERSION=1.6R7
clean::
rm -rf toolsrc/org/mozilla/javascript/tools/debugger/downloaded/*
@@ -29,21 +29,8 @@
mkdir -p toolsrc/org/mozilla/javascript/tools/debugger/downloaded
cp debian/src_from_treetable_article_see_bug409629/{AbstractCellEditor.java,JTreeTable.java,TreeTableModel.java,TreeTableModelAdapter.java} toolsrc/org/mozilla/javascript/tools/debugger/downloaded/
-install/rhino::
- rm -f build/rhino1*/docs/apidocs/package-list
+binary/rhino::
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
- # install lintian overrides
- 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
+ mv ${BUILDDIR}/javadoc debian/rhino-doc/usr/share/doc/rhino-doc/apidocs
More information about the pkg-java-commits
mailing list