[davmail] 01/20: debian/patches: refresh patches
Alexandre Rossi
alexandre.rossi at gmail.com
Tue Nov 1 08:54:23 UTC 2016
This is an automated email from the git hooks/post-receive script.
niol-guest pushed a commit to branch master
in repository davmail.
commit 8810b936bd7b003cd24c175dcf60548496e0fbb7
Author: Antonio Ospite <ao2 at ao2.it>
Date: Thu Oct 20 10:20:56 2016 +0200
debian/patches: refresh patches
---
debian/patches/0001-no-windows-service.patch | 6 +--
debian/patches/0002-no-osx-tray.patch | 38 ++++++++----------
...0004-Set-classpath-add-target-davmail-lib.patch | 45 ++++++++++++----------
...ding-line-from-desktop-file-to-make-linti.patch | 6 +--
4 files changed, 46 insertions(+), 49 deletions(-)
diff --git a/debian/patches/0001-no-windows-service.patch b/debian/patches/0001-no-windows-service.patch
index 3894072..4daeadc 100644
--- a/debian/patches/0001-no-windows-service.patch
+++ b/debian/patches/0001-no-windows-service.patch
@@ -6,14 +6,12 @@ Subject: Avoid winrun4j build dependency
build.xml | 1 +
1 file changed, 1 insertion(+)
-diff --git a/build.xml b/build.xml
-index 5fec007..ff23d1e 100644
--- a/build.xml
+++ b/build.xml
-@@ -69,6 +69,7 @@
+@@ -72,6 +72,7 @@
<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"
+ <javac srcdir="src/java" destdir="target/classes" source="1.6" target="1.6" debug="on" encoding="UTF-8"
+ excludes="davmail/service/DavService.java"
includeantruntime="false">
<classpath>
diff --git a/debian/patches/0002-no-osx-tray.patch b/debian/patches/0002-no-osx-tray.patch
index e282186..2490dde 100644
--- a/debian/patches/0002-no-osx-tray.patch
+++ b/debian/patches/0002-no-osx-tray.patch
@@ -7,40 +7,36 @@ Author: Alexandre Rossi <alexandre.rossi at gmail.com>
src/java/davmail/ui/tray/DavGatewayTray.java | 13 ++-----------
2 files changed, 4 insertions(+), 12 deletions(-)
-diff --git a/build.xml b/build.xml
-index ff23d1e..89bd6dd 100644
--- a/build.xml
+++ b/build.xml
-@@ -69,7 +69,8 @@
+@@ -72,7 +72,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"
+ <javac srcdir="src/java" destdir="target/classes" source="1.6" target="1.6" 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"/>
-diff --git a/src/java/davmail/ui/tray/DavGatewayTray.java b/src/java/davmail/ui/tray/DavGatewayTray.java
-index cff867b..13e7029 100644
--- a/src/java/davmail/ui/tray/DavGatewayTray.java
+++ b/src/java/davmail/ui/tray/DavGatewayTray.java
-@@ -240,11 +240,7 @@ public final class DavGatewayTray {
- 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 @@ public final class DavGatewayTray {
- }
+@@ -258,11 +258,7 @@ public final class DavGatewayTray {
+ if (davGatewayTray == null) {
+ try {
+ if (SystemTray.isSupported()) {
+- if (isOSX()) {
+- davGatewayTray = new OSXAwtGatewayTray();
+- } else {
+- davGatewayTray = new AwtGatewayTray();
+- }
++ davGatewayTray = new AwtGatewayTray();
+ davGatewayTray.init();
+ }
+ } catch (NoClassDefFoundError e) {
+@@ -272,12 +268,7 @@ public final class DavGatewayTray {
}
+
if (davGatewayTray == null) {
- if (isOSX()) {
- // MacOS
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 3989969..fb095c3 100644
--- a/debian/patches/0004-Set-classpath-add-target-davmail-lib.patch
+++ b/debian/patches/0004-Set-classpath-add-target-davmail-lib.patch
@@ -3,15 +3,13 @@ Date: Sat, 13 Apr 2013 00:51:23 +0200
Subject: Set classpath, add target davmail-lib
---
- build.xml | 43 ++++++++++++++++---------------------------
- 1 file changed, 16 insertions(+), 27 deletions(-)
+ build.xml | 45 ++++++++++++++++-----------------------------
+ 1 file changed, 16 insertions(+), 29 deletions(-)
-Index: davmail.git/build.xml
-===================================================================
---- davmail.git.orig/build.xml 2014-01-11 20:18:54.896869323 +0100
-+++ davmail.git/build.xml 2014-01-11 20:43:03.480939431 +0100
+--- a/build.xml
++++ b/build.xml
@@ -3,10 +3,18 @@
- <property name="version" value="4.4.0"/>
+ <property name="version" value="4.7.2"/>
<path id="classpath">
- <pathelement location="classes"/>
@@ -33,16 +31,15 @@ Index: davmail.git/build.xml
</path>
<target name="clean">
-@@ -282,34 +290,13 @@
- </target>
+@@ -243,33 +251,12 @@
+ </target>
-- <target name="dist" depends="compile">
+- <target name="jar" depends="compile">
+ <target name="davmail-lib" depends="compile">
- <property name="release-name" value="${release}-trunk"/>
<delete dir="dist"/>
<mkdir dir="dist"/>
- <echo file="dist/version.txt" message="${release}"/>
+ <property name="release-name" value="${release}-trunk"/>
<pathconvert property="manifest-classpath" pathsep=" ">
- <mapper>
- <chainedmapper>
@@ -66,17 +63,25 @@ Index: davmail.git/build.xml
- <exclude name="winrun4j-*.jar"/>
- </fileset>
- </path>
-+ <path refid="classpath"/>
++ <path refid="classpath"/>
</pathconvert>
<jar basedir="target/classes" destfile="dist/davmail.jar">
<manifest>
-@@ -322,6 +309,9 @@
- </section>
- </manifest>
+@@ -284,7 +271,7 @@
</jar>
-+ </target>
-+
-+ <target name="dist" depends="compile, davmail-lib">
+ </target>
+
+- <target name="prepare-dist" depends="jar">
++ <target name="prepare-dist" depends="davmail-lib">
+ <echo file="dist/version.txt" message="${release}"/>
<copy todir="dist/lib">
<fileset dir="lib">
- <include name="*.jar"/>
+@@ -487,7 +474,7 @@
+ </fileset>
+ </concat>
+ </target>
+- <target name="debupload" depends="jar">
++ <target name="debupload" depends="davmail-lib">
+ <scp todir="testuser at 192.168.11.164:/home/testuser" password="Passw0rd" verbose="true" trust="true">
+ <fileset file="dist/davmail.jar"/>
+ </scp>
diff --git a/debian/patches/0005-Remove-Encoding-line-from-desktop-file-to-make-linti.patch b/debian/patches/0005-Remove-Encoding-line-from-desktop-file-to-make-linti.patch
index 637ec18..ed3fec7 100644
--- a/debian/patches/0005-Remove-Encoding-line-from-desktop-file-to-make-linti.patch
+++ b/debian/patches/0005-Remove-Encoding-line-from-desktop-file-to-make-linti.patch
@@ -6,10 +6,8 @@ Subject: Remove Encoding: line from desktop file to make lintian happy
davmail.desktop | 1 -
1 file changed, 1 deletion(-)
-Index: davmail.git/davmail.desktop
-===================================================================
---- davmail.git.orig/davmail.desktop 2013-10-31 14:52:49.433221378 +0100
-+++ davmail.git/davmail.desktop 2013-10-31 14:52:49.429221379 +0100
+--- a/davmail.desktop
++++ b/davmail.desktop
@@ -1,6 +1,5 @@
[Desktop Entry]
Version=1.0
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/davmail.git
More information about the pkg-java-commits
mailing list