[davmail] 01/01: cleanup no-osx-tray patch file which has 2 instances in patch dir

[Alexandre Rossi]

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

niol-guest pushed a commit to branch master
in repository davmail.

commit e5da07cef9f4bee6313859d3a1d69caf90ad9bac
Author: Alexandre Rossi <alexandre.rossi at gmail.com>
Date:   Mon Dec 2 12:18:47 2013 +0100

    cleanup no-osx-tray patch file which has 2 instances in patch dir
---
 debian/patches/0002-no-osx-tray.patch |  6 ++---
 debian/patches/no-osx-tray            | 49 -----------------------------------
 2 files changed, 3 insertions(+), 52 deletions(-)

diff --git a/debian/patches/0002-no-osx-tray.patch b/debian/patches/0002-no-osx-tray.patch
index c9d4108..e282186 100644
--- a/debian/patches/0002-no-osx-tray.patch
+++ b/debian/patches/0002-no-osx-tray.patch
@@ -1,6 +1,6 @@
-From: Alexandre Rossi <alexandre.rossi at gmail.com>
-Date: Sat, 13 Apr 2013 02:50:33 +0200
-Subject: no-osx-tray
+Description: Remove OSX specific code.
+Forwarded: not-needed
+Author: Alexandre Rossi <alexandre.rossi at gmail.com>
 
 ---
  build.xml                                    |    3 ++-
diff --git a/debian/patches/no-osx-tray b/debian/patches/no-osx-tray
deleted file mode 100644
index b454e40..0000000
--- a/debian/patches/no-osx-tray
+++ /dev/null
@@ -1,49 +0,0 @@
-Description: Remove OSX specific code.
-Forwarded: not-needed
-Author: Alexandre Rossi <alexandre.rossi at gmail.com>
-
-Index: davmail.git/src/java/davmail/ui/tray/DavGatewayTray.java
-===================================================================
---- davmail.git.orig/src/java/davmail/ui/tray/DavGatewayTray.java	2012-10-01 13:58:35.060654788 +0200
-+++ davmail.git/src/java/davmail/ui/tray/DavGatewayTray.java	2012-10-01 13:58:50.939810662 +0200
-@@ -240,11 +240,7 @@
-             if (davGatewayTray == null) {
-                 try {
-                     if (SystemTray.isSupported()) {
--                        if (isOSX()) {
--                            davGatewayTray = new OSXAwtGatewayTray();
--                        } else {
--                            davGatewayTray = new AwtGatewayTray();
--                        }
-+                        davGatewayTray = new AwtGatewayTray();
-                         davGatewayTray.init();
-                     }
-                 } catch (NoClassDefFoundError e) {
-@@ -252,12 +248,7 @@
-                 }
-             }
-             if (davGatewayTray == null) {
--                if (isOSX()) {
--                    // MacOS
--                    davGatewayTray = new OSXFrameGatewayTray();
--                } else {
--                    davGatewayTray = new FrameGatewayTray();
--                }
-+                davGatewayTray = new FrameGatewayTray();
-                 davGatewayTray.init();
-             }
-         }
-Index: davmail.git/build.xml
-===================================================================
---- davmail.git.orig/build.xml	2012-10-01 13:58:42.156277589 +0200
-+++ davmail.git/build.xml	2012-10-01 13:58:50.959809598 +0200
-@@ -61,7 +61,8 @@
-     <target name="compile" depends="init">
-         <mkdir dir="target/classes"/>
-         <javac srcdir="src/java" destdir="target/classes" source="1.5" target="1.5" debug="on" encoding="UTF-8"
--               excludes="davmail/service/DavService.java"
-+               excludes="davmail/service/DavService.java,
-+                         davmail/ui/tray/OSXAwtGatewayTray.java"
-                includeantruntime="false">
-             <classpath>
-                 <path refid="classpath"/>

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