This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository rhino.
commit 486d897e85acf61ab5b46cc7bd17117d38deba24 Author: Emmanuel Bourg <[email protected]> Date: Thu Jan 19 14:55:19 2017 +0100 Refreshed the patches --- debian/changelog | 4 ++- debian/patches/01_rhino-nowarn.patch | 4 +-- debian/patches/02_exclude-jdk15.patch | 2 +- .../03_public_getSourcePositionFromStack.patch | 8 ++--- debian/patches/04_bug_798642_800616.diff | 42 ++++++++-------------- 5 files changed, 24 insertions(+), 36 deletions(-) diff --git a/debian/changelog b/debian/changelog index 575b64a..6f2bc03 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ -rhino (1.7R4-5) UNRELEASED; urgency=medium +rhino (1.7R5-1) UNRELEASED; urgency=medium * Team upload. + * New upstream release + - Refreshed the patches * Standards-Version updated to 3.9.8 * Switch to debhelper level 10 * Use secure Vcs-* URLs diff --git a/debian/patches/01_rhino-nowarn.patch b/debian/patches/01_rhino-nowarn.patch index a991b23..2838524 100644 --- a/debian/patches/01_rhino-nowarn.patch +++ b/debian/patches/01_rhino-nowarn.patch @@ -2,7 +2,7 @@ Description: Pass "nowarn" to javac ant task to disable printing of warning during compilation. --- a/src/build.xml +++ b/src/build.xml -@@ -62,6 +62,7 @@ +@@ -32,6 +32,7 @@ includes="org/**/*.java" excludes="org/**/jdk15/*.java" deprecation="on" @@ -10,7 +10,7 @@ Description: Pass "nowarn" to javac ant task to disable printing of warning debug="${debug}" includeAntRuntime="false" target="${target-jvm}" -@@ -80,6 +81,7 @@ +@@ -50,6 +51,7 @@ destdir="${classes}" includes="org/**/jdk15/*.java" deprecation="on" diff --git a/debian/patches/02_exclude-jdk15.patch b/debian/patches/02_exclude-jdk15.patch index 87c67d9..a41f512 100644 --- a/debian/patches/02_exclude-jdk15.patch +++ b/debian/patches/02_exclude-jdk15.patch @@ -2,7 +2,7 @@ Description: Exclude everything except "jdk1.5/**" when building 1.5 specific source code. --- a/src/build.xml +++ b/src/build.xml -@@ -79,6 +79,7 @@ +@@ -49,6 +49,7 @@ <target name="compile-jdk15" if="jdk15"> <javac srcdir="src" destdir="${classes}" diff --git a/debian/patches/03_public_getSourcePositionFromStack.patch b/debian/patches/03_public_getSourcePositionFromStack.patch index 7b8346f..45009d1 100644 --- a/debian/patches/03_public_getSourcePositionFromStack.patch +++ b/debian/patches/03_public_getSourcePositionFromStack.patch @@ -5,11 +5,9 @@ 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 @@ +--- a/src/org/mozilla/javascript/Context.java ++++ b/src/org/mozilla/javascript/Context.java +@@ -2428,7 +2428,7 @@ return (Evaluator)Kit.newInstanceOrNull(interpreterClass); } diff --git a/debian/patches/04_bug_798642_800616.diff b/debian/patches/04_bug_798642_800616.diff index d2015c6..6dd7629 100644 --- a/debian/patches/04_bug_798642_800616.diff +++ b/debian/patches/04_bug_798642_800616.diff @@ -1,8 +1,6 @@ -Index: rhino-1.7R4/src/org/mozilla/javascript/Parser.java -=================================================================== ---- rhino-1.7R4.orig/src/org/mozilla/javascript/Parser.java 2014-06-02 18:09:25.377325443 +0200 -+++ rhino-1.7R4/src/org/mozilla/javascript/Parser.java 2014-06-02 18:09:25.377325443 +0200 -@@ -2784,6 +2784,12 @@ +--- a/src/org/mozilla/javascript/Parser.java ++++ b/src/org/mozilla/javascript/Parser.java +@@ -2796,6 +2796,12 @@ if (this.inUseStrictDirective && ts.isNumberOctal()) { reportError("msg.no.octal.strict"); } @@ -15,7 +13,7 @@ Index: rhino-1.7R4/src/org/mozilla/javascript/Parser.java return new NumberLiteral(ts.tokenBeg, s, ts.getNumber()); -@@ -3322,8 +3328,10 @@ +@@ -3334,8 +3340,10 @@ ObjectProperty pn = new ObjectProperty(pos); if (isGetter) { pn.setIsGetter(); @@ -26,10 +24,8 @@ Index: rhino-1.7R4/src/org/mozilla/javascript/Parser.java } int end = getNodeEnd(fn); pn.setLeft(propName); -Index: rhino-1.7R4/src/org/mozilla/javascript/TokenStream.java -=================================================================== ---- rhino-1.7R4.orig/src/org/mozilla/javascript/TokenStream.java 2014-06-02 18:09:25.377325443 +0200 -+++ rhino-1.7R4/src/org/mozilla/javascript/TokenStream.java 2014-06-02 18:09:25.377325443 +0200 +--- a/src/org/mozilla/javascript/TokenStream.java ++++ b/src/org/mozilla/javascript/TokenStream.java @@ -267,6 +267,7 @@ final double getNumber() { return number; } @@ -60,10 +56,8 @@ Index: rhino-1.7R4/src/org/mozilla/javascript/TokenStream.java // delimiter for last string literal scanned private int quoteChar; -Index: rhino-1.7R4/src/org/mozilla/javascript/ast/FunctionNode.java -=================================================================== ---- rhino-1.7R4.orig/src/org/mozilla/javascript/ast/FunctionNode.java 2014-06-02 18:09:25.377325443 +0200 -+++ rhino-1.7R4/src/org/mozilla/javascript/ast/FunctionNode.java 2014-06-02 18:09:25.377325443 +0200 +--- a/src/org/mozilla/javascript/ast/FunctionNode.java ++++ b/src/org/mozilla/javascript/ast/FunctionNode.java @@ -368,8 +368,10 @@ @Override public String toSource(int depth) { @@ -86,10 +80,8 @@ Index: rhino-1.7R4/src/org/mozilla/javascript/ast/FunctionNode.java sb.append("\n"); } return sb.toString(); -Index: rhino-1.7R4/src/org/mozilla/javascript/ast/ObjectProperty.java -=================================================================== ---- rhino-1.7R4.orig/src/org/mozilla/javascript/ast/ObjectProperty.java 2014-06-02 18:09:25.377325443 +0200 -+++ rhino-1.7R4/src/org/mozilla/javascript/ast/ObjectProperty.java 2014-06-02 18:09:25.377325443 +0200 +--- a/src/org/mozilla/javascript/ast/ObjectProperty.java ++++ b/src/org/mozilla/javascript/ast/ObjectProperty.java @@ -92,17 +92,18 @@ @Override public String toSource(int depth) { @@ -112,13 +104,11 @@ Index: rhino-1.7R4/src/org/mozilla/javascript/ast/ObjectProperty.java return sb.toString(); } } -Index: rhino-1.7R4/testsrc/org/mozilla/javascript/tests/Bug491621Test.java -=================================================================== ---- rhino-1.7R4.orig/testsrc/org/mozilla/javascript/tests/Bug491621Test.java 2014-06-02 18:09:25.377325443 +0200 -+++ rhino-1.7R4/testsrc/org/mozilla/javascript/tests/Bug491621Test.java 2014-06-02 18:09:25.377325443 +0200 +--- a/testsrc/org/mozilla/javascript/tests/Bug491621Test.java ++++ b/testsrc/org/mozilla/javascript/tests/Bug491621Test.java @@ -96,4 +96,22 @@ assertSource("if(c)const a=0;else a=1", - "if (c) \nconst a = 0; else a = 1;\n"); + "if (c) \n const a = 0;\nelse \n a = 1;\n"); } + + @Test//Bug 800616 @@ -139,10 +129,8 @@ Index: rhino-1.7R4/testsrc/org/mozilla/javascript/tests/Bug491621Test.java + assertSource("0xff;\n9;\n07;\n1;", "0xff;\n9;\n07;\n1;\n"); + } } -Index: rhino-1.7R4/testsrc/org/mozilla/javascript/tests/BugGetterSetterTest.java -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rhino-1.7R4/testsrc/org/mozilla/javascript/tests/BugGetterSetterTest.java 2014-06-02 18:09:25.377325443 +0200 +--- /dev/null ++++ b/testsrc/org/mozilla/javascript/tests/BugGetterSetterTest.java @@ -0,0 +1,44 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/rhino.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
