[Git][java-team/closure-compiler][master] 8 commits: Tighten dependency on librhino-java to >= 1.7.14.

Markus Koschany (@apo) gitlab at salsa.debian.org
Mon Feb 13 23:29:19 GMT 2023



Markus Koschany pushed to branch master at Debian Java Maintainers / closure-compiler


Commits:
5a83e9e9 by Markus Koschany at 2023-02-14T00:02:57+01:00
Tighten dependency on librhino-java to >= 1.7.14.

- - - - -
804413b6 by Markus Koschany at 2023-02-14T00:07:26+01:00
Fix FTBFS with rhino 1.7.14.

- - - - -
bd4b81ce by Marcos Talau at 2023-02-14T00:14:07+01:00
Import Debian changes 20130227+dfsg1-11

closure-compiler (20130227+dfsg1-11) unstable; urgency=medium
..
  * QA upload.
  * Set maintainer to Debian QA Group <packages at qa.debian.org>. (see: #1008632)
  * debian/control: Remove Uploaders field.

- - - - -
e4b232c8 by Jochen Sprickerhof at 2023-02-14T00:15:15+01:00
Import Debian changes 20130227+dfsg1-12

closure-compiler (20130227+dfsg1-12) unstable; urgency=medium
..
  * QA upload.
  * Fix Maintainer: field

- - - - -
cdd9ac53 by Markus Koschany at 2023-02-14T00:17:33+01:00
Tighten dependency on librhino-java to >= 1.7.14.

- - - - -
5be0e463 by Markus Koschany at 2023-02-14T00:17:49+01:00
Fix FTBFS with rhino 1.7.14.

- - - - -
c8d7e94c by Markus Koschany at 2023-02-14T00:18:52+01:00
Update changelog

- - - - -
bfabd380 by Markus Koschany at 2023-02-14T00:27:26+01:00
Update fix-librhino-java-FTBFS.patch

- - - - -


4 changed files:

- debian/changelog
- debian/control
- + debian/patches/fix-librhino-java-FTBFS.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,27 @@
+closure-compiler (20130227+dfsg1-13) unstable; urgency=medium
+
+  * QA upload.
+  * Tighten dependency on librhino-java to >= 1.7.14.
+  * Fix FTBFS with rhino 1.7.14.
+  * Use canonical VCS URI.
+
+ -- Markus Koschany <apo at debian.org>  Tue, 14 Feb 2023 00:18:02 +0100
+
+closure-compiler (20130227+dfsg1-12) unstable; urgency=medium
+
+  * QA upload.
+  * Fix Maintainer: field
+
+ -- Jochen Sprickerhof <jspricke at debian.org>  Sat, 19 Nov 2022 09:00:34 +0100
+
+closure-compiler (20130227+dfsg1-11) unstable; urgency=medium
+
+  * QA upload.
+  * Set maintainer to Debian QA Group <packages at qa.debian.org>. (see: #1008632)
+  * debian/control: Remove Uploaders field.
+
+ -- Marcos Talau <talau at debian.org>  Tue, 15 Nov 2022 10:56:48 -0300
+
 closure-compiler (20130227+dfsg1-10.1) unstable; urgency=medium
 
   * Non-maintainer upload.


=====================================
debian/control
=====================================
@@ -1,9 +1,7 @@
 Source: closure-compiler
 Section: java
 Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Thomas Koch <thomas at koch.ro>,
- tony mancill <tmancill at debian.org>
+Maintainer: Debian QA Group <packages at qa.debian.org>
 Build-Depends:
     debhelper (>= 10),
     default-jdk,
@@ -14,7 +12,7 @@ Build-Depends:
     libargs4j-java,
     libguava-java (>= 15.0),
     libjsr305-java,
-    librhino-java (>= 1.7R4),
+    librhino-java (>= 1.7.14),
     ant,
     libjarjar-java,
     protobuf-compiler,
@@ -22,8 +20,8 @@ Build-Depends:
     javahelper (>= 0.25)
 Build-Depends-Indep: default-jdk-doc, libmaven-javadoc-plugin-java
 Standards-Version: 4.1.0
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/closure-compiler.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/closure-compiler.git
+Vcs-Git: https://salsa.debian.org/java-team/closure-compiler.git
+Vcs-Browser: https://salsa.debian.org/java-team/closure-compiler
 Homepage: https://developers.google.com/closure/compiler/
 
 Package: closure-compiler


=====================================
debian/patches/fix-librhino-java-FTBFS.patch
=====================================
@@ -0,0 +1,65 @@
+From: Markus Koschany <apo at debian.org>
+Date: Tue, 14 Feb 2023 00:06:12 +0100
+Subject: fix librhino-java FTBFS
+
+Fix FTBFS with rhino 1.7.14.
+
+Forwarded: not-needed
+---
+ src/com/google/javascript/jscomp/parsing/IRFactory.java          | 4 ++--
+ src/com/google/javascript/jscomp/parsing/TypeSafeDispatcher.java | 6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/com/google/javascript/jscomp/parsing/IRFactory.java b/src/com/google/javascript/jscomp/parsing/IRFactory.java
+index 361f31d..0e34a4d 100644
+--- a/src/com/google/javascript/jscomp/parsing/IRFactory.java
++++ b/src/com/google/javascript/jscomp/parsing/IRFactory.java
+@@ -65,7 +65,7 @@ import com.google.javascript.rhino.head.ast.SwitchCase;
+ import com.google.javascript.rhino.head.ast.SwitchStatement;
+ import com.google.javascript.rhino.head.ast.ThrowStatement;
+ import com.google.javascript.rhino.head.ast.TryStatement;
+-import com.google.javascript.rhino.head.ast.UnaryExpression;
++import com.google.javascript.rhino.head.ast.UpdateExpression;
+ import com.google.javascript.rhino.head.ast.VariableDeclaration;
+ import com.google.javascript.rhino.head.ast.VariableInitializer;
+ import com.google.javascript.rhino.head.ast.WhileLoop;
+@@ -1145,7 +1145,7 @@ class IRFactory {
+     }
+ 
+     @Override
+-    Node processUnaryExpression(UnaryExpression exprNode) {
++    Node processUpdateExpression(UpdateExpression exprNode) {
+       int type = transformTokenType(exprNode.getType());
+       Node operand = transform(exprNode.getOperand());
+       if (type == Token.NEG && operand.isNumber()) {
+diff --git a/src/com/google/javascript/jscomp/parsing/TypeSafeDispatcher.java b/src/com/google/javascript/jscomp/parsing/TypeSafeDispatcher.java
+index 95aaacd..fc6ace3 100644
+--- a/src/com/google/javascript/jscomp/parsing/TypeSafeDispatcher.java
++++ b/src/com/google/javascript/jscomp/parsing/TypeSafeDispatcher.java
+@@ -55,7 +55,7 @@ import com.google.javascript.rhino.head.ast.SwitchCase;
+ import com.google.javascript.rhino.head.ast.SwitchStatement;
+ import com.google.javascript.rhino.head.ast.ThrowStatement;
+ import com.google.javascript.rhino.head.ast.TryStatement;
+-import com.google.javascript.rhino.head.ast.UnaryExpression;
++import com.google.javascript.rhino.head.ast.UpdateExpression;
+ import com.google.javascript.rhino.head.ast.VariableDeclaration;
+ import com.google.javascript.rhino.head.ast.VariableInitializer;
+ import com.google.javascript.rhino.head.ast.WhileLoop;
+@@ -109,7 +109,7 @@ abstract class TypeSafeDispatcher<T> {
+   abstract T processSwitchStatement(SwitchStatement statementNode);
+   abstract T processThrowStatement(ThrowStatement statementNode);
+   abstract T processTryStatement(TryStatement statementNode);
+-  abstract T processUnaryExpression(UnaryExpression exprNode);
++  abstract T processUpdateExpression(UpdateExpression exprNode);
+   abstract T processVariableDeclaration(VariableDeclaration declarationNode);
+   abstract T processVariableInitializer(VariableInitializer initializerNode);
+   abstract T processWhileLoop(WhileLoop loopNode);
+@@ -168,7 +168,7 @@ abstract class TypeSafeDispatcher<T> {
+       case Token.POS:
+       case Token.TYPEOF:
+       case Token.VOID:
+-        return processUnaryExpression((UnaryExpression) node);
++        return processUpdateExpression((UpdateExpression) node);
+       case Token.BLOCK:
+         if (node instanceof Block) {
+           return processBlock((Block) node);


=====================================
debian/patches/series
=====================================
@@ -3,3 +3,4 @@ remove_tests_depending_on_caja.patch
 guava-compatibility.patch
 ftbfs-commandlinerunner.patch
 ignore-maven-ant-tasks.patch
+fix-librhino-java-FTBFS.patch



View it on GitLab: https://salsa.debian.org/java-team/closure-compiler/-/compare/c7ac9277157e1aa67456a38a4ba855653a3dd680...bfabd38061ba61d2cebf482878ed1c5e7c4e1028

-- 
View it on GitLab: https://salsa.debian.org/java-team/closure-compiler/-/compare/c7ac9277157e1aa67456a38a4ba855653a3dd680...bfabd38061ba61d2cebf482878ed1c5e7c4e1028
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20230213/65b6e9f6/attachment.htm>


More information about the pkg-java-commits mailing list