Add patch 05_antlr.dpatch: antlr3 in Debian is newer than the
authorgregor herrmann <gregoa@debian.org>
Sat, 12 Apr 2008 21:10:50 +0000 (21:10 -0000)
committergregor herrmann <gregoa@debian.org>
Sat, 12 Apr 2008 21:10:50 +0000 (21:10 -0000)
pre-packaged jar.

debian/changelog
debian/patches/00list
debian/patches/05_antlr.dpatch [new file with mode: 0755]

index ce9090b..1987169 100644 (file)
@@ -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 <gregor+debian@comodo.priv.at>  Mon, 07 Apr 2008 21:37:59 +0200
+ -- gregor herrmann <gregor+debian@comodo.priv.at>  Sat, 12 Apr 2008 23:08:24 +0200
 
 jabref (2.3.1-2) unstable; urgency=low
 
index 4b8f598..efbdd0b 100644 (file)
@@ -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 (executable)
index 0000000..c8bdb9c
--- /dev/null
@@ -0,0 +1,251 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_antlr.dpatch by  <gregor+debian@comodo.priv.at>
+##
+## 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
++}