This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository netbeans.
commit d46fb18e7f9166e41e22c3f3ab4427c0199d8ff0 Author: Markus Koschany <[email protected]> Date: Sun Jun 14 21:23:15 2015 +0200 Drop NbParseTreeBuilder.patch. Update DEP-3 header for Css3Parser-antlr.patch --- debian/patches/Css3Parser-antlr.patch | 4 ++++ debian/patches/NbParseTreeBuilder.patch | 21 --------------------- debian/patches/series | 1 - 3 files changed, 4 insertions(+), 22 deletions(-) diff --git a/debian/patches/Css3Parser-antlr.patch b/debian/patches/Css3Parser-antlr.patch index ad8b980..b5e8c81 100644 --- a/debian/patches/Css3Parser-antlr.patch +++ b/debian/patches/Css3Parser-antlr.patch @@ -2,6 +2,10 @@ From: Markus Koschany <[email protected]> Date: Mon, 8 Jun 2015 13:24:13 +0200 Subject: Css3Parser antlr +Fix for compilation failure due to outdated Debian version of antlr. This patch +can be removed when antlr >= 3.4 is packaged for Debian. + +Forwarded: not-needed --- .../org/netbeans/modules/css/lib/Css3Parser.java | 818 ++++++++++----------- 1 file changed, 409 insertions(+), 409 deletions(-) diff --git a/debian/patches/NbParseTreeBuilder.patch b/debian/patches/NbParseTreeBuilder.patch deleted file mode 100644 index 1caaf2a..0000000 --- a/debian/patches/NbParseTreeBuilder.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Markus Koschany <[email protected]> -Date: Mon, 8 Jun 2015 13:36:26 +0200 -Subject: NbParseTreeBuilder - ---- - css.lib/src/org/netbeans/modules/css/lib/NbParseTreeBuilder.java | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -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..1b9c354 100644 ---- a/css.lib/src/org/netbeans/modules/css/lib/NbParseTreeBuilder.java -+++ b/css.lib/src/org/netbeans/modules/css/lib/NbParseTreeBuilder.java -@@ -101,7 +101,7 @@ public class NbParseTreeBuilder extends BlankDebugEventListener { - - /** Backtracking or cyclic DFA, don't want to add nodes to tree */ - @Override -- public void enterDecision(int d, boolean couldBacktrack) { -+ public void enterDecision(int d) { - backtracking++; - } - diff --git a/debian/patches/series b/debian/patches/series index bf21618..9a087ed 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,7 +7,6 @@ osgi-update.patch netbeans-platform-jemmy.patch netbeans-cluster-properties.patch Css3Parser-antlr.patch -NbParseTreeBuilder.patch netbeans-nocopy.patch db.dataview-setRowFilter-method.patch netbeans-javacc.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
