rename patches to their old names to keep the delta small
authorgregor herrmann <gregoa@debian.org>
Tue, 11 Aug 2009 16:48:58 +0000 (16:48 -0000)
committergregor herrmann <gregoa@debian.org>
Tue, 11 Aug 2009 16:48:58 +0000 (16:48 -0000)
13 files changed:
debian/patches/01_free_javac.patch [new file with mode: 0644]
debian/patches/02_libs.patch [new file with mode: 0644]
debian/patches/03_external_apps.patch [new file with mode: 0644]
debian/patches/04_HONOR_DISPLAY_PROPERTIES.patch [new file with mode: 0644]
debian/patches/05_antlr.patch [new file with mode: 0644]
debian/patches/06_BibtexEntry.patch [new file with mode: 0644]
debian/patches/BibtexEntry.patch [deleted file]
debian/patches/HONOR_DISPLAY_PROPERTIES.patch [deleted file]
debian/patches/antlr.patch [deleted file]
debian/patches/build_xml.patch [deleted file]
debian/patches/free_javac.patch [deleted file]
debian/patches/preferences.patch [deleted file]
debian/patches/series

diff --git a/debian/patches/01_free_javac.patch b/debian/patches/01_free_javac.patch
new file mode 100644 (file)
index 0000000..ee4f3f3
--- /dev/null
@@ -0,0 +1,41 @@
+Author: gregor herrmann <gregoa@debian.org>
+Author: Philip Rinn <rinni@gmx.net>
+Description: Changes to be able to compile JabRef with free java compilers.
+--- a/src/java/net/sf/jabref/JabRef.java
++++ b/src/java/net/sf/jabref/JabRef.java
+@@ -29,7 +29,6 @@
+ import com.jgoodies.looks.FontSet;
+ import com.jgoodies.looks.FontSets;
+ import com.jgoodies.looks.plastic.Plastic3DLookAndFeel;
+-import com.jgoodies.looks.windows.WindowsLookAndFeel;
+ import gnu.dtools.ritopt.BooleanOption;
+ import gnu.dtools.ritopt.Options;
+ import gnu.dtools.ritopt.StringOption;
+@@ -610,27 +609,6 @@
+                     //Plastic3DLookAndFeel plLnf = (Plastic3DLookAndFeel) lnf;
+                 }
+-                else if ((lnf != null) && (lnf instanceof WindowsLookAndFeel)) {
+-
+-                    // Set a "model" icon size, so menu items are evenly spaced even though
+-                    // only some items have icons. We load an arbitrary icon and look at
+-                    // its size to determine what size to use:
+-                    int defaultIconSize = GUIGlobals.getImage("open").getIconWidth();
+-                    com.jgoodies.looks.Options.setDefaultIconSize
+-                        (new Dimension(defaultIconSize, defaultIconSize));
+-
+-                    if (overrideDefaultFonts) {
+-                        FontSet fontSet = FontSets.createDefaultFontSet(
+-                            new Font("Tahoma", Font.PLAIN, fontSizes),    // control font
+-                            new Font("Tahoma", Font.PLAIN, fontSizes),    // menu font
+-                            new Font("Tahoma", Font.BOLD, fontSizes)     // title font
+-                            );
+-                        FontPolicy fixedPolicy = FontPolicies.createFixedPolicy(fontSet);
+-                        WindowsLookAndFeel.setFontPolicy(fixedPolicy);
+-                    }
+-
+-                    //WindowsLookAndFeel plLnf = (WindowsLookAndFeel) lnf;
+-                }
+                 if (lnf != null) {
+                     try {
diff --git a/debian/patches/02_libs.patch b/debian/patches/02_libs.patch
new file mode 100644 (file)
index 0000000..105a59a
--- /dev/null
@@ -0,0 +1,80 @@
+Author: Gerardo Curiel <gerardo@sophie.gerardo.com.ve>
+Author: Philip Rinn <rinni@gmx.net>
+Description: Use debian libraries and disable unnecesary unjarlib target,
+--- a/build.xml
++++ b/build.xml
+@@ -85,7 +85,7 @@
+       <property name="help.dir" value="${src.dir}/help" />
+       <property name="extensions.dir" value="${src.dir}/extensions" />
+       <property name="layout.dir" value="${src.dir}/resource/layout" />
+-      <property name="lib.dir" value="lib" />
++      <property name="lib.dir" value="/usr/share/java" />
+       <property name="tests.dir" value="${src.dir}/tests" />
+       <property name="nsis.executable" value="makensis.exe"/>
+@@ -107,22 +107,22 @@
+       <fileset id="jarsFileset" dir="${lib.dir}">
+               <include name="antlr.jar" />
+-              <include name="antlr-3.0b5.jar" />
+-              <include name="looks-2.2.0.jar" />
+-              <include name="forms-1.1.0.jar" />
++              <include name="antlr3.jar" />
++              <include name="looks.jar" />
++              <include name="forms.jar" />
+               <include name="spin.jar" />
+-              <include name="glazedlists-1.7.0_java15.jar" />
++              <include name="glazedlists.jar" />
+               <include name="microba.jar" />
+-              <include name="PDFBox-0.7.3-dev-reduced.jar" />
+-              <include name="JempBox-0.2.0.jar" />
++              <include name="pdfbox.jar" />
++              <include name="jempbox.jar" />
+               <include name="zoom-java.jar" />
+-      <include name="mysql-connector-java-5.0.7-bin.jar" />
++      <include name="mysql-connector-java.jar" />
+         <!--<include name="substance-4.1.jar" />-->
+         <!-- Plugin runtime dependencies -->
+-              <include name="plugin/JPFCodeGenerator-rt.jar" />
+-              <include name="plugin/jpf.jar" />
+-              <include name="plugin/jpf-boot.jar" />
+-              <include name="plugin/commons-logging.jar" />
++              <include name="JPFCodeGenerator-rt.jar" />
++              <include name="jpf.jar" />
++              <include name="jpf-boot.jar" />
++              <include name="commons-logging.jar" />
+       </fileset>
+       <!-- Build classpath -->
+@@ -134,10 +134,10 @@
+       <!-- Classpath for running the code generator -->
+       <path id="codegenerator">
+-              <pathelement location="${lib.dir}/plugin/JPFCodeGenerator.jar" />
+-              <pathelement location="${lib.dir}/plugin/jpf.jar" />
+-              <pathelement location="${lib.dir}/plugin/jpf-boot.jar" />
+-              <pathelement location="${lib.dir}/plugin/velocity-dep-1.5.jar" />
++              <pathelement location="${lib.dir}/JPFCodeGenerator.jar" />
++              <pathelement location="${lib.dir}/jpf.jar" />
++              <pathelement location="${lib.dir}/jpf-boot.jar" />
++              <pathelement location="${lib.dir}/velocity-dep-1.5.jar" />
+       </path>
+       <!-- Classpath for tests -->
+@@ -217,7 +217,7 @@
+       </target>
+       <!-- Jars up project -->
+-      <target name="jars" depends="build, unjarlib">
++      <target name="jars" depends="build">
+               <mkdir dir="${build.lib}" />
+               <mkdir dir="${build.tmp}" />
+               <jar destfile="${build.lib}/${build.jar}">
+@@ -612,6 +612,6 @@
+               </jalopy>
+       </target>
+-      <taskdef name="jarbundler" classpath="${lib.dir}/jarbundler-1.4.jar" classname="com.loomcom.ant.tasks.jarbundler.JarBundler" />
++<!--  <taskdef name="jarbundler" classpath="${lib.dir}/jarbundler-1.4.jar" classname="com.loomcom.ant.tasks.jarbundler.JarBundler" /> -->
+ </project>
diff --git a/debian/patches/03_external_apps.patch b/debian/patches/03_external_apps.patch
new file mode 100644 (file)
index 0000000..33fa720
--- /dev/null
@@ -0,0 +1,17 @@
+Author: gregor herrmann <gregoa@debian.org>
+Author: Philip Rinn <rinni@gmx.net>
+Description: Change some external applications.
+--- a/src/java/net/sf/jabref/JabRefPreferences.java
++++ b/src/java/net/sf/jabref/JabRefPreferences.java
+@@ -143,9 +143,9 @@
+             defaults.put("winEdtPath", "C:\\Program Files\\WinEdt Team\\WinEdt\\WinEdt.exe");
+             defaults.put("latexEditorPath", "C:\\Program Files\\LEd\\LEd.exe");
+         } else {
+-                      defaults.put("pdfviewer", "evince");
++                      defaults.put("pdfviewer", "xpdf");
+                       defaults.put("psviewer", "gv");
+-                      defaults.put("htmlviewer", "firefox");
++                      defaults.put("htmlviewer", "x-www-browser");
+                       defaults.put("lookAndFeel", "com.jgoodies.plaf.plastic.Plastic3DLookAndFeel");
+               }
+         defaults.put("useDefaultLookAndFeel", Boolean.TRUE);
diff --git a/debian/patches/04_HONOR_DISPLAY_PROPERTIES.patch b/debian/patches/04_HONOR_DISPLAY_PROPERTIES.patch
new file mode 100644 (file)
index 0000000..ea49ed2
--- /dev/null
@@ -0,0 +1,20 @@
+Author: <gregoa@debian.org>
+Description: JEditorPane.HONOR_DISPLAY_PROPERTIES not understood by java-gcj-compat-dev ...
+--- a/src/java/net/sf/jabref/JabRefMain.java
++++ b/src/java/net/sf/jabref/JabRefMain.java
+@@ -109,7 +109,6 @@
+                 "We are sorry for the trouble and thanks for reporting problems with JabRef!</html>");\r
+             pane.setEditable(false);\r
+             pane.setOpaque(false);\r
+-            pane.putClientProperty(JEditorPane.HONOR_DISPLAY_PROPERTIES, Boolean.TRUE);\r
+             \r
+             Component componentToDisplay;\r
+             if (pane.getPreferredSize().getHeight() > 700){\r
+@@ -157,7 +156,6 @@
+                 "<p>For more information visit <b>http://jabref.sf.net/faq.php</b>.</p></html>");\r
+             pane.setEditable(false);\r
+             pane.setOpaque(false);\r
+-            pane.putClientProperty(JEditorPane.HONOR_DISPLAY_PROPERTIES, Boolean.TRUE);\r
+             \r
+             JOptionPane.showMessageDialog(null, pane, "Insufficient Java Version Installed", JOptionPane.ERROR_MESSAGE);\r
+         }\r
diff --git a/debian/patches/05_antlr.patch b/debian/patches/05_antlr.patch
new file mode 100644 (file)
index 0000000..2d77f3a
--- /dev/null
@@ -0,0 +1,33 @@
+Author: Gerardo Curiel <gerardo@sophie.gerardo.com.ve>
+Author: Philip Rinn <rinni@gmx.net>
+Description: Use antlr3 stable release API, missing ruleNestingLevel member on the antlr3 beta API
+--- a/src/java/net/sf/jabref/bst/BstLexer.java
++++ b/src/java/net/sf/jabref/bst/BstLexer.java
+@@ -9,8 +9,9 @@
+ import org.antlr.runtime.NoViableAltException;
+ import org.antlr.runtime.RecognitionException;
+ import org.antlr.runtime.Token;
++import org.antlr.codegen.*;
+-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;
+@@ -43,6 +44,9 @@
+     public static final int IDLIST=4;
+     public static final int NUMERAL=22;
+     public static final int READ=13;
++
++    int ruleNestingLevel = 0;
++
+     public BstLexer() {
+         
+     } 
+@@ -1661,4 +1665,4 @@
+  
+-}
+\ No newline at end of file
++}
diff --git a/debian/patches/06_BibtexEntry.patch b/debian/patches/06_BibtexEntry.patch
new file mode 100644 (file)
index 0000000..e04f90e
--- /dev/null
@@ -0,0 +1,51 @@
+Author: Philip Rinn <rinni@gmx.net>
+Description: TODO
+--- a/src/java/net/sf/jabref/gui/ImportInspectionDialog.java
++++ b/src/java/net/sf/jabref/gui/ImportInspectionDialog.java
+@@ -1319,7 +1319,7 @@
+     @SuppressWarnings("unchecked")
+     protected void setupComparatorChooser() {
+         // First column:
+-        java.util.List<Comparator<BibtexEntry>> comparators = comparatorChooser
++        java.util.List<Comparator> comparators = comparatorChooser
+             .getComparatorsForColumn(0);
+         comparators.clear();
+@@ -1477,4 +1477,4 @@
+     public void toFront() {
+         super.toFront();
+     }
+-}
+\ No newline at end of file
++}
+--- a/src/java/net/sf/jabref/gui/MainTable.java
++++ b/src/java/net/sf/jabref/gui/MainTable.java
+@@ -319,7 +319,7 @@
+     @SuppressWarnings("unchecked")
+       private void setupComparatorChooser() {
+         // First column:
+-        List<Comparator<BibtexEntry>> comparators = comparatorChooser.getComparatorsForColumn(0);
++        List<Comparator> comparators = comparatorChooser.getComparatorsForColumn(0);
+         comparators.clear();
+         comparators.add(new FirstColumnComparator(panel.database()));
+@@ -618,7 +618,7 @@
+      */
+     @SuppressWarnings("unchecked")
+       public Comparator<BibtexEntry> getComparatorForColumn(int index) {
+-        List<Comparator<BibtexEntry>> l = comparatorChooser.getComparatorsForColumn(index);
++        List<Comparator> l = comparatorChooser.getComparatorsForColumn(index);
+         return l.size() == 0 ? null : l.get(0);
+     }
+--- a/src/java/net/sf/jabref/gui/SearchResultsDialog.java
++++ b/src/java/net/sf/jabref/gui/SearchResultsDialog.java
+@@ -166,7 +166,7 @@
+     @SuppressWarnings("unchecked")
+     protected void setupComparatorChooser(TableComparatorChooser<BibtexEntry> comparatorChooser) {
+         // First column:
+-        java.util.List<Comparator<BibtexEntry>> comparators = comparatorChooser
++        java.util.List<Comparator> comparators = comparatorChooser
+             .getComparatorsForColumn(0);
+         comparators.clear();
diff --git a/debian/patches/BibtexEntry.patch b/debian/patches/BibtexEntry.patch
deleted file mode 100644 (file)
index e04f90e..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-Author: Philip Rinn <rinni@gmx.net>
-Description: TODO
---- a/src/java/net/sf/jabref/gui/ImportInspectionDialog.java
-+++ b/src/java/net/sf/jabref/gui/ImportInspectionDialog.java
-@@ -1319,7 +1319,7 @@
-     @SuppressWarnings("unchecked")
-     protected void setupComparatorChooser() {
-         // First column:
--        java.util.List<Comparator<BibtexEntry>> comparators = comparatorChooser
-+        java.util.List<Comparator> comparators = comparatorChooser
-             .getComparatorsForColumn(0);
-         comparators.clear();
-@@ -1477,4 +1477,4 @@
-     public void toFront() {
-         super.toFront();
-     }
--}
-\ No newline at end of file
-+}
---- a/src/java/net/sf/jabref/gui/MainTable.java
-+++ b/src/java/net/sf/jabref/gui/MainTable.java
-@@ -319,7 +319,7 @@
-     @SuppressWarnings("unchecked")
-       private void setupComparatorChooser() {
-         // First column:
--        List<Comparator<BibtexEntry>> comparators = comparatorChooser.getComparatorsForColumn(0);
-+        List<Comparator> comparators = comparatorChooser.getComparatorsForColumn(0);
-         comparators.clear();
-         comparators.add(new FirstColumnComparator(panel.database()));
-@@ -618,7 +618,7 @@
-      */
-     @SuppressWarnings("unchecked")
-       public Comparator<BibtexEntry> getComparatorForColumn(int index) {
--        List<Comparator<BibtexEntry>> l = comparatorChooser.getComparatorsForColumn(index);
-+        List<Comparator> l = comparatorChooser.getComparatorsForColumn(index);
-         return l.size() == 0 ? null : l.get(0);
-     }
---- a/src/java/net/sf/jabref/gui/SearchResultsDialog.java
-+++ b/src/java/net/sf/jabref/gui/SearchResultsDialog.java
-@@ -166,7 +166,7 @@
-     @SuppressWarnings("unchecked")
-     protected void setupComparatorChooser(TableComparatorChooser<BibtexEntry> comparatorChooser) {
-         // First column:
--        java.util.List<Comparator<BibtexEntry>> comparators = comparatorChooser
-+        java.util.List<Comparator> comparators = comparatorChooser
-             .getComparatorsForColumn(0);
-         comparators.clear();
diff --git a/debian/patches/HONOR_DISPLAY_PROPERTIES.patch b/debian/patches/HONOR_DISPLAY_PROPERTIES.patch
deleted file mode 100644 (file)
index ea49ed2..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-Author: <gregoa@debian.org>
-Description: JEditorPane.HONOR_DISPLAY_PROPERTIES not understood by java-gcj-compat-dev ...
---- a/src/java/net/sf/jabref/JabRefMain.java
-+++ b/src/java/net/sf/jabref/JabRefMain.java
-@@ -109,7 +109,6 @@
-                 "We are sorry for the trouble and thanks for reporting problems with JabRef!</html>");\r
-             pane.setEditable(false);\r
-             pane.setOpaque(false);\r
--            pane.putClientProperty(JEditorPane.HONOR_DISPLAY_PROPERTIES, Boolean.TRUE);\r
-             \r
-             Component componentToDisplay;\r
-             if (pane.getPreferredSize().getHeight() > 700){\r
-@@ -157,7 +156,6 @@
-                 "<p>For more information visit <b>http://jabref.sf.net/faq.php</b>.</p></html>");\r
-             pane.setEditable(false);\r
-             pane.setOpaque(false);\r
--            pane.putClientProperty(JEditorPane.HONOR_DISPLAY_PROPERTIES, Boolean.TRUE);\r
-             \r
-             JOptionPane.showMessageDialog(null, pane, "Insufficient Java Version Installed", JOptionPane.ERROR_MESSAGE);\r
-         }\r
diff --git a/debian/patches/antlr.patch b/debian/patches/antlr.patch
deleted file mode 100644 (file)
index 2d77f3a..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-Author: Gerardo Curiel <gerardo@sophie.gerardo.com.ve>
-Author: Philip Rinn <rinni@gmx.net>
-Description: Use antlr3 stable release API, missing ruleNestingLevel member on the antlr3 beta API
---- a/src/java/net/sf/jabref/bst/BstLexer.java
-+++ b/src/java/net/sf/jabref/bst/BstLexer.java
-@@ -9,8 +9,9 @@
- import org.antlr.runtime.NoViableAltException;
- import org.antlr.runtime.RecognitionException;
- import org.antlr.runtime.Token;
-+import org.antlr.codegen.*;
--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;
-@@ -43,6 +44,9 @@
-     public static final int IDLIST=4;
-     public static final int NUMERAL=22;
-     public static final int READ=13;
-+
-+    int ruleNestingLevel = 0;
-+
-     public BstLexer() {
-         
-     } 
-@@ -1661,4 +1665,4 @@
-  
--}
-\ No newline at end of file
-+}
diff --git a/debian/patches/build_xml.patch b/debian/patches/build_xml.patch
deleted file mode 100644 (file)
index 105a59a..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-Author: Gerardo Curiel <gerardo@sophie.gerardo.com.ve>
-Author: Philip Rinn <rinni@gmx.net>
-Description: Use debian libraries and disable unnecesary unjarlib target,
---- a/build.xml
-+++ b/build.xml
-@@ -85,7 +85,7 @@
-       <property name="help.dir" value="${src.dir}/help" />
-       <property name="extensions.dir" value="${src.dir}/extensions" />
-       <property name="layout.dir" value="${src.dir}/resource/layout" />
--      <property name="lib.dir" value="lib" />
-+      <property name="lib.dir" value="/usr/share/java" />
-       <property name="tests.dir" value="${src.dir}/tests" />
-       <property name="nsis.executable" value="makensis.exe"/>
-@@ -107,22 +107,22 @@
-       <fileset id="jarsFileset" dir="${lib.dir}">
-               <include name="antlr.jar" />
--              <include name="antlr-3.0b5.jar" />
--              <include name="looks-2.2.0.jar" />
--              <include name="forms-1.1.0.jar" />
-+              <include name="antlr3.jar" />
-+              <include name="looks.jar" />
-+              <include name="forms.jar" />
-               <include name="spin.jar" />
--              <include name="glazedlists-1.7.0_java15.jar" />
-+              <include name="glazedlists.jar" />
-               <include name="microba.jar" />
--              <include name="PDFBox-0.7.3-dev-reduced.jar" />
--              <include name="JempBox-0.2.0.jar" />
-+              <include name="pdfbox.jar" />
-+              <include name="jempbox.jar" />
-               <include name="zoom-java.jar" />
--      <include name="mysql-connector-java-5.0.7-bin.jar" />
-+      <include name="mysql-connector-java.jar" />
-         <!--<include name="substance-4.1.jar" />-->
-         <!-- Plugin runtime dependencies -->
--              <include name="plugin/JPFCodeGenerator-rt.jar" />
--              <include name="plugin/jpf.jar" />
--              <include name="plugin/jpf-boot.jar" />
--              <include name="plugin/commons-logging.jar" />
-+              <include name="JPFCodeGenerator-rt.jar" />
-+              <include name="jpf.jar" />
-+              <include name="jpf-boot.jar" />
-+              <include name="commons-logging.jar" />
-       </fileset>
-       <!-- Build classpath -->
-@@ -134,10 +134,10 @@
-       <!-- Classpath for running the code generator -->
-       <path id="codegenerator">
--              <pathelement location="${lib.dir}/plugin/JPFCodeGenerator.jar" />
--              <pathelement location="${lib.dir}/plugin/jpf.jar" />
--              <pathelement location="${lib.dir}/plugin/jpf-boot.jar" />
--              <pathelement location="${lib.dir}/plugin/velocity-dep-1.5.jar" />
-+              <pathelement location="${lib.dir}/JPFCodeGenerator.jar" />
-+              <pathelement location="${lib.dir}/jpf.jar" />
-+              <pathelement location="${lib.dir}/jpf-boot.jar" />
-+              <pathelement location="${lib.dir}/velocity-dep-1.5.jar" />
-       </path>
-       <!-- Classpath for tests -->
-@@ -217,7 +217,7 @@
-       </target>
-       <!-- Jars up project -->
--      <target name="jars" depends="build, unjarlib">
-+      <target name="jars" depends="build">
-               <mkdir dir="${build.lib}" />
-               <mkdir dir="${build.tmp}" />
-               <jar destfile="${build.lib}/${build.jar}">
-@@ -612,6 +612,6 @@
-               </jalopy>
-       </target>
--      <taskdef name="jarbundler" classpath="${lib.dir}/jarbundler-1.4.jar" classname="com.loomcom.ant.tasks.jarbundler.JarBundler" />
-+<!--  <taskdef name="jarbundler" classpath="${lib.dir}/jarbundler-1.4.jar" classname="com.loomcom.ant.tasks.jarbundler.JarBundler" /> -->
- </project>
diff --git a/debian/patches/free_javac.patch b/debian/patches/free_javac.patch
deleted file mode 100644 (file)
index ee4f3f3..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-Author: gregor herrmann <gregoa@debian.org>
-Author: Philip Rinn <rinni@gmx.net>
-Description: Changes to be able to compile JabRef with free java compilers.
---- a/src/java/net/sf/jabref/JabRef.java
-+++ b/src/java/net/sf/jabref/JabRef.java
-@@ -29,7 +29,6 @@
- import com.jgoodies.looks.FontSet;
- import com.jgoodies.looks.FontSets;
- import com.jgoodies.looks.plastic.Plastic3DLookAndFeel;
--import com.jgoodies.looks.windows.WindowsLookAndFeel;
- import gnu.dtools.ritopt.BooleanOption;
- import gnu.dtools.ritopt.Options;
- import gnu.dtools.ritopt.StringOption;
-@@ -610,27 +609,6 @@
-                     //Plastic3DLookAndFeel plLnf = (Plastic3DLookAndFeel) lnf;
-                 }
--                else if ((lnf != null) && (lnf instanceof WindowsLookAndFeel)) {
--
--                    // Set a "model" icon size, so menu items are evenly spaced even though
--                    // only some items have icons. We load an arbitrary icon and look at
--                    // its size to determine what size to use:
--                    int defaultIconSize = GUIGlobals.getImage("open").getIconWidth();
--                    com.jgoodies.looks.Options.setDefaultIconSize
--                        (new Dimension(defaultIconSize, defaultIconSize));
--
--                    if (overrideDefaultFonts) {
--                        FontSet fontSet = FontSets.createDefaultFontSet(
--                            new Font("Tahoma", Font.PLAIN, fontSizes),    // control font
--                            new Font("Tahoma", Font.PLAIN, fontSizes),    // menu font
--                            new Font("Tahoma", Font.BOLD, fontSizes)     // title font
--                            );
--                        FontPolicy fixedPolicy = FontPolicies.createFixedPolicy(fontSet);
--                        WindowsLookAndFeel.setFontPolicy(fixedPolicy);
--                    }
--
--                    //WindowsLookAndFeel plLnf = (WindowsLookAndFeel) lnf;
--                }
-                 if (lnf != null) {
-                     try {
diff --git a/debian/patches/preferences.patch b/debian/patches/preferences.patch
deleted file mode 100644 (file)
index 33fa720..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: gregor herrmann <gregoa@debian.org>
-Author: Philip Rinn <rinni@gmx.net>
-Description: Change some external applications.
---- a/src/java/net/sf/jabref/JabRefPreferences.java
-+++ b/src/java/net/sf/jabref/JabRefPreferences.java
-@@ -143,9 +143,9 @@
-             defaults.put("winEdtPath", "C:\\Program Files\\WinEdt Team\\WinEdt\\WinEdt.exe");
-             defaults.put("latexEditorPath", "C:\\Program Files\\LEd\\LEd.exe");
-         } else {
--                      defaults.put("pdfviewer", "evince");
-+                      defaults.put("pdfviewer", "xpdf");
-                       defaults.put("psviewer", "gv");
--                      defaults.put("htmlviewer", "firefox");
-+                      defaults.put("htmlviewer", "x-www-browser");
-                       defaults.put("lookAndFeel", "com.jgoodies.plaf.plastic.Plastic3DLookAndFeel");
-               }
-         defaults.put("useDefaultLookAndFeel", Boolean.TRUE);
index 69506c2..f61b552 100644 (file)
@@ -1,6 +1,6 @@
-build_xml.patch
-free_javac.patch
-HONOR_DISPLAY_PROPERTIES.patch
-preferences.patch
-antlr.patch
-BibtexEntry.patch
+01_free_javac.patch
+02_libs.patch
+03_external_apps.patch
+04_HONOR_DISPLAY_PROPERTIES.patch
+05_antlr.patch
+06_BibtexEntry.patch