refresh patches 03_external_apps.patch and 06_BibtexEntry.patch

diff --git a/debian/changelog b/debian/changelog
index 7d06f8b..d439d71 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ jabref (2.6~beta3+dfsg-1) UNRELEASED; urgency=low
     - adjust debian/copyright accordingly
     - remove patches 07_PreviewPanel.patch and 08_HighlightFilter.patch,
       applied upstream
+    - refresh patches 03_external_apps.patch and 06_BibtexEntry.patch
 
  -- gregor herrmann <gregoa@debian.org>  Mon, 08 Mar 2010 17:31:33 +0100
 

diff --git a/debian/patches/03_external_apps.patch b/debian/patches/03_external_apps.patch
index 33fa720..50aff91 100644 (file)
--- a/debian/patches/03_external_apps.patch
+++ b/debian/patches/03_external_apps.patch
@@ -3,9 +3,9 @@ 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");
+@@ -147,9 +147,9 @@
+             defaults.put("fontFamily", "Arial");
+ 
          } else {
 -                      defaults.put("pdfviewer", "evince");
 +                      defaults.put("pdfviewer", "xpdf");
@@ -13,5 +13,5 @@ Description: Change some external applications.
 -                      defaults.put("htmlviewer", "firefox");
 +                      defaults.put("htmlviewer", "x-www-browser");
                        defaults.put("lookAndFeel", "com.jgoodies.plaf.plastic.Plastic3DLookAndFeel");
-               }
-         defaults.put("useDefaultLookAndFeel", Boolean.TRUE);
+             defaults.put("fontFamily", "SansSerif");
+ 

diff --git a/debian/patches/06_BibtexEntry.patch b/debian/patches/06_BibtexEntry.patch
index 80669ae..440cd0e 100644 (file)
--- a/debian/patches/06_BibtexEntry.patch
+++ b/debian/patches/06_BibtexEntry.patch
@@ -40,7 +40,7 @@ Description: Fixing incompatible types
  
 --- a/src/java/net/sf/jabref/gui/SearchResultsDialog.java
 +++ b/src/java/net/sf/jabref/gui/SearchResultsDialog.java
-@@ -166,7 +166,7 @@
+@@ -174,7 +174,7 @@
      @SuppressWarnings("unchecked")
      protected void setupComparatorChooser(TableComparatorChooser<BibtexEntry> comparatorChooser) {
          // First column: