integrate patches from Gerardo Curiel
authorgregor herrmann <gregoa@debian.org>
Sun, 20 Apr 2008 12:30:10 +0000 (12:30 -0000)
committergregor herrmann <gregoa@debian.org>
Sun, 20 Apr 2008 12:30:10 +0000 (12:30 -0000)
debian/changelog
debian/control
debian/jabref-wrapper
debian/patches/02_libs.dpatch
debian/patches/05_antlr.dpatch

index 59eefce8a29b440b1343da324af3e08a4f28c711..f284568310b0e28147c981e9d85861fc842ae6f5 100644 (file)
@@ -2,17 +2,22 @@ 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
+    - adapt and reactivate patch 02_libs.dpatch: use libraries in
+      /usr/share/java for building and don't include them in jabref.jar
+    - add needed jars to Classpath in the wrapper script
     - add patch 05_antlr.dpatch: antlr3 in Debian is newer than the
       pre-packaged jar
-    - add necessary packages to Build-Depends-Indep
+    - add necessary packages to Build-Depends-Indep and Depends
+    These changes are either taken directly from Gerardo Curiel's patch or
+    based on them -- thanks a lot!
   * 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.
+  * debian/control: change my email address.
 
- -- gregor herrmann <gregor+debian@comodo.priv.at>  Sat, 12 Apr 2008 23:10:56 +0200
+ -- gregor herrmann <gregoa@debian.org>  Sun, 20 Apr 2008 14:15:06 +0200
 
 jabref (2.3.1-2) unstable; urgency=low
 
index 7bae484f72ee52776ceeca8bf9ed301e48e5b5c1..580277378d44751c09f42d8661b068bce4b254fd 100644 (file)
@@ -1,7 +1,7 @@
 Source: jabref
 Section: contrib/tex
 Priority: optional
-Maintainer: gregor herrmann <gregor+debian@comodo.priv.at>
+Maintainer: gregor herrmann <gregoa@debian.org>
 Uploaders: tony mancill <tmancill@debian.org>
 Build-Depends: debhelper (>= 6), dpatch, ant
 Build-Depends-Indep: java-gcj-compat-dev, imagemagick, liblog4j1.2-java,
@@ -14,7 +14,10 @@ Vcs-Browser: http://svn.toastfreeware.priv.at/wsvn/ToastfreewareDebian/jabref/tr
 
 Package: jabref
 Architecture: all
-Depends: sun-java6-jre | sun-java5-jre
+Depends: sun-java6-jre | sun-java5-jre, antlr, antlr3,
+ libjgoodies-looks-java, libjgoodies-forms-java, libspin-java,
+ libglazedlists-java, libmicroba-java, libpdfbox-java,
+ libjempbox-java (>= 0.2.0)
 Suggests: gv | postscript-viewer, xpdf | pdf-viewer
 Description: graphical frontend to manage BibTeX databases
  JabRef is a GUI to manage BibTeX databases, the standard LaTeX bibliography
index 8f8c3058c4e5838b6e9b8072f722ba6f6b7e16aa..7e40d9c9b9a45314c4345272343ae1e0af131833 100644 (file)
@@ -12,4 +12,4 @@ fi
 
 export JAVA=${JAVA:=java}
 
-exec $JAVA -jar /usr/share/java/jabref.jar "$@"
+exec $JAVA -cp /usr/share/java/jabref.jar:/usr/share/java/antlr.jar:/usr/share/java/antlr3.jar:/usr/share/java/looks.jar:/usr/share/java/forms.jar:/usr/share/java/spin.jar:/usr/share/java/glazedlists.jar:/usr/share/java/microba.jar:/usr/share/java/pdfbox.jar:/usr/share/java/jempbox.jar net.sf.jabref.JabRefMain "$@"
index 0b7c365187ee7f0d8b2706fb7d0e294722f4b464..b36ceca8568375359c00e59325a1f78789062735 100755 (executable)
@@ -1,68 +1,60 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_libs.dpatch by  <gregor+debian@comodo.priv.at>
+## 02_libs.dpatch by  <gerardo@sophie.gerardo.com.ve>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use debian packages of libraries instead of shipped ones.
+## DP: Use debian libraries and disable unnecesary unjarlib target,
 
 @DPATCH@
-diff -urNad jabref-2.3~/build.xml jabref-2.3/build.xml
---- jabref-2.3~/build.xml      2008-04-12 23:31:44.000000000 +0200
-+++ jabref-2.3/build.xml       2008-04-12 23:56:35.000000000 +0200
-@@ -87,6 +87,7 @@
+diff -urNad jabref-2.3.1~/build.xml jabref-2.3.1/build.xml
+--- jabref-2.3.1~/build.xml    2008-04-19 04:13:24.000000000 -0430
++++ jabref-2.3.1/build.xml     2008-04-19 04:16:57.000000000 -0430
+@@ -86,7 +86,7 @@
+       <property name="layout.dir" value="${src.dir}/resource/layout" />
  
        <!-- Set the properties for library directories -->
-       <property name="library.directory" value="lib" />
-+      <property name="library.directory.debian" value="/usr/share/java" />
+-      <property name="library.directory" value="lib" />
++      <property name="library.directory" value="/usr/share/java" />
  
  <!--    <property name="nsis.executable" value="makensis.exe"/> -->
        <property name="nsis.executable.linux" value="makensis"/>
-@@ -112,15 +113,15 @@
+@@ -105,22 +105,21 @@
+               </and>
+       </condition>
+-      <taskdef name="jarbundler" classpath="${library.directory}/jarbundler-1.4.jar" classname="com.loomcom.ant.tasks.jarbundler.JarBundler" />
+-
+-
++<!--  <taskdef name="jarbundler" classpath="${library.directory}/jarbundler-1.4.jar" classname="com.loomcom.ant.tasks.jarbundler.JarBundler" />
++-->
+       <!-- Build classpath -->
        <path id="classpath">
                <pathelement path="${build.classes}" />
                <pathelement path="${build.dir}" />
--              <pathelement location="${library.directory}/antlr.jar" />
+               <pathelement location="${library.directory}/antlr.jar" />
 -              <pathelement location="${library.directory}/antlr-3.0b5.jar" />
 -              <pathelement location="${library.directory}/looks-2.0.4.jar" />
 -              <pathelement location="${library.directory}/forms-1.1.0.jar" />
--              <pathelement location="${library.directory}/spin.jar" />
++              <pathelement location="${library.directory}/antlr3.jar" />
++              <pathelement location="${library.directory}/looks.jar" />
++              <pathelement location="${library.directory}/forms.jar" />
+               <pathelement location="${library.directory}/spin.jar" />
 -              <pathelement location="${library.directory}/glazedlists-1.7.0_java15.jar" />
--              <pathelement location="${library.directory}/microba.jar" />
++              <pathelement location="${library.directory}/glazedlists.jar" />
+               <pathelement location="${library.directory}/microba.jar" />
 -              <pathelement location="${library.directory}/PDFBox-0.7.3-dev-reduced.jar" />
 -              <pathelement location="${library.directory}/JempBox-0.1.0-dev.jar" />
-+              <pathelement location="${library.directory.debian}/antlr.jar" />
-+              <pathelement location="${library.directory.debian}/antlr3.jar" />
-+              <pathelement location="${library.directory.debian}/looks.jar" />
-+              <pathelement location="${library.directory.debian}/forms.jar" />
-+              <pathelement location="${library.directory.debian}/spin.jar" />
-+              <pathelement location="${library.directory.debian}/glazedlists.jar" />
-+              <pathelement location="${library.directory.debian}/microba.jar" />
-+              <pathelement location="${library.directory.debian}/pdfbox.jar" />
-+              <pathelement location="${library.directory.debian}/jempbox.jar" />
++              <pathelement location="${library.directory}/pdfbox.jar" />
++              <pathelement location="${library.directory}/jempbox.jar" />
        </path>
  
        <target name="run" depends="build">
-@@ -363,15 +364,15 @@
-       <!-- Unpacks jar needed jar files from lib directory into temp directory. -->
-       <target name="unjarlib" description="Unpacks jars from library">
+@@ -194,7 +193,8 @@
+       </target>
+       <!-- Jars up project -->
+-      <target name="jars" depends="build, unjarlib">
++      <!-- The unjarlib target is not needed, we'll use the jars in the classpath -->
++      <target name="jars" depends="build">
+               <mkdir dir="${build.lib}" />
                <mkdir dir="${build.tmp}" />
