From: gregor herrmann <gregoa@debian.org>
Date: Fri, 29 Mar 2013 19:46:09 +0000 (+0100)
Subject: refresh patch again
X-Git-Tag: debian/2.10.beta1+ds-1~7
X-Git-Url: http://git.toastfreeware.priv.at/debian/jabref.git/commitdiff_plain/46aff8029f9b4698e46050c4702942d1c008eb9a?ds=inline

refresh patch again

Git-Dch: Ignore
---

diff --git a/debian/patches/mrDlib_jayatana.patch b/debian/patches/mrDlib_jayatana.patch
index dcd1030..c241330 100644
--- a/debian/patches/mrDlib_jayatana.patch
+++ b/debian/patches/mrDlib_jayatana.patch
@@ -1,4 +1,4 @@
-Description: This is the diff between the debian branch and the beta_2.10 branch
+Description: This is the diff between the debian branch and the v_2.10b tag
  in upstream git; the debian branch was created for us with the purpose to
  disable the mrDlib functionality which needs libraries not packaged in
  Debian yet.
@@ -562,7 +562,7 @@ Last-Update: 2013-03-29
 -}
 --- a/src/java/spl/PdfImporter.java
 +++ b/src/java/spl/PdfImporter.java
-@@ -18,11 +18,8 @@
+@@ -18,12 +18,8 @@
  import net.sf.jabref.undo.UndoableInsertEntry;
  import net.sf.jabref.util.XMPUtil;
  
@@ -571,10 +571,11 @@ Last-Update: 2013-03-29
  import spl.filter.PdfFileFilter;
  import spl.gui.ImportDialog;
 -import spl.gui.MetaDataListDialog;
- 
+-
  
  /**
-@@ -101,7 +98,6 @@
+  * Created by IntelliJ IDEA.
+@@ -101,7 +97,6 @@
              	BibtexEntryType type;
                  InputStream in = null;
                  List<BibtexEntry> res = null;
@@ -582,7 +583,7 @@ Last-Update: 2013-03-29
                  switch (choice) {
      			case ImportDialog.XMP:
                      //SplDatabaseChangeListener dataListener = new SplDatabaseChangeListener(frame, panel, entryTable, fileName);
-@@ -188,84 +184,9 @@
+@@ -188,84 +183,9 @@
                          panel.adjustSplitter();
                      }
                      break;
@@ -667,7 +668,7 @@ Last-Update: 2013-03-29
                  }
              }
  
-@@ -283,58 +204,6 @@
+@@ -283,58 +203,6 @@
          }
      }