Refresh patches.
authorgregor herrmann <gregoa@debian.org>
Fri, 29 Mar 2013 16:45:39 +0000 (17:45 +0100)
committergregor herrmann <gregoa@debian.org>
Fri, 29 Mar 2013 16:52:29 +0000 (17:52 +0100)
debian/patches/debian_libs.patch
debian/patches/mrDlib_jayatana.patch

index e1e4ab3..a345089 100644 (file)
@@ -96,16 +96,16 @@ Last-Update: 2013-01-01
        </path>
  
        <!-- Classpath for tests -->
-@@ -239,7 +244,7 @@
+@@ -238,7 +243,7 @@
        </target>
  
        <!-- Jars up project -->
 -      <target name="jars" depends="build, unjarlib">
 +      <target name="jars" depends="build">
                <mkdir dir="${build.lib}" />
-         
                <mkdir dir="${build.tmp}" />
-@@ -645,8 +650,6 @@
+@@ -644,8 +649,6 @@
                </jalopy>
        </target>
  
index d3d9234..dcd1030 100644 (file)
@@ -1,4 +1,4 @@
-Description: This is the diff between the debian branch and the v_2.9b2 tag
+Description: This is the diff between the debian branch and the beta_2.10 branch
  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.
@@ -6,7 +6,7 @@ Origin: upstream git
 Forwarded: not-needed
 Author: Oliver Kopp <oliver.kopp@gmail.com>
 Reviewed-by: gregor herrmann <gregoa@debian.org>
-Last-Update: 2013-01-01
+Last-Update: 2013-03-29
 
 --- a/.classpath
 +++ b/.classpath
@@ -136,7 +136,7 @@ Last-Update: 2013-01-01
  import net.sf.jabref.export.*;
  import net.sf.jabref.external.ExternalFileTypeEditor;
  import net.sf.jabref.external.PushToApplicationButton;
-@@ -551,13 +549,6 @@
+@@ -562,13 +560,6 @@
                  }
              }
          });
@@ -562,7 +562,7 @@ Last-Update: 2013-01-01
 -}\r
 --- a/src/java/spl/PdfImporter.java
 +++ b/src/java/spl/PdfImporter.java
-@@ -21,15 +21,9 @@
+@@ -18,11 +18,8 @@
  import net.sf.jabref.undo.UndoableInsertEntry;\r
  import net.sf.jabref.util.XMPUtil;\r
  \r
@@ -572,13 +572,9 @@ Last-Update: 2013-01-01
  import spl.gui.ImportDialog;\r
 -import spl.gui.MetaDataListDialog;\r
  \r
--import java.util.ArrayList;\r
--import java.util.Arrays;\r
--import java.util.List;\r
- import java.util.Set;\r
\r
  \r
-@@ -113,7 +107,6 @@
+ /**\r
+@@ -101,7 +98,6 @@
                BibtexEntryType type;\r
                  InputStream in = null;\r
                  List<BibtexEntry> res = null;\r
@@ -586,7 +582,7 @@ Last-Update: 2013-01-01
                  switch (choice) {\r
                        case ImportDialog.XMP:\r
                      //SplDatabaseChangeListener dataListener = new SplDatabaseChangeListener(frame, panel, entryTable, fileName);\r
-@@ -200,84 +193,9 @@
+@@ -188,84 +184,9 @@
                          panel.adjustSplitter();\r
                      }\r
                      break;\r
@@ -671,7 +667,7 @@ Last-Update: 2013-01-01
                  }\r
              }\r
  \r
-@@ -295,58 +213,6 @@
+@@ -283,58 +204,6 @@
          }\r
      }\r
  \r