[pkg-java] r15773 - in trunk/rhino/debian: . patches

[Damien Raude-Morvan]

Author: drazzib
Date: 2012-02-13 22:57:35 +0000 (Mon, 13 Feb 2012)
New Revision: 15773

Added:
   trunk/rhino/debian/patches/03_public_getSourcePositionFromStack.patch
Modified:
   trunk/rhino/debian/changelog
   trunk/rhino/debian/control
   trunk/rhino/debian/copyright
   trunk/rhino/debian/patches/series
Log:
* Making getSourcePositionFromStack public (used by geogebra).
  Closes: #659619.
* Upload to unstable.
* Remove Michael Koch from Uploaders (Closes: #654130).
* d/control: Wrap-and-sort

Modified: trunk/rhino/debian/changelog
===================================================================
--- trunk/rhino/debian/changelog	2012-02-11 17:27:40 UTC (rev 15772)
+++ trunk/rhino/debian/changelog	2012-02-13 22:57:35 UTC (rev 15773)
@@ -1,3 +1,16 @@
+rhino (1.7R3-5) unstable; urgency=low
+
+  [ Giovanni Mascellani ]
+  * Making getSourcePositionFromStack public (used by geogebra).
+    Closes: #659619.
+
+  [ Damien Raude-Morvan ]
+  * Upload to unstable.
+  * Remove Michael Koch from Uploaders (Closes: #654130).
+  * d/control: Wrap-and-sort
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Mon, 13 Feb 2012 23:52:51 +0100
+
 rhino (1.7R3-4) unstable; urgency=low
 
   * Add OSGi metadata to jar manifest

Modified: trunk/rhino/debian/control
===================================================================
--- trunk/rhino/debian/control	2012-02-11 17:27:40 UTC (rev 15772)
+++ trunk/rhino/debian/control	2012-02-13 22:57:35 UTC (rev 15773)
@@ -2,10 +2,17 @@
 Section: interpreters
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: 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 debian.org>,
-  Jakub Adam <jakub.adam at ktknet.cz>
-Build-Depends: debhelper (>= 7), cdbs, ant, default-jdk, maven-repo-helper, libxmlbeans-java, javahelper
+Uploaders: Paul Cager <paul-debian at home.paulcager.org>,
+           Marcus Better <marcus at better.se>,
+           Damien Raude-Morvan <drazzib at debian.org>,
+           Jakub Adam <jakub.adam at ktknet.cz>
+Build-Depends: ant,
+               cdbs,
+               debhelper (>= 7),
+               default-jdk,
+               javahelper,
+               libxmlbeans-java,
+               maven-repo-helper
 Standards-Version: 3.9.2
 Homepage: http://www.mozilla.org/rhino/
 Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/rhino/
@@ -13,8 +20,10 @@
 
 Package: rhino
 Architecture: all
-Depends: ${misc:Depends}, default-jre-headless (>= 1.5) | java5-runtime-headless, libjline-java,
- librhino-java (= ${source:Version})
+Depends: default-jre-headless (>= 1.5) | java5-runtime-headless,
+         libjline-java,
+         librhino-java (= ${source:Version}),
+         ${misc:Depends}
 Suggests: librhino-java-doc
 Description: JavaScript engine written in Java
  Rhino is an implementation of the JavaScript language written

Modified: trunk/rhino/debian/copyright
===================================================================
--- trunk/rhino/debian/copyright	2012-02-11 17:27:40 UTC (rev 15772)
+++ trunk/rhino/debian/copyright	2012-02-13 22:57:35 UTC (rev 15773)
@@ -520,4 +520,3 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ============================================================================
-

Added: trunk/rhino/debian/patches/03_public_getSourcePositionFromStack.patch
===================================================================
--- trunk/rhino/debian/patches/03_public_getSourcePositionFromStack.patch	                        (rev 0)
+++ trunk/rhino/debian/patches/03_public_getSourcePositionFromStack.patch	2012-02-13 22:57:35 UTC (rev 15773)
@@ -0,0 +1,20 @@
+From: Giovanni Mascellani <gio at debian.org>
+Subject: Make getSourcePositionFromStack() pulic
+Forwarded: no
+Last-Update: 2011-12-08
+
+This is needed by package geogebra.
+
+Index: rhino-1.7R3/src/org/mozilla/javascript/Context.java
+===================================================================
+--- rhino-1.7R3.orig/src/org/mozilla/javascript/Context.java	2011-12-18 11:43:21.000000000 +0100
++++ rhino-1.7R3/src/org/mozilla/javascript/Context.java	2011-12-18 11:43:57.000000000 +0100
+@@ -2481,7 +2481,7 @@
+         return (Evaluator)Kit.newInstanceOrNull(interpreterClass);
+     }
+ 
+-    static String getSourcePositionFromStack(int[] linep)
++    public static String getSourcePositionFromStack(int[] linep)
+     {
+         Context cx = getCurrentContext();
+         if (cx == null)

Modified: trunk/rhino/debian/patches/series
===================================================================
--- trunk/rhino/debian/patches/series	2012-02-11 17:27:40 UTC (rev 15772)
+++ trunk/rhino/debian/patches/series	2012-02-13 22:57:35 UTC (rev 15773)
@@ -1,2 +1,3 @@
 01_rhino-nowarn.patch
 02_exclude-jdk15.patch
+03_public_getSourcePositionFromStack.patch