This is an automated email from the git hooks/post-receive script. gregoa pushed a commit to branch master in repository jabref.
commit 8a96597b5cc98e94cde81f5740d39dbec369fd54 Author: gregor herrmann <[email protected]> Date: Sat Apr 12 21:10:50 2008 +0000 Add patch 05_antlr.dpatch: antlr3 in Debian is newer than the pre-packaged jar. --- debian/changelog | 4 +- debian/patches/00list | 1 + debian/patches/05_antlr.dpatch | 251 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 255 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ce9090b..1987169 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,13 +3,15 @@ jabref (2.3.1-3) UNRELEASED; urgency=low * Build against Debian libraries instead of pre-packaged ones (closes: #389068). Adapt and reactivate patch 02_libs.dpatch, add necessary packages to Build-Depends-Indep. + * Add patch 05_antlr.dpatch: antlr3 in Debian is newer than the + pre-packaged jar. * debian/watch: add uversionmangle to cope with upstream b(eta) releases. * Move wrapper script in source package to debian/jabref-wrapper and install it from debian/rules. * Remove debian docs and install upstream README directly from debian/rules. - -- gregor herrmann <[email protected]> Mon, 07 Apr 2008 21:37:59 +0200 + -- gregor herrmann <[email protected]> Sat, 12 Apr 2008 23:08:24 +0200 jabref (2.3.1-2) unstable; urgency=low diff --git a/debian/patches/00list b/debian/patches/00list index 4b8f598..efbdd0b 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -2,3 +2,4 @@ 02_libs 03_external_apps 04_HONOR_DISPLAY_PROPERTIES +05_antlr diff --git a/debian/patches/05_antlr.dpatch b/debian/patches/05_antlr.dpatch new file mode 100755 index 0000000..c8bdb9c --- /dev/null +++ b/debian/patches/05_antlr.dpatch @@ -0,0 +1,251 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 05_antlr.dpatch by <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: antlr3 in debian is newer than the beta release used by jabref. + +@DPATCH@ +diff -urNad jabref-2.3~/src/java/net/sf/jabref/bst/BstLexer.java jabref-2.3/src/java/net/sf/jabref/bst/BstLexer.java +--- jabref-2.3~/src/java/net/sf/jabref/bst/BstLexer.java 2008-04-12 22:45:05.000000000 +0200 ++++ jabref-2.3/src/java/net/sf/jabref/bst/BstLexer.java 2008-04-12 22:59:37.000000000 +0200 +@@ -45,6 +45,8 @@ + super(input); + } + public String getGrammarFileName() { return "Bst.g"; } ++ ++ int ruleNestingLevel = 0; + + // $ANTLR start T25 + public void mT25() throws RecognitionException { +@@ -65,7 +67,7 @@ + + + if ( token==null && ruleNestingLevel==1 ) { +- emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1); ++ emit(); + } + + } +@@ -94,7 +96,7 @@ + + + if ( token==null && ruleNestingLevel==1 ) { +- emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1); ++ emit(); + } + + } +@@ -123,7 +125,7 @@ + + + if ( token==null && ruleNestingLevel==1 ) { +- emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1); ++ emit(); + } + + } +@@ -152,7 +154,7 @@ + + + if ( token==null && ruleNestingLevel==1 ) { +- emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1); ++ emit(); + } + + } +@@ -181,7 +183,7 @@ + + + if ( token==null && ruleNestingLevel==1 ) { +- emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1); ++ emit(); + } + + } +@@ -210,7 +212,7 @@ + + + if ( token==null && ruleNestingLevel==1 ) { +- emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1); ++ emit(); + } + + } +@@ -239,7 +241,7 @@ + + + if ( token==null && ruleNestingLevel==1 ) { +- emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1); ++ emit(); + } + + } +@@ -269,7 +271,7 @@ + + + if ( token==null && ruleNestingLevel==1 ) { +- emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1); ++ emit(); + } + + } +@@ -298,7 +300,7 @@ + + + if ( token==null && ruleNestingLevel==1 ) { +- emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1); ++ emit(); + } + + } +@@ -328,7 +330,7 @@ + + + if ( token==null && ruleNestingLevel==1 ) { +- emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1); ++ emit(); + } + + } +@@ -358,7 +360,7 @@ + + + if ( token==null && ruleNestingLevel==1 ) { +- emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1); ++ emit(); + } + + } +@@ -388,7 +390,7 @@ + + + if ( token==null && ruleNestingLevel==1 ) { +- emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1); ++ emit(); + } + + } +@@ -418,7 +420,7 @@ + + + if ( token==null && ruleNestingLevel==1 ) { +- emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1); ++ emit(); + } + + } +@@ -448,7 +450,7 @@ + + + if ( token==null && ruleNestingLevel==1 ) { +- emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1); ++ emit(); + } + + } +@@ -478,7 +480,7 @@ + + + if ( token==null && ruleNestingLevel==1 ) { +- emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1); ++ emit(); + } + + } +@@ -508,7 +510,7 @@ + + + if ( token==null && ruleNestingLevel==1 ) { +- emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1); ++ emit(); + } + + } +@@ -538,7 +540,7 @@ + + + if ( token==null && ruleNestingLevel==1 ) { +- emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1); ++ emit(); + } + + } +@@ -568,7 +570,7 @@ + + + if ( token==null && ruleNestingLevel==1 ) { +- emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1); ++ emit(); + } + + } +@@ -598,7 +600,7 @@ + + + if ( token==null && ruleNestingLevel==1 ) { +- emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1); ++ emit(); + } + + } +@@ -628,7 +630,7 @@ + + + if ( token==null && ruleNestingLevel==1 ) { +- emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1); ++ emit(); + } + + } +@@ -691,7 +693,7 @@ + + + if ( token==null && ruleNestingLevel==1 ) { +- emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1); ++ emit(); + } + + } +@@ -781,7 +783,7 @@ + + + if ( token==null && ruleNestingLevel==1 ) { +- emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1); ++ emit(); + } + + } +@@ -865,7 +867,7 @@ + + + if ( token==null && ruleNestingLevel==1 ) { +- emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1); ++ emit(); + } + + } +@@ -956,7 +958,7 @@ + + + if ( token==null && ruleNestingLevel==1 ) { +- emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1); ++ emit(); + } + + } +@@ -1037,7 +1039,7 @@ + + + if ( token==null && ruleNestingLevel==1 ) { +- emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1); ++ emit(); + } + + } +@@ -1656,4 +1658,4 @@ + + + +-} +\ No newline at end of file ++} -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jabref.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
