refresh mrDlib_jayatana.patch
authorgregor herrmann <gregoa@debian.org>
Thu, 9 Jul 2015 17:15:59 +0000 (19:15 +0200)
committergregor herrmann <gregoa@debian.org>
Thu, 9 Jul 2015 17:15:59 +0000 (19:15 +0200)
almost applied, just one file failed but there ayatana is gone.

TODO: check mrdlib_removal branch in upstream git

Gbp-Dch: Ignore

debian/patches/mrDlib_jayatana.patch

index ead3d19..89da47f 100644 (file)
@@ -6,7 +6,7 @@ Origin: upstream git
 Forwarded: not-needed
 Author: Oliver Kopp <oliver.kopp@gmail.com>
 Reviewed-by: gregor herrmann <gregoa@debian.org>
 Forwarded: not-needed
 Author: Oliver Kopp <oliver.kopp@gmail.com>
 Reviewed-by: gregor herrmann <gregoa@debian.org>
-Last-Update: 2015-05-20
+Last-Update: 2015-07-09
 
 --- a/src/main/java/net/sf/jabref/ImportSettingsTab.java
 +++ b/src/main/java/net/sf/jabref/ImportSettingsTab.java
 
 --- a/src/main/java/net/sf/jabref/ImportSettingsTab.java
 +++ b/src/main/java/net/sf/jabref/ImportSettingsTab.java
@@ -85,37 +85,6 @@ Last-Update: 2015-05-20
                Globals.prefs.putInt(PREF_IMPORT_DEFAULT_PDF_IMPORT_STYLE, style);
                Globals.prefs.put(PREF_IMPORT_FILENAMEPATTERN, fileNamePattern.getText());
        }
                Globals.prefs.putInt(PREF_IMPORT_DEFAULT_PDF_IMPORT_STYLE, style);
                Globals.prefs.put(PREF_IMPORT_FILENAMEPATTERN, fileNamePattern.getText());
        }
---- a/src/main/java/net/sf/jabref/JabRefFrame.java
-+++ b/src/main/java/net/sf/jabref/JabRefFrame.java
-@@ -1,4 +1,4 @@
--/*  Copyright (C) 2003-2012 JabRef contributors.
-+/*  Copyright (C) 2003-2011 JabRef contributors.
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; either version 2 of the License, or
-@@ -39,8 +39,6 @@
- import javax.swing.event.ChangeEvent;
- import javax.swing.event.ChangeListener;
--import org.java.ayatana.ApplicationMenu;
--
- import net.sf.jabref.export.*;
- import net.sf.jabref.external.ExternalFileTypeEditor;
- import net.sf.jabref.external.PushToApplicationButton;
-@@ -578,13 +576,6 @@
-                 }
-             }
-         });
--
--        // The following sets up integration with Unity's global menu, but currently (Nov 18, 2012)
--        // this doesn't work with OpenJDK 6 (leads to crash), only with 7.
--        String javaVersion = System.getProperty("java.version", null);
--        if (javaVersion.compareTo("1.7") >= 0)
--            ApplicationMenu.tryInstall(this);
--
-     }
-     public void setWindowTitle() {
 --- a/src/main/java/spl/PdfImporter.java
 +++ b/src/main/java/spl/PdfImporter.java
 @@ -19,12 +19,8 @@
 --- a/src/main/java/spl/PdfImporter.java
 +++ b/src/main/java/spl/PdfImporter.java
 @@ -19,12 +19,8 @@