refresh patch again

Git-Dch: Ignore

diff --git a/debian/patches/mrDlib_jayatana.patch b/debian/patches/mrDlib_jayatana.patch
index dcd1030..c241330 100644 (file)
--- 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.
  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
 -}\r
 --- a/src/java/spl/PdfImporter.java
 +++ b/src/java/spl/PdfImporter.java
 -}\r
 --- 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;\r
  import net.sf.jabref.util.XMPUtil;\r
  \r
  import net.sf.jabref.undo.UndoableInsertEntry;\r
  import net.sf.jabref.util.XMPUtil;\r
  \r


@@ -571,10 +571,11 @@ Last-Update: 2013-03-29
  import spl.filter.PdfFileFilter;\r
  import spl.gui.ImportDialog;\r
 -import spl.gui.MetaDataListDialog;\r
  import spl.filter.PdfFileFilter;\r
  import spl.gui.ImportDialog;\r
 -import spl.gui.MetaDataListDialog;\r

- \r
+-\r

  \r
  /**\r
  \r
  /**\r

-@@ -101,7 +98,6 @@
+  * Created by IntelliJ IDEA.\r
+@@ -101,7 +97,6 @@

                BibtexEntryType type;\r
                  InputStream in = null;\r
                  List<BibtexEntry> res = null;\r
                BibtexEntryType type;\r
                  InputStream in = null;\r
                  List<BibtexEntry> res = null;\r


@@ -582,7 +583,7 @@ Last-Update: 2013-03-29
                  switch (choice) {\r
                        case ImportDialog.XMP:\r
                      //SplDatabaseChangeListener dataListener = new SplDatabaseChangeListener(frame, panel, entryTable, fileName);\r
                  switch (choice) {\r
                        case ImportDialog.XMP:\r
                      //SplDatabaseChangeListener dataListener = new SplDatabaseChangeListener(frame, panel, entryTable, fileName);\r

-@@ -188,84 +184,9 @@
+@@ -188,84 +183,9 @@

                          panel.adjustSplitter();\r
                      }\r
                      break;\r
                          panel.adjustSplitter();\r
                      }\r
                      break;\r


@@ -667,7 +668,7 @@ Last-Update: 2013-03-29
                  }\r
              }\r
  \r
                  }\r
              }\r
  \r

-@@ -283,58 +204,6 @@
+@@ -283,58 +203,6 @@

          }\r
      }\r
  \r
          }\r
      }\r
  \r