This is an automated email from the git hooks/post-receive script. gregoa pushed a commit to branch master in repository jabref.
commit 46aff8029f9b4698e46050c4702942d1c008eb9a Author: gregor herrmann <[email protected]> Date: Fri Mar 29 20:46:09 2013 +0100 refresh patch again Git-Dch: Ignore --- debian/patches/mrDlib_jayatana.patch | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) 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 @@ } } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jabref.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
