[davmail] 03/06: Refresh patches

[Alexandre Rossi]

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

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

commit e5cacf455b5d8bef867ff9c1328195fc18df9ae1
Author: Alexandre Rossi <alexandre.rossi at gmail.com>
Date:   Fri Jun 9 06:24:16 2017 +0200

    Refresh patches
---
 debian/patches/0001-no-windows-service.patch       |  8 +++--
 debian/patches/0002-no-osx-tray.patch              | 14 +++++----
 ...0004-Set-classpath-add-target-davmail-lib.patch | 35 ++++++++++++----------
 3 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/debian/patches/0001-no-windows-service.patch b/debian/patches/0001-no-windows-service.patch
index 4daeadc..49c12ab 100644
--- a/debian/patches/0001-no-windows-service.patch
+++ b/debian/patches/0001-no-windows-service.patch
@@ -6,9 +6,11 @@ Subject: Avoid winrun4j build dependency
  build.xml |    1 +
  1 file changed, 1 insertion(+)
 
---- a/build.xml
-+++ b/build.xml
-@@ -72,6 +72,7 @@
+Index: davmail.git/build.xml
+===================================================================
+--- davmail.git.orig/build.xml
++++ davmail.git/build.xml
+@@ -75,6 +75,7 @@
      <target name="compile" depends="init">
          <mkdir dir="target/classes"/>
          <javac srcdir="src/java" destdir="target/classes" source="1.6" target="1.6" debug="on" encoding="UTF-8"
diff --git a/debian/patches/0002-no-osx-tray.patch b/debian/patches/0002-no-osx-tray.patch
index 2490dde..239112d 100644
--- a/debian/patches/0002-no-osx-tray.patch
+++ b/debian/patches/0002-no-osx-tray.patch
@@ -7,9 +7,11 @@ Author: Alexandre Rossi <alexandre.rossi at gmail.com>
  src/java/davmail/ui/tray/DavGatewayTray.java |   13 ++-----------
  2 files changed, 4 insertions(+), 12 deletions(-)
 
---- a/build.xml
-+++ b/build.xml
-@@ -72,7 +72,8 @@
+Index: davmail.git/build.xml
+===================================================================
+--- davmail.git.orig/build.xml
++++ davmail.git/build.xml
+@@ -75,7 +75,8 @@
      <target name="compile" depends="init">
          <mkdir dir="target/classes"/>
          <javac srcdir="src/java" destdir="target/classes" source="1.6" target="1.6" debug="on" encoding="UTF-8"
@@ -19,8 +21,10 @@ Author: Alexandre Rossi <alexandre.rossi at gmail.com>
                 includeantruntime="false">
              <classpath>
                  <path refid="classpath"/>
---- a/src/java/davmail/ui/tray/DavGatewayTray.java
-+++ b/src/java/davmail/ui/tray/DavGatewayTray.java
+Index: davmail.git/src/java/davmail/ui/tray/DavGatewayTray.java
+===================================================================
+--- davmail.git.orig/src/java/davmail/ui/tray/DavGatewayTray.java
++++ davmail.git/src/java/davmail/ui/tray/DavGatewayTray.java
 @@ -258,11 +258,7 @@ public final class DavGatewayTray {
                  if (davGatewayTray == null) {
                      try {
diff --git a/debian/patches/0004-Set-classpath-add-target-davmail-lib.patch b/debian/patches/0004-Set-classpath-add-target-davmail-lib.patch
index 777eae7..ecabba4 100644
--- a/debian/patches/0004-Set-classpath-add-target-davmail-lib.patch
+++ b/debian/patches/0004-Set-classpath-add-target-davmail-lib.patch
@@ -10,31 +10,34 @@ Index: davmail.git/build.xml
 ===================================================================
 --- davmail.git.orig/build.xml
 +++ davmail.git/build.xml
-@@ -3,10 +3,19 @@
-     <property name="version" value="4.7.3"/>
+@@ -3,13 +3,19 @@
+     <property name="version" value="4.8.0"/>
  
      <path id="classpath">
 -        <pathelement location="classes"/>
 -        <fileset dir="lib">
 -            <include name="*.jar"/>
+-            <!-- make sure we compile with swt gtk 64 -->
+-            <exclude name="swt-*-x86.jar"/>
+-            <exclude name="swt-*-win32-*.jar"/>
 -        </fileset>
-+        <pathelement location="${commons-codec}" />

-+        <pathelement location="${servlet-api}" />

-+        <pathelement location="${commons-httpclient}" />

-+        <pathelement location="${htmlcleaner}" />

-+        <pathelement location="${mail}" />

-+        <pathelement location="${jcifs}" />

-+        <pathelement location="${jackrabbit-webdav}" />

-+        <pathelement location="${woodstox-core}" />

-+        <pathelement location="${stax2-api}" />

-+        <pathelement location="${swt}" />

-+        <pathelement location="${slf4j-api}" />

-+        <pathelement location="${slf4j-simple}" />

-+        <pathelement location="${log4j}" />

++        <pathelement location="${commons-codec}" />
++        <pathelement location="${servlet-api}" />
++        <pathelement location="${commons-httpclient}" />
++        <pathelement location="${htmlcleaner}" />
++        <pathelement location="${mail}" />
++        <pathelement location="${jcifs}" />
++        <pathelement location="${jackrabbit-webdav}" />
++        <pathelement location="${woodstox-core}" />
++        <pathelement location="${stax2-api}" />
++        <pathelement location="${swt}" />
++        <pathelement location="${slf4j-api}" />
++        <pathelement location="${slf4j-simple}" />
++        <pathelement location="${log4j}" />
      </path>
  
      <target name="clean">
-@@ -248,28 +257,7 @@
+@@ -286,28 +292,7 @@
          <mkdir dir="dist"/>
          <property name="release-name" value="${release}-trunk"/>
          <pathconvert property="manifest-classpath" pathsep=" ">

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