[pkg-java] r8192 - in trunk/rhino/debian: . bin patches
Damien Raude-Morvan
drazzib-guest at alioth.debian.org
Mon Apr 13 01:26:18 UTC 2009
Author: drazzib-guest
Date: 2009-04-13 01:26:18 +0000 (Mon, 13 Apr 2009)
New Revision: 8192
Added:
trunk/rhino/debian/bin/rhino-debugger
trunk/rhino/debian/patches/01_rhino-nowarn.patch
trunk/rhino/debian/patches/02_exclude-jdk15.patch
Removed:
trunk/rhino/debian/patches/rhino-nowarn.patch
Modified:
trunk/rhino/debian/bin/rhino
trunk/rhino/debian/bin/rhino-jsc
trunk/rhino/debian/changelog
trunk/rhino/debian/control
trunk/rhino/debian/rhino.postinst
trunk/rhino/debian/rhino.prerm
trunk/rhino/debian/rules
Log:
[rhino]
* New upstream release.
- new 02_exclude-jdk15 patch to exclude already compiled classes
for jdk15 rebuild: gcj doesn't handle compiling classes already
on its classpath
- new "rhino-debugger" launcher for Rhino Debugger Swing UI
- update "rhino" launcher to exclude OpenJDK bundled rhino (Closes: #512498)
* debian/{postinst,prerm }: scripts should take care of errors,
add set -e before any instruction
* debian/rules: add new get-orig-source target using uscan
* debian/control:
- Build-Depends on specialized default-jdk-builddep instead of
default-jdk
- Bump Standards-Version to 3.8.1: Wrap Uploaders field
- add Depends on ${misc:Depends}
Modified: trunk/rhino/debian/bin/rhino
===================================================================
--- trunk/rhino/debian/bin/rhino 2009-04-13 01:23:13 UTC (rev 8191)
+++ trunk/rhino/debian/bin/rhino 2009-04-13 01:26:18 UTC (rev 8192)
@@ -1,4 +1,22 @@
#!/bin/sh
-/usr/bin/java -jar /usr/share/java/js.jar $@
+JAVA_CMD="/usr/bin/java"
+JAVA_OPTS=""
+JAVA_CLASSPATH="/usr/share/java/js.jar:/usr/share/java/jline.jar"
+JAVA_MAIN="org.mozilla.javascript.tools.shell.Main"
+## Fix for #512498
+## Change Bootclasspath when using OpenJDK because OpenJDK6
+## bundle his own release of Rhino.
+## References:
+## <https://bugs.launchpad.net/ubuntu/+source/openjdk-6/+bug/255149>
+## <http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=179>
+## <http://www.openoffice.org/issues/show_bug.cgi?id=91641>
+isOpenJDK=`$JAVA_CMD -version 2>&1 | grep -i "OpenJDK" | wc -l`
+if [ $isOpenJDK -gt 0 ]
+then
+ JAVA_OPTS="-Xbootclasspath:/usr/lib/jvm/java-6-openjdk/jre/lib/rt.jar"
+fi
+
+
+$JAVA_CMD $JAVA_OPTS -classpath $JAVA_CLASSPATH $JAVA_MAIN $@
Added: trunk/rhino/debian/bin/rhino-debugger
===================================================================
--- trunk/rhino/debian/bin/rhino-debugger (rev 0)
+++ trunk/rhino/debian/bin/rhino-debugger 2009-04-13 01:26:18 UTC (rev 8192)
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+JAVA_CMD="/usr/bin/java"
+JAVA_OPTS=""
+JAVA_CLASSPATH="/usr/share/java/js.jar"
+JAVA_MAIN="org.mozilla.javascript.tools.debugger.Main"
+
+$JAVA_CMD $JAVA_OPTS -classpath $JAVA_CLASSPATH $JAVA_MAIN $@
Modified: trunk/rhino/debian/bin/rhino-jsc
===================================================================
--- trunk/rhino/debian/bin/rhino-jsc 2009-04-13 01:23:13 UTC (rev 8191)
+++ trunk/rhino/debian/bin/rhino-jsc 2009-04-13 01:26:18 UTC (rev 8192)
@@ -1,4 +1,9 @@
#!/bin/sh
-/usr/bin/java -cp .:/usr/share/java/js.jar org.mozilla.javascript.tools.jsc.Main $@
+JAVA_CMD="/usr/bin/java"
+JAVA_OPTS=""
+JAVA_CLASSPATH="/usr/share/java/js.jar"
+JAVA_MAIN="org.mozilla.javascript.tools.jsc.Main"
+$JAVA_CMD $JAVA_OPTS -classpath $JAVA_CLASSPATH $JAVA_MAIN $@
+
Modified: trunk/rhino/debian/changelog
===================================================================
--- trunk/rhino/debian/changelog 2009-04-13 01:23:13 UTC (rev 8191)
+++ trunk/rhino/debian/changelog 2009-04-13 01:26:18 UTC (rev 8192)
@@ -1,16 +1,32 @@
-rhino (1.7R2~pre-3) UNRELEASED; urgency=low
+rhino (1.7R2-1) UNRELEASED; urgency=low
- [Marcus Better]
+ [ Marcus Better ]
* Updated package descriptions.
- [Matthias Klose]
+ [ Matthias Klose ]
* (Build-)depend on default-jre-headless/-jdk.
* Drop alternate dependencies on java2-runtime-headless and
java2-runtime-headless. The binary package is currently built to
require a java5 runtime.
- -- Matthias Klose <doko at ubuntu.com> Mon, 20 Oct 2008 13:38:48 +0200
+ [ Damien Raude-Morvan ]
+ * New upstream release.
+ - new 02_exclude-jdk15 patch to exclude already compiled classes
+ for jdk15 rebuild: gcj doesn't handle compiling classes already
+ on its classpath
+ - new "rhino-debugger" launcher for Rhino Debugger Swing UI
+ - update "rhino" launcher to exclude OpenJDK bundled rhino (Closes: #512498)
+ * debian/{postinst,prerm }: scripts should take care of errors,
+ add set -e before any instruction
+ * debian/rules: add new get-orig-source target using uscan
+ * debian/control:
+ - Build-Depends on specialized default-jdk-builddep instead of
+ default-jdk
+ - Bump Standards-Version to 3.8.1: Wrap Uploaders field
+ - add Depends on ${misc:Depends}
+ -- Damien Raude-Morvan <drazzib at drazzib.com> Mon, 13 Apr 2009 02:40:15 +0200
+
rhino (1.7R2~pre-2) experimental; urgency=low
* Really include the debugger. Closes: #474046.
Modified: trunk/rhino/debian/control
===================================================================
--- trunk/rhino/debian/control 2009-04-13 01:23:13 UTC (rev 8191)
+++ trunk/rhino/debian/control 2009-04-13 01:26:18 UTC (rev 8192)
@@ -2,16 +2,17 @@
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>, Marcus Better <marcus at better.se>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 5), cdbs, ant, default-jdk
-Standards-Version: 3.7.3
+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>
+Build-Depends: debhelper (>= 5), cdbs, ant, default-jdk-builddep
+Standards-Version: 3.8.1
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/
Package: rhino
Architecture: all
-Depends: default-jre-headless (>= 1.5) | java5-runtime-headless
+Depends: ${misc:Depends}, default-jre-headless (>= 1.5) | java5-runtime-headless, libjline-java
Suggests: rhino-doc
Description: JavaScript engine written in Java
Rhino is an implementation of the JavaScript language written
@@ -21,6 +22,7 @@
Package: rhino-doc
Section: doc
Architecture: all
+Depends: ${misc:Depends}
Suggests: rhino
Description: Documentation for rhino Java Script Engine
This is the documentation, including API JavaDoc, for the Rhino
Copied: trunk/rhino/debian/patches/01_rhino-nowarn.patch (from rev 8178, trunk/rhino/debian/patches/rhino-nowarn.patch)
===================================================================
--- trunk/rhino/debian/patches/01_rhino-nowarn.patch (rev 0)
+++ trunk/rhino/debian/patches/01_rhino-nowarn.patch 2009-04-13 01:26:18 UTC (rev 8192)
@@ -0,0 +1,19 @@
+diff -Nur rhino-1.7R1/src/build.xml rhino-1.7R1.new/src/build.xml
+--- rhino-1.7R1/src/build.xml 2008-03-22 13:56:31.000000000 +0100
++++ rhino-1.7R1.new/src/build.xml 2008-03-22 13:56:54.000000000 +0100
+@@ -57,6 +57,7 @@
+ debug="${debug}"
+ target="${target-jvm}"
+ source="${source-level}"
++ nowarn="true"
+ >
+ </javac>
+ <copy todir="${classes}">
+@@ -76,6 +77,7 @@
+ debug="${debug}"
+ target="${target-jvm}"
+ source="${source-level}"
++ nowarn="true"
+ >
+ </javac>
+ </target>
Added: trunk/rhino/debian/patches/02_exclude-jdk15.patch
===================================================================
--- trunk/rhino/debian/patches/02_exclude-jdk15.patch (rev 0)
+++ trunk/rhino/debian/patches/02_exclude-jdk15.patch 2009-04-13 01:26:18 UTC (rev 8192)
@@ -0,0 +1,10 @@
+--- src/build.xml.orig 2009-04-13 00:08:36.000000000 +0200
++++ src/build.xml 2009-04-13 00:09:00.000000000 +0200
+@@ -72,6 +72,7 @@
+ <target name="compile-jdk15" if="jdk15">
+ <javac srcdir="src"
+ destdir="${classes}"
++ excludes="org/**/*.java"
+ includes="org/**/jdk15/*.java"
+ deprecation="on"
+ debug="${debug}"
Deleted: trunk/rhino/debian/patches/rhino-nowarn.patch
===================================================================
--- trunk/rhino/debian/patches/rhino-nowarn.patch 2009-04-13 01:23:13 UTC (rev 8191)
+++ trunk/rhino/debian/patches/rhino-nowarn.patch 2009-04-13 01:26:18 UTC (rev 8192)
@@ -1,19 +0,0 @@
-diff -Nur rhino-1.7R1/src/build.xml rhino-1.7R1.new/src/build.xml
---- rhino-1.7R1/src/build.xml 2008-03-22 13:56:31.000000000 +0100
-+++ rhino-1.7R1.new/src/build.xml 2008-03-22 13:56:54.000000000 +0100
-@@ -57,6 +57,7 @@
- debug="${debug}"
- target="${target-jvm}"
- source="${source-level}"
-+ nowarn="true"
- >
- </javac>
- <copy todir="${classes}">
-@@ -76,6 +77,7 @@
- debug="${debug}"
- target="${target-jvm}"
- source="${source-level}"
-+ nowarn="true"
- >
- </javac>
- </target>
Modified: trunk/rhino/debian/rhino.postinst
===================================================================
--- trunk/rhino/debian/rhino.postinst 2009-04-13 01:23:13 UTC (rev 8191)
+++ trunk/rhino/debian/rhino.postinst 2009-04-13 01:26:18 UTC (rev 8192)
@@ -1,4 +1,5 @@
#!/bin/bash
+set -e
if [ "$1" = "configure" -o "$1" = "abort-upgrade" ]; then
update-alternatives --install /usr/bin/js js /usr/bin/rhino 100 \
Modified: trunk/rhino/debian/rhino.prerm
===================================================================
--- trunk/rhino/debian/rhino.prerm 2009-04-13 01:23:13 UTC (rev 8191)
+++ trunk/rhino/debian/rhino.prerm 2009-04-13 01:26:18 UTC (rev 8192)
@@ -1,4 +1,5 @@
#!/bin/sh
+set -e
if [ "$1" = "remove" ]; then
update-alternatives --remove js /usr/bin/rhino
Modified: trunk/rhino/debian/rules
===================================================================
--- trunk/rhino/debian/rules 2009-04-13 01:23:13 UTC (rev 8191)
+++ trunk/rhino/debian/rules 2009-04-13 01:26:18 UTC (rev 8192)
@@ -6,12 +6,12 @@
JAVA_HOME := /usr/lib/jvm/default-java
-DEB_ANT_BUILD_TARGET := jar compile-debugger javadoc
+DEB_ANT_BUILD_TARGET := jar javadoc
UVERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed "s/~RC.//" | sed "s/~pre//")
BUILDDIRVERSION := $(subst .,_,$(UVERSION))
-BUILDDIR=build/rhino$(BUILDDIRVERSION)pre
+BUILDDIR=build/rhino$(BUILDDIRVERSION)
clean::
rm -rf toolsrc/org/mozilla/javascript/tools/debugger/downloaded/*
@@ -36,3 +36,6 @@
install/rhino-doc::
mv $(BUILDDIR)/javadoc debian/rhino-doc/usr/share/doc/rhino-doc/apidocs
+
+get-orig-source:
+ uscan --force-download --repack
More information about the pkg-java-commits
mailing list