This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository netbeans.
commit 14422b03c4973540220d654f63ca136fedaf6df4 Author: Markus Koschany <[email protected]> Date: Thu Dec 17 01:46:25 2015 +0100 Drop antlr-3.5.2.patch --- debian/patches/antlr-3.5.2.patch | 45 ---------------------------------------- debian/patches/series | 1 - 2 files changed, 46 deletions(-) diff --git a/debian/patches/antlr-3.5.2.patch b/debian/patches/antlr-3.5.2.patch deleted file mode 100644 index 9e0c77b..0000000 --- a/debian/patches/antlr-3.5.2.patch +++ /dev/null @@ -1,45 +0,0 @@ -From: Markus Koschany <[email protected]> -Date: Thu, 23 Jul 2015 17:02:28 +0200 -Subject: antlr 3.5.2 - -Fix errors with antlr 3.5.2. - -Forwarded: not-needed ---- - css.lib/src/org/netbeans/modules/css/lib/NbParseTreeBuilder.java | 2 +- - .../java/j2seproject/ui/customizer/vmo/gen/CommandLineParser.java | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/css.lib/src/org/netbeans/modules/css/lib/NbParseTreeBuilder.java b/css.lib/src/org/netbeans/modules/css/lib/NbParseTreeBuilder.java -index bbb50fa..965481e 100644 ---- a/css.lib/src/org/netbeans/modules/css/lib/NbParseTreeBuilder.java -+++ b/css.lib/src/org/netbeans/modules/css/lib/NbParseTreeBuilder.java -@@ -226,7 +226,7 @@ public class NbParseTreeBuilder extends BlankDebugEventListener { - - RuleNode ruleNode = callStack.peek(); - TokenNode elementNode = new TokenNode(source, (CommonToken) token); -- elementNode.hiddenTokens = this.hiddenTokens; -+ elementNode.hiddenTokens = (List) this.hiddenTokens; - hiddenTokens.clear(); - ruleNode.addChild(elementNode); - -diff --git a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/vmo/gen/CommandLineParser.java b/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/vmo/gen/CommandLineParser.java -index d639fc4..371661f 100644 ---- a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/vmo/gen/CommandLineParser.java -+++ b/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/vmo/gen/CommandLineParser.java -@@ -198,7 +198,7 @@ public class CommandLineParser extends Parser { - if (root instanceof JavaVMOption<?>) { - result.add((JavaVMOption<?>) root); - } else if (root != null) { -- result.addAll(root.getChildren()); -+ result.addAll((List) root.getChildren()); - } - } catch (RecognitionException e) { - e.printStackTrace(); -@@ -1277,4 +1277,4 @@ public class CommandLineParser extends Parser { - public static final BitSet FOLLOW_TEXT_in_eText347 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_TEXT_in_nonSwitchOption359 = new BitSet(new long[]{0x0000000000000002L}); - --} -\ No newline at end of file -+} diff --git a/debian/patches/series b/debian/patches/series index 61e1de6..56d500f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -15,4 +15,3 @@ netbeans-xml.jaxb.api.patch netbeans-build.patch netbeans-updatecenters.patch reproducible-build.patch -antlr-3.5.2.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netbeans.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
