[jabref] 397/459: Refresh patches.

[gregor herrmann]

This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch master
in repository jabref.

commit fe37a8efc611b537aef1b0e16727a009bfc635ef
Author: gregor herrmann <gregoa at debian.org>
Date:   Fri Mar 29 17:45:39 2013 +0100

    Refresh patches.
---
 debian/patches/debian_libs.patch     |  6 +++---
 debian/patches/mrDlib_jayatana.patch | 20 ++++++++------------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/debian/patches/debian_libs.patch b/debian/patches/debian_libs.patch
index e1e4ab3..a345089 100644
--- a/debian/patches/debian_libs.patch
+++ b/debian/patches/debian_libs.patch
@@ -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>
  
diff --git a/debian/patches/mrDlib_jayatana.patch b/debian/patches/mrDlib_jayatana.patch
index d3d9234..dcd1030 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 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 at gmail.com>
 Reviewed-by: gregor herrmann <gregoa at 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
 -}
 --- 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;
  import net.sf.jabref.util.XMPUtil;
  
@@ -572,13 +572,9 @@ Last-Update: 2013-01-01
  import spl.gui.ImportDialog;
 -import spl.gui.MetaDataListDialog;
  
--import java.util.ArrayList;
--import java.util.Arrays;
--import java.util.List;
- import java.util.Set;
- 
  
-@@ -113,7 +107,6 @@
+ /**
+@@ -101,7 +98,6 @@
              	BibtexEntryType type;
                  InputStream in = null;
                  List<BibtexEntry> res = null;
@@ -586,7 +582,7 @@ Last-Update: 2013-01-01
                  switch (choice) {
      			case ImportDialog.XMP:
                      //SplDatabaseChangeListener dataListener = new SplDatabaseChangeListener(frame, panel, entryTable, fileName);
-@@ -200,84 +193,9 @@
+@@ -188,84 +184,9 @@
                          panel.adjustSplitter();
                      }
                      break;
@@ -671,7 +667,7 @@ Last-Update: 2013-01-01
                  }
              }
  
-@@ -295,58 +213,6 @@
+@@ -283,58 +204,6 @@
          }
      }
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jabref.git