[pkg-java] r15418 - in trunk/rhino/debian: . bin

[Damien Raude-Morvan]

Author: drazzib
Date: 2011-11-20 16:29:54 +0000 (Sun, 20 Nov 2011)
New Revision: 15418

Modified:
   trunk/rhino/debian/bin/rhino
   trunk/rhino/debian/changelog
Log:
* Since OpenJDK{6,7} now use a mangled version of Rhino
  (in "sun.org.mozilla.rhino" package), there is no need to override
  bootclasspath :
  - Fix "Incorrect classpath prevents running on AMD64" (Closes: #649131)
  - Fix "js: Error occurred during initialization ov VM" (Closes: #649281)

Modified: trunk/rhino/debian/bin/rhino
===================================================================
--- trunk/rhino/debian/bin/rhino	2011-11-20 13:16:20 UTC (rev 15417)
+++ trunk/rhino/debian/bin/rhino	2011-11-20 16:29:54 UTC (rev 15418)
@@ -5,18 +5,14 @@
 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.
+## 
+## Remove bootclasspath overriding for OpenJDK since
+## it now use a mangled version of Rhino (in sun.org.mozilla.rhino package)
+##
 ## 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 "$@"

Modified: trunk/rhino/debian/changelog
===================================================================
--- trunk/rhino/debian/changelog	2011-11-20 13:16:20 UTC (rev 15417)
+++ trunk/rhino/debian/changelog	2011-11-20 16:29:54 UTC (rev 15418)
@@ -1,3 +1,13 @@
+rhino (1.7R3-3) unstable; urgency=low
+
+  * Since OpenJDK{6,7} now use a mangled version of Rhino
+    (in "sun.org.mozilla.rhino" package), there is no need to override
+    bootclasspath :
+    - Fix "Incorrect classpath prevents running on AMD64" (Closes: #649131)
+    - Fix "js: Error occurred during initialization ov VM" (Closes: #649281)
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sun, 20 Nov 2011 12:15:19 +0100
+
 rhino (1.7R3-2) unstable; urgency=low
 
   * Upload to unstable.