--              <unjar src="${library.directory}/antlr.jar" dest="${build.tmp}" />
--              <unjar src="${library.directory}/antlr-3.0b5.jar" dest="${build.tmp}" />
--              <unjar src="${library.directory}/looks-2.0.4.jar" dest="${build.tmp}" />
--              <unjar src="${library.directory}/forms-1.1.0.jar" dest="${build.tmp}" />
--              <unjar src="${library.directory}/spin.jar" dest="${build.tmp}" />
--              <unjar src="${library.directory}/glazedlists-1.7.0_java15.jar" dest="${build.tmp}" />
--              <unjar src="${library.directory}/microba.jar" dest="${build.tmp}" />
--              <unjar src="${library.directory}/PDFBox-0.7.3-dev-reduced.jar" dest="${build.tmp}" />
--              <unjar src="${library.directory}/JempBox-0.1.0-dev.jar" dest="${build.tmp}" />
-+              <unjar src="${library.directory.debian}/antlr.jar" dest="${build.tmp}" />
-+              <unjar src="${library.directory.debian}/antlr3.jar" dest="${build.tmp}" />
-+              <unjar src="${library.directory.debian}/looks.jar" dest="${build.tmp}" />
-+              <unjar src="${library.directory.debian}/forms.jar" dest="${build.tmp}" />
-+              <unjar src="${library.directory.debian}/spin.jar" dest="${build.tmp}" />
-+              <unjar src="${library.directory.debian}/glazedlists.jar" dest="${build.tmp}" />
-+              <unjar src="${library.directory.debian}/microba.jar" dest="${build.tmp}" />
-+              <unjar src="${library.directory.debian}/pdfbox.jar" dest="${build.tmp}" />
-+              <unjar src="${library.directory.debian}/jempbox.jar" dest="${build.tmp}" />
-               <delete dir="${build.tmp}/META-INF" />
-               <!-- rename the microba license file -->
-               <move file="${build.tmp}/license.txt" tofile="${build.tmp}/microba-license.txt" />
+               <jar destfile="${build.lib}/${build.jar}">
index c8bdb9cf2b944e1b761f9a40f1b17477ad4429fe..4098f7c0befc220b48da694240f18e7669f205d0 100755 (executable)
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_antlr.dpatch by  <gregor+debian@comodo.priv.at>
+## 05_antlr.dpatch by  <gerardo@sophie.gerardo.com.ve>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: antlr3 in debian is newer than the beta release used by jabref.
+## DP: Use antlr3 stable release API, missing ruleNestingLevel member on the antlr3 beta API
 
 @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"; }
+diff -urNad jabref-2.3.1~/src/java/net/sf/jabref/bst/BstLexer.java jabref-2.3.1/src/java/net/sf/jabref/bst/BstLexer.java
+--- jabref-2.3.1~/src/java/net/sf/jabref/bst/BstLexer.java     2008-04-19 03:48:20.000000000 -0430
++++ jabref-2.3.1/src/java/net/sf/jabref/bst/BstLexer.java      2008-04-19 03:48:53.000000000 -0430
+@@ -3,11 +3,12 @@
+ // $ANTLR 3.0b5 Bst.g 2006-11-23 23:20:24
+ import org.antlr.runtime.*;
++import org.antlr.codegen.*;
+ import java.util.Stack;
+ import java.util.List;
+ import java.util.ArrayList;
+-public class BstLexer extends Lexer {
++public class BstLexer extends ActionTranslatorLexer {
+     public static final int LETTER=21;
+     public static final int T29=29;
+     public static final int T33=33;
+@@ -40,6 +41,9 @@
+     public static final int IDLIST=4;
+     public static final int NUMERAL=22;
+     public static final int READ=13;
 +    
 +    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 @@
++    
+     public BstLexer() {;} 
+     public BstLexer(CharStream input) {
+         super(input);
+@@ -1656,4 +1660,4 @@