On Fri, 21 Oct 2016 16:29:52 +0200
Alexandre Rossi <alexandre.ro...@gmail.com> wrote:
> Hi,
>
> > Let me know if you intend to import the latest upstream release before
> > I put more effort into it, of if you want me to already send the couple
> > of patches I have against the current repository.
>
> I've imported the latest upstream. Please send or push the patches you have.
>
Upstream is looking at the "no-headers" issue, but in the meantime we
can finish the packaging work.
I am attaching a single patch which contains multiple commits, you can
import all the commits with a single invocation of "git am" on top of
the current master branch.
With these changes applied the package builds fine in pbuilder, passes
the lintian checks and the cme checks, gives no issues with "adequate",
and installs/purges cleanly in piuparts.
You can update the changelog automatically with this command:
$ gbp dch --auto -- debian/
but if you start using "gbp dch" make sure to put the following line in
the commit message when you commit the changes to debian/changelog:
Gbp-Dch: ignore
This way the next time you run "gbp dch" you won't have the updates to
debian/changelog listed in debian/changelog.
Thanks,
Antonio
--
Antonio Ospite
https://ao2.it
https://twitter.com/ao2it
A: Because it messes up the order in which people normally read text.
See http://en.wikipedia.org/wiki/Posting_style
Q: Why is top-posting such a bad thing?
>From 3b4c8c1d9ed71ccb3666d740172b8f5049563e44 Mon Sep 17 00:00:00 2001
From: Antonio Ospite <a...@ao2.it>
Date: Thu, 20 Oct 2016 10:20:56 +0200
Subject: [PATCH 01/19] debian/patches: refresh patches
X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM<pyWR#k60!#=#>/Vb;]yA5<GWI5`6u&+
;6b'@y|8w"wB;4/e!7wYYrcqdJFY,~%Gk_4]cq$Ei/7<j&N3ah(m`ku?pX.&+~:_/wC~dwn^)MizBG
!pE^+iDQQ1yC6^,)YDKkxDd!T>\I~93>J<_`<4)A{':UrE
---
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.ro...@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@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
--
2.10.1
>From 6a8de30fcac7c2df11f56ec14d8286bd462c2558 Mon Sep 17 00:00:00 2001
From: Antonio Ospite <a...@ao2.it>
Date: Sat, 29 Oct 2016 18:26:51 +0200
Subject: [PATCH 02/19] debian/patches: simplify
0004-Set-classpath-add-target-davmail-lib.patch
X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM<pyWR#k60!#=#>/Vb;]yA5<GWI5`6u&+
;6b'@y|8w"wB;4/e!7wYYrcqdJFY,~%Gk_4]cq$Ei/7<j&N3ah(m`ku?pX.&+~:_/wC~dwn^)MizBG
!pE^+iDQQ1yC6^,)YDKkxDd!T>\I~93>J<_`<4)A{':UrE
Upstream now has a target to build just the jar, use it.
---
...0004-Set-classpath-add-target-davmail-lib.patch | 30 +++-------------------
debian/rules | 2 +-
2 files changed, 4 insertions(+), 28 deletions(-)
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 fb095c3..7fcea51 100644
--- a/debian/patches/0004-Set-classpath-add-target-davmail-lib.patch
+++ b/debian/patches/0004-Set-classpath-add-target-davmail-lib.patch
@@ -3,8 +3,8 @@ Date: Sat, 13 Apr 2013 00:51:23 +0200
Subject: Set classpath, add target davmail-lib
---
- build.xml | 45 ++++++++++++++++-----------------------------
- 1 file changed, 16 insertions(+), 29 deletions(-)
+ build.xml | 39 +++++++++++++--------------------------
+ 1 file changed, 13 insertions(+), 26 deletions(-)
--- a/build.xml
+++ b/build.xml
@@ -31,13 +31,7 @@ Subject: Set classpath, add target davmail-lib
</path>
<target name="clean">
-@@ -243,33 +251,12 @@
-
- </target>
-
-- <target name="jar" depends="compile">
-+ <target name="davmail-lib" depends="compile">
- <delete dir="dist"/>
+@@ -248,28 +256,7 @@
<mkdir dir="dist"/>
<property name="release-name" value="${release}-trunk"/>
<pathconvert property="manifest-classpath" pathsep=" ">
@@ -67,21 +61,3 @@ Subject: Set classpath, add target davmail-lib
</pathconvert>
<jar basedir="target/classes" destfile="dist/davmail.jar">
<manifest>
-@@ -284,7 +271,7 @@
- </jar>
- </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">
-@@ -487,7 +474,7 @@
- </fileset>
- </concat>
- </target>
-- <target name="debupload" depends="jar">
-+ <target name="debupload" depends="davmail-lib">
- <scp todir="testuser@192.168.11.164:/home/testuser" password="Passw0rd" verbose="true" trust="true">
- <fileset file="dist/davmail.jar"/>
- </scp>
diff --git a/debian/rules b/debian/rules
index bbe52c5..e162019 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,5 +11,5 @@ export DH_OPTIONS
dh $@ --with javahelper
override_dh_auto_build:
- ANT_OPTS=-Dfile.encoding=UTF-8 ant -propertyfile debian/ant.properties davmail-lib
+ ANT_OPTS=-Dfile.encoding=UTF-8 ant -propertyfile debian/ant.properties jar
cp -a src/java/tray48.png dist/davmail.png
--
2.10.1
>From bd5846288fc65124ba53d5dcb9999e3ec11ab535 Mon Sep 17 00:00:00 2001
From: Antonio Ospite <a...@ao2.it>
Date: Thu, 20 Oct 2016 11:15:24 +0200
Subject: [PATCH 03/19] debian/control: depend on libservlet3.0-java instead of
libservlet2.4-java
X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM<pyWR#k60!#=#>/Vb;]yA5<GWI5`6u&+
;6b'@y|8w"wB;4/e!7wYYrcqdJFY,~%Gk_4]cq$Ei/7<j&N3ah(m`ku?pX.&+~:_/wC~dwn^)MizBG
!pE^+iDQQ1yC6^,)YDKkxDd!T>\I~93>J<_`<4)A{':UrE
libservlet2.4-java is not available anymore in Debian unstable.
---
debian/ant.properties | 2 +-
debian/control | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/ant.properties b/debian/ant.properties
index 9dac827..01b8281 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -3,7 +3,7 @@ installdir = /usr/share/java
# Deps
commons-codec = /usr/share/java/commons-codec.jar
-servlet-api = /usr/share/java/servlet-api.jar
+servlet-api = /usr/share/java/servlet-api-3.0.jar
commons-httpclient = /usr/share/java/commons-httpclient.jar
htmlcleaner = /usr/share/java/htmlcleaner.jar
mail = /usr/share/java/javax.mail.jar
diff --git a/debian/control b/debian/control
index f9725e5..2f9f852 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
Maintainer: Alexandre Rossi <alexandre.ro...@gmail.com>
Build-Depends: debhelper (>= 7.0.50~), default-jdk, ant, ant-optional,
javahelper (>=0.20)
-Build-Depends-Indep: libcommons-codec-java, libservlet2.4-java,
+Build-Depends-Indep: libcommons-codec-java, libservlet3.0-java,
libcommons-httpclient-java, libhtmlcleaner-java,
libmail-java, libjcifs-java, libjackrabbit-java,
liblog4j1.2-java, libwoodstox-java, libstax2-api-java,
--
2.10.1
>From 787ac287ddbb5e9d2f105e3afe6a0223ca0309fa Mon Sep 17 00:00:00 2001
From: Antonio Ospite <a...@ao2.it>
Date: Thu, 20 Oct 2016 23:34:26 +0200
Subject: [PATCH 04/19] debian/ant.properties: add the missing path for
slf4j-simple
X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM<pyWR#k60!#=#>/Vb;]yA5<GWI5`6u&+
;6b'@y|8w"wB;4/e!7wYYrcqdJFY,~%Gk_4]cq$Ei/7<j&N3ah(m`ku?pX.&+~:_/wC~dwn^)MizBG
!pE^+iDQQ1yC6^,)YDKkxDd!T>\I~93>J<_`<4)A{':UrE
The slf4j-simple dependency is added in
0004-Set-classpath-add-target-davmail-lib.patch but the actual patch was
not in debian/ant.properties.
This also fixes this runtime warning:
SLF4J: Failed to load class "org.slf4j.impl.StaticLoggerBinder".
SLF4J: Defaulting to no-operation (NOP) logger implementation
SLF4J: See http://www.slf4j.org/codes.html#StaticLoggerBinder for further details.
---
debian/ant.properties | 1 +
1 file changed, 1 insertion(+)
diff --git a/debian/ant.properties b/debian/ant.properties
index 01b8281..df31ffc 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -13,3 +13,4 @@ woodstox-core = /usr/share/java/woodstox-core-lgpl.jar
stax2-api = /usr/share/java/stax2-api.jar
swt = /usr/share/java/swt.jar
slf4j-api = /usr/share/java/slf4j-api.jar
+slf4j-simple = /usr/share/java/slf4j-simple.jar
--
2.10.1
>From 8676474dfddf7f3d30bc0c2e01520c469005feea Mon Sep 17 00:00:00 2001
From: Antonio Ospite <a...@ao2.it>
Date: Fri, 21 Oct 2016 13:11:27 +0200
Subject: [PATCH 05/19] debian/patches: add
0006-Disable-the-check-for-a-new-release.patch
X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM<pyWR#k60!#=#>/Vb;]yA5<GWI5`6u&+
;6b'@y|8w"wB;4/e!7wYYrcqdJFY,~%Gk_4]cq$Ei/7<j&N3ah(m`ku?pX.&+~:_/wC~dwn^)MizBG
!pE^+iDQQ1yC6^,)YDKkxDd!T>\I~93>J<_`<4)A{':UrE
Disable the "phone-home" functionality which checks for a new upstream
release.
---
.../0006-Disable-the-check-for-a-new-release.patch | 30 ++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 31 insertions(+)
create mode 100644 debian/patches/0006-Disable-the-check-for-a-new-release.patch
diff --git a/debian/patches/0006-Disable-the-check-for-a-new-release.patch b/debian/patches/0006-Disable-the-check-for-a-new-release.patch
new file mode 100644
index 0000000..b50be67
--- /dev/null
+++ b/debian/patches/0006-Disable-the-check-for-a-new-release.patch
@@ -0,0 +1,30 @@
+From 709716a1fe844367446ca53dc55b5a01ee73d748 Mon Sep 17 00:00:00 2001
+From: Antonio Ospite <a...@ao2.it>
+Date: Fri, 21 Oct 2016 13:10:10 +0200
+Subject: [PATCH] Disable the check for a new release
+X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM<pyWR#k60!#=#>/Vb;]yA5<GWI5`6u&+
+ ;6b'@y|8w"wB;4/e!7wYYrcqdJFY,~%Gk_4]cq$Ei/7<j&N3ah(m`ku?pX.&+~:_/wC~dwn^)MizBG
+ !pE^+iDQQ1yC6^,)YDKkxDd!T>\I~93>J<_`<4)A{':UrE
+
+---
+ src/java/davmail/DavGateway.java | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/src/java/davmail/DavGateway.java
++++ b/src/java/davmail/DavGateway.java
+@@ -154,6 +154,7 @@ public final class DavGateway {
+ }
+
+ // check for new version in a separate thread
++ /*
+ new Thread("CheckRelease") {
+ @Override
+ public void run() {
+@@ -164,6 +165,7 @@ public final class DavGateway {
+
+ }
+ }.start();
++ */
+
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index 7724478..027fe34 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
0002-no-osx-tray.patch
0004-Set-classpath-add-target-davmail-lib.patch
0005-Remove-Encoding-line-from-desktop-file-to-make-linti.patch
+0006-Disable-the-check-for-a-new-release.patch
--
2.10.1
>From 776d2f2e52c544595340a4d51cb361b7b1fef05e Mon Sep 17 00:00:00 2001
From: Antonio Ospite <a...@ao2.it>
Date: Fri, 21 Oct 2016 13:26:51 +0200
Subject: [PATCH 06/19] debian/postinst: fix a lintian pedantic check about
"set -e"
X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM<pyWR#k60!#=#>/Vb;]yA5<GWI5`6u&+
;6b'@y|8w"wB;4/e!7wYYrcqdJFY,~%Gk_4]cq$Ei/7<j&N3ah(m`ku?pX.&+~:_/wC~dwn^)MizBG
!pE^+iDQQ1yC6^,)YDKkxDd!T>\I~93>J<_`<4)A{':UrE
Fix this lintian check:
davmail: maintainer-script-without-set-e postinst
---
debian/postinst | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/debian/postinst b/debian/postinst
index 3e725ec..78d444b 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -1,4 +1,7 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
+
USER=davmail
if ! getent passwd $USER >/dev/null; then
--
2.10.1
>From 741ffd9864f4d8ae4cb14033caebde3fdcc84e81 Mon Sep 17 00:00:00 2001
From: Antonio Ospite <a...@ao2.it>
Date: Fri, 21 Oct 2016 13:28:31 +0200
Subject: [PATCH 07/19] debian/davmail.menu: remove the menu file
X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM<pyWR#k60!#=#>/Vb;]yA5<GWI5`6u&+
;6b'@y|8w"wB;4/e!7wYYrcqdJFY,~%Gk_4]cq$Ei/7<j&N3ah(m`ku?pX.&+~:_/wC~dwn^)MizBG
!pE^+iDQQ1yC6^,)YDKkxDd!T>\I~93>J<_`<4)A{':UrE
Debian packages are not supposed to provide menu files anymore, the
desktop file is enough.
Removing the menu files fixes this lintian warning:
W: davmail: command-in-menu-file-and-desktop-file davmail usr/share/menu/davmail:3
See https://lists.debian.org/debian-devel-announce/2015/09/msg00000.html
for details.
Drop also the davmail.xmp file as it's not needed anymore.
---
debian/davmail.menu | 3 -
debian/davmail.xpm | 519 ----------------------------------------------------
debian/install | 1 -
3 files changed, 523 deletions(-)
delete mode 100644 debian/davmail.menu
delete mode 100644 debian/davmail.xpm
diff --git a/debian/davmail.menu b/debian/davmail.menu
deleted file mode 100644
index 93c1e82..0000000
--- a/debian/davmail.menu
+++ /dev/null
@@ -1,3 +0,0 @@
-?package(davmail):needs="X11" section="Applications/Network/Communication" \
- title="DavMail Exchange Gateway" command="/usr/bin/davmail" \
- icon="/usr/share/pixmaps/davmail.xpm"
diff --git a/debian/davmail.xpm b/debian/davmail.xpm
deleted file mode 100644
index ffae546..0000000
--- a/debian/davmail.xpm
+++ /dev/null
@@ -1,519 +0,0 @@
-/* XPM */
-static char * davmail_xpm[] = {
-"32 32 484 2",
-" c None",
-". c #C95900",
-"+ c #D77F00",
-"@ c #E3A200",
-"# c #EABB00",
-"$ c #EEC900",
-"% c #EEC800",
-"& c #EAC200",
-"* c #DFA100",
-"= c #D88000",
-"- c #B34900",
-"; c #C16500",
-"> c #E3A100",
-", c #FBEF00",
-"' c #FFFF05",
-") c #FFFF17",
-"! c #FEFF21",
-"~ c #FEFF28",
-"{ c #FEFF24",
-"] c #FFFF19",
-"^ c #FFFF06",
-"/ c #FDF700",
-"( c #DEA200",
-"_ c #AF5D00",
-": c #CB5F00",
-"< c #E7B100",
-"[ c #FBF300",
-"} c #FFFF09",
-"| c #FEFA74",
-"1 c #FDFDB7",
-"2 c #FFFFCE",
-"3 c #FFFFD8",
-"4 c #FFFFE4",
-"5 c #FFFFDF",
-"6 c #FFFFDE",
-"7 c #FFFFBA",
-"8 c #FFFE7F",
-"9 c #FFFF14",
-"0 c #FBF400",
-"a c #E0B100",
-"b c #AB4A00",
-"c c #CF6D00",
-"d c #F0D500",
-"e c #FFFF0A",
-"f c #FEFE65",
-"g c #FEFEDF",
-"h c #FEFEE0",
-"i c #FDFDDB",
-"j c #E9DCD8",
-"k c #EEE5DC",
-"l c #ECE2DB",
-"m c #EBE2DA",
-"n c #EBE2DB",
-"o c #EEE6DB",
-"p c #EDE3E0",
-"q c #EEE5DE",
-"r c #FEFE73",
-"s c #FFFF0D",
-"t c #F3DE00",
-"u c #C66800",
-"v c #D47300",
-"w c #F7E700",
-"x c #FEFF19",
-"y c #FDFDAD",
-"z c #FEFED1",
-"A c #FEFECD",
-"B c #FEFFCD",
-"C c #ECE3CD",
-"D c #F8F3DA",
-"E c #FEFFDE",
-"F c #FEFEE2",
-"G c #FEFEDE",
-"H c #FEFEE1",
-"I c #FDFDDD",
-"J c #E9DED2",
-"K c #F8F6CD",
-"L c #FAF9D0",
-"M c #FEFEB2",
-"N c #FEFF27",
-"O c #F7E900",
-"P c #C36D00",
-"Q c #BE5D00",
-"R c #F8E700",
-"S c #FEFE22",
-"T c #FEFEC4",
-"U c #FEFEC5",
-"V c #FEFEC2",
-"W c #FDFCC6",
-"X c #E5D6C2",
-"Y c #FEFEDC",
-"Z c #FDFDDC",
-"` c #F6F2D7",
-" . c #EEE5C3",
-".. c #FFFFC4",
-"+. c #FDFDC5",
-"@. c #FEFEC9",
-"#. c #FEFF2A",
-"$. c #FAF100",
-"%. c #B85B00",
-"&. c #EFCA00",
-"*. c #FEFF17",
-"=. c #FDFDAB",
-"-. c #FEFDBC",
-";. c #FEFEB6",
-">. c #FEFEBB",
-",. c #F9F7BC",
-"'. c #ECE1C7",
-"). c #FEFEDD",
-"!. c #FEFED5",
-"~. c #FDFEDD",
-"{. c #FEFDDB",
-"]. c #E0CEBD",
-"^. c #FCFBBA",
-"/. c #FDFDBD",
-"(. c #FEFEBC",
-"_. c #FEFEB3",
-":. c #FDFDB2",
-"<. c #773700",
-"[. c #D98300",
-"}. c #FDFD00",
-"|. c #FEFE8C",
-"1. c #FDFEB2",
-"2. c #FEFEB0",
-"3. c #FEFEB1",
-"4. c #F4EEB0",
-"5. c #F3EBD0",
-"6. c #E4D3C1",
-"7. c #F3ECB0",
-"8. c #FEFD9C",
-"9. c #FEFE00",
-"0. c #D28400",
-"a. c #C65100",
-"b. c #F6E300",
-"c. c #FEFF4C",
-"d. c #FEFEA5",
-"e. c #FEFEA6",
-"f. c #FFFFA8",
-"g. c #E9DAAB",
-"h. c #F9F5D8",
-"i. c #F5EFD2",
-"j. c #E9D9A9",
-"k. c #FFFFA7",
-"l. c #FEFFA6",
-"m. c #FDFCA5",
-"n. c #FDFDA7",
-"o. c #FDFDA6",
-"p. c #FEFEAA",
-"q. c #FEFC5F",
-"r. c #FEF500",
-"s. c #A34000",
-"t. c #DB8E00",
-"u. c #FFFF08",
-"v. c #FEFE92",
-"w. c #FEFD99",
-"x. c #FEFEA4",
-"y. c #FEFD97",
-"z. c #FEFEA1",
-"A. c #FDFDA0",
-"B. c #FFFF99",
-"C. c #DCC3A4",
-"D. c #FDFCDD",
-"E. c #FFFFE0",
-"F. c #DFCAB9",
-"G. c #E8D8A1",
-"H. c #ECDEA2",
-"I. c #ECDDA1",
-"J. c #F6F09B",
-"K. c #FEFE9A",
-"L. c #FEFD9A",
-"M. c #FAF89E",
-"N. c #FDFD8D",
-"O. c #FFFF0E",
-"P. c #C48700",
-"Q. c #EFBE00",
-"R. c #FEFE24",
-"S. c #FDFB92",
-"T. c #FEFC92",
-"U. c #FEFC94",
-"V. c #FEFC93",
-"W. c #F5EE92",
-"X. c #DEC8B9",
-"Y. c #FEFFE3",
-"Z. c #FEFEE3",
-"`. c #F9F5DB",
-" + c #F6F2DA",
-".+ c #F7F3DB",
-"++ c #E6D2C0",
-"@+ c #E5D291",
-"#+ c #FEFD94",
-"$+ c #FDFC92",
-"%+ c #FEFB92",
-"&+ c #FEFD2C",
-"*+ c #EACC00",
-"=+ c #FEFA50",
-"-+ c #FDFA8B",
-";+ c #FDFA89",
-">+ c #FEFC89",
-",+ c #E0C37C",
-"'+ c #ECE2D8",
-")+ c #F8F3DD",
-"!+ c #F8F3DC",
-"~+ c #FAF7DF",
-"{+ c #FEFEE5",
-"]+ c #FEFEEB",
-"^+ c #FEFDE4",
-"/+ c #FDFDEB",
-"(+ c #FAF7DD",
-"_+ c #D7B694",
-":+ c #FFFF84",
-"<+ c #FEFB5C",
-"[+ c #F8E200",
-"}+ c #733800",
-"|+ c #975200",
-"1+ c #FAE700",
-"2+ c #FFF46C",
-"3+ c #FEF885",
-"4+ c #FEF67C",
-"5+ c #FEF67E",
-"6+ c #FEF780",
-"7+ c #FFF77D",
-"8+ c #F4E67D",
-"9+ c #E6CE88",
-"0+ c #E7CF89",
-"a+ c #E6D08B",
-"b+ c #E1C5B0",
-"c+ c #FFFFEE",
-"d+ c #FDFEEB",
-"e+ c #FFFFF6",
-"f+ c #E3CCB3",
-"g+ c #F5E57C",
-"h+ c #FEF985",
-"i+ c #FEF67D",
-"j+ c #FEFD7B",
-"k+ c #FBEB00",
-"l+ c #9C5300",
-"m+ c #CC7000",
-"n+ c #FFF262",
-"o+ c #FEF57A",
-"p+ c #FEF372",
-"q+ c #FEF473",
-"r+ c #FFF67A",
-"s+ c #FFF778",
-"t+ c #FFFA78",
-"u+ c #E8CD7D",
-"v+ c #F5EAE4",
-"w+ c #FEFDF7",
-"x+ c #FEFDF6",
-"y+ c #F2E8DB",
-"z+ c #DAB571",
-"A+ c #FAEE7A",
-"B+ c #FEF57B",
-"C+ c #FEF26D",
-"D+ c #FCE900",
-"E+ c #B56400",
-"F+ c #CD7300",
-"G+ c #FAE800",
-"H+ c #FEE508",
-"I+ c #FDEB57",
-"J+ c #FDF271",
-"K+ c #FEF16E",
-"L+ c #FDF16E",
-"M+ c #FDF473",
-"N+ c #FEF16D",
-"O+ c #FCEE6D",
-"P+ c #D6AE97",
-"Q+ c #FEFEFA",
-"R+ c #FDFDFC",
-"S+ c #FEFDFC",
-"T+ c #FAF8F5",
-"U+ c #D8B185",
-"V+ c #FFF76D",
-"W+ c #FFF76E",
-"X+ c #FDF170",
-"Y+ c #FFF260",
-"Z+ c #F8E609",
-"`+ c #FCEA00",
-" @ c #B96500",
-".@ c #C96D00",
-"+@ c #FDDC00",
-"@@ c #FDE300",
-"#@ c #FEE200",
-"$@ c #FEEA40",
-"%@ c #FDEC5F",
-"&@ c #FEF065",
-"*@ c #FDED64",
-"=@ c #FEED63",
-"-@ c #FEF069",
-";@ c #D9AA61",
-">@ c #F6EFEC",
-",@ c #FEFEFD",
-"'@ c #F6EDE7",
-")@ c #D7AC88",
-"!@ c #D8AE89",
-"~@ c #D19E6E",
-"{@ c #FFF264",
-"]@ c #FDEC64",
-"^@ c #FDED62",
-"/@ c #FEEF64",
-"(@ c #FEEE61",
-"_@ c #FEE100",
-":@ c #FDE200",
-"<@ c #B86300",
-"[@ c #984F00",
-"}@ c #FBDB00",
-"|@ c #FEDB00",
-"1@ c #FEE30B",
-"2@ c #FDE53D",
-"3@ c #FDEB5E",
-"4@ c #FEEB5C",
-"5@ c #FDEB5C",
-"6@ c #F7DD56",
-"7@ c #E2C2A7",
-"8@ c #FFFFFF",
-"9@ c #F9F3F0",
-"0@ c #DCAE69",
-"a@ c #FFED5A",
-"b@ c #FDE656",
-"c@ c #FDEA60",
-"d@ c #FEE840",
-"e@ c #FDDE0D",
-"f@ c #FDDB00",
-"g@ c #FEE400",
-"h@ c #FEDC00",
-"i@ c #FCD800",
-"j@ c #9D5400",
-"k@ c #F7C900",
-"l@ c #FDD900",
-"m@ c #FEDA00",
-"n@ c #FED900",
-"o@ c #FEDB0B",
-"p@ c #FEE134",
-"q@ c #FEE543",
-"r@ c #EEC84F",
-"s@ c #E7C3A3",
-"t@ c #EACEB4",
-"u@ c #F9F3EE",
-"v@ c #DCAD7E",
-"w@ c #F9DD4B",
-"x@ c #FDE446",
-"y@ c #FEE73B",
-"z@ c #FEDB0A",
-"A@ c #FACF00",
-"B@ c #763A00",
-"C@ c #EBB300",
-"D@ c #FED400",
-"E@ c #FED500",
-"F@ c #FED300",
-"G@ c #FDD503",
-"H@ c #FDD40A",
-"I@ c #F7CA0A",
-"J@ c #E3A720",
-"K@ c #F3E3D9",
-"L@ c #D59C7D",
-"M@ c #EEB80B",
-"N@ c #FED60A",
-"O@ c #FED503",
-"P@ c #FDD500",
-"Q@ c #F1B900",
-"R@ c #D58500",
-"S@ c #FFD800",
-"T@ c #FDD200",
-"U@ c #FED200",
-"V@ c #FFD500",
-"W@ c #D78F1C",
-"X@ c #F9F1ED",
-"Y@ c #FEFFFE",
-"Z@ c #EFD9C7",
-"`@ c #DD9404",
-" # c #FFD700",
-".# c #CC8000",
-"+# c #BA5200",
-"@# c #FCC800",
-"## c #FECC00",
-"$# c #FECD00",
-"%# c #FDCD00",
-"&# c #FFCE00",
-"*# c #D18342",
-"=# c #FEFEFE",
-"-# c #FBFCFF",
-";# c #D2770F",
-"># c #FDCC00",
-",# c #FECB00",
-"'# c #FFD000",
-")# c #AB4900",
-"!# c #4E1F00",
-"~# c #DE8201",
-"{# c #FECA00",
-"]# c #FDCA00",
-"^# c #FEC400",
-"/# c #FEC900",
-"(# c #FEC800",
-"_# c #EFAC00",
-":# c #E5B28F",
-"<# c #FEFFFF",
-"[# c #FDFCFA",
-"}# c #D88841",
-"|# c #F7BD00",
-"1# c #DA8300",
-"2# c #572200",
-"3# c #F2B200",
-"4# c #FEC300",
-"5# c #FEC200",
-"6# c #E18100",
-"7# c #FAEFE6",
-"8# c #EDC59D",
-"9# c #F1A300",
-"0# c #FEC600",
-"a# c #FDC400",
-"b# c #F5B600",
-"c# c #723500",
-"d# c #B75C01",
-"e# c #FEBA00",
-"f# c #FEB900",
-"g# c #FEC000",
-"h# c #FEBF00",
-"i# c #E3871B",
-"j# c #F8E5D6",
-"k# c #E37F00",
-"l# c #FFBC00",
-"m# c #FEBC00",
-"n# c #FEC100",
-"o# c #FDBB00",
-"p# c #B35D00",
-"q# c #C46800",
-"r# c #FDB400",
-"s# c #FEB600",
-"t# c #FEBB00",
-"u# c #FAB100",
-"v# c #ECB272",
-"w# c #FDFAF8",
-"x# c #E18925",
-"y# c #D26F00",
-"z# c #2C1100",
-"A# c #C66600",
-"B# c #FBAF00",
-"C# c #FEB400",
-"D# c #FDB300",
-"E# c #F6A300",
-"F# c #F6DBC2",
-"G# c #EAAA6A",
-"H# c #FAAB00",
-"I# c #FEB300",
-"J# c #FEB500",
-"K# c #FBAE00",
-"L# c #C46C00",
-"M# c #371600",
-"N# c #9A4C00",
-"O# c #F19600",
-"P# c #FFB200",
-"Q# c #FFAF00",
-"R# c #EC9715",
-"S# c #E8AC7B",
-"T# c #ED8F00",
-"U# c #FEAD00",
-"V# c #FEAF00",
-"W# c #F19B00",
-"X# c #A54F00",
-"Y# c #1F0B00",
-"Z# c #823200",
-"`# c #BE6700",
-" $ c #F39B00",
-".$ c #ED8D01",
-"+$ c #E58400",
-"@$ c #FEAC00",
-"#$ c #FDAB00",
-"$$ c #FCA800",
-"%$ c #F29A00",
-"&$ c #BC6200",
-"*$ c #6D2A00",
-"=$ c #592800",
-"-$ c #A14E00",
-";$ c #D37000",
-">$ c #EC8900",
-",$ c #F39500",
-"'$ c #F99E00",
-")$ c #F89D00",
-"!$ c #F29400",
-"~$ c #ED8A00",
-"{$ c #D27000",
-"]$ c #A24F00",
-"^$ c #5E2800",
-"/$ c #562200",
-"($ c #773100",
-"_$ c #823400",
-" ",
-" . + @ # $ % & * = - ",
-" ; > , ' ) ! ~ ~ { ] ^ / ( _ ",
-" : < [ } | 1 2 3 4 5 6 2 7 8 9 0 a b ",
-" c d e f g h i j k k l m n o p q r s t u ",
-" v w x y z A B C D E F G H F I J K L M N O P ",
-" Q R S T U T V W X 6 I Y I Z Y ` ...V +.@.#.$.%. ",
-" &.*.=.-.;.;.>.,.'.6 ).I !.~.{.].^./.>.(._.:.x d <. ",
-" [.}.|.1.2.2.2.3.4.5.).).Y I ).6.7.2.2.2.3.2.3.8.9.0. ",
-" a.b.c.=.d.e.e.e.f.g.h.Z Y ).).i.j.k.l.m.m.n.e.o.p.q.r.s. ",
-" t.u.v.w.x.y.z.A.B.C.D.).F ).E.F.G.H.I.J.K.L.M.K.K.N.O.P. ",
-" Q.R.S.T.U.T.U.V.W.X.Y.F F Z.Z.`. +.+++@+#+$+U.$+V.%+&+*+ ",
-" b.=+-+;+;+;+;+>+,+'+)+!+~+{+]+^+/+(+_+:+;+;+;+;+;+-+<+[+}+ ",
-"|+1+2+3+4+3+5+6+7+8+9+0+a+b+c+]+d+e+f+g+h+i+7+i+i+i+i+j+k+l+ ",
-"m+k+n+o+o+p+o+q+o+r+s+t+u+v+w+x+x+y+z+r+p+r+A+o+o+o+B+C+D+E+ ",
-"F+G+H+I+J+K+L+M+L+L+N+O+P+Q+R+S+T+U+V+W+L+L+K+L+L+X+Y+Z+`+ @ ",
-".@+@@@#@$@%@&@*@=@=@-@;@>@,@,@,@'@)@!@~@{@]@^@/@(@$@@@_@:@<@ ",
-"[@}@|@#@|@1@2@3@4@5@6@7@8@,@,@,@S+S+9@0@a@b@c@d@e@f@g@h@i@j@ ",
-" k@l@m@m@m@n@o@p@q@r@s@t@u@,@,@,@8@v@w@x@y@z@m@|@n@m@|@A@B@ ",
-" C@D@E@E@E@D@E@F@G@H@I@J@K@,@,@8@L@M@N@O@F@E@E@E@D@E@P@Q@ ",
-" R@S@T@U@U@F@U@U@U@U@V@W@X@R+Y@Z@`@ #T@F@F@U@U@F@U@T@S@.# ",
-" +#@#######$#######%#&#*#=#,@-#;#@#>#,#$#$#,#,#$#,#,#'#)# ",
-" !#~#{#]#{#^#^#/#(#,#_#:#<#[#}#|#,#^#,#^#^#/#/#^#]#,#1#2# ",
-" 3#^#4#^#^#5#5#4#6#7#8@8#9#0#a#^#^#^#^#4#4#^#^#b#c# ",
-" d#e#4#f#g#g#f#h#i#8@j#k#l#m#m#m#m#e#f#n#g#m#o#p# ",
-" q#r#o#s#t#s#u#v#w#x#f#e#s#t#t#t#s#s#s#o#r#y#z# ",
-" A#B#C#D#C#E#F#G#H#D#I#C#I#I#I#J#r#f#K#L#M# ",
-" N#O#P#Q#R#S#T#U#V#V#U#U#U#I#U#P#W#X#Y# ",
-" Z#`# $.$+$Q#@$@$#$#$U#@$$$%$&$*$ ",
-" =$-$;$>$,$'$)$!$~${$]$^$ ",
-" Y#/$($_$_$($/$Y# ",
-" "};
diff --git a/debian/install b/debian/install
index e93b852..9429baf 100644
--- a/debian/install
+++ b/debian/install
@@ -1,4 +1,3 @@
src/etc/davmail.properties /etc
-debian/davmail.xpm /usr/share/pixmaps
dist/davmail.png /usr/share/icons
debian/davmail.desktop /usr/share/applications
--
2.10.1
>From ad7fb55dfe86f47cd8de703007d34349d4388a8f Mon Sep 17 00:00:00 2001
From: Antonio Ospite <a...@ao2.it>
Date: Fri, 21 Oct 2016 13:33:49 +0200
Subject: [PATCH 08/19] debian/rules: ship the upstream changelog which is in
releasenotes.txt
X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM<pyWR#k60!#=#>/Vb;]yA5<GWI5`6u&+
;6b'@y|8w"wB;4/e!7wYYrcqdJFY,~%Gk_4]cq$Ei/7<j&N3ah(m`ku?pX.&+~:_/wC~dwn^)MizBG
!pE^+iDQQ1yC6^,)YDKkxDd!T>\I~93>J<_`<4)A{':UrE
This also fixes this lintian pedantic check:
davmail: no-upstream-changelog
---
debian/rules | 3 +++
1 file changed, 3 insertions(+)
diff --git a/debian/rules b/debian/rules
index e162019..6b1431b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,9 @@ export DH_OPTIONS
%:
dh $@ --with javahelper
+override_dh_installchangelogs:
+ dh_installchangelogs releasenotes.txt
+
override_dh_auto_build:
ANT_OPTS=-Dfile.encoding=UTF-8 ant -propertyfile debian/ant.properties jar
cp -a src/java/tray48.png dist/davmail.png
--
2.10.1
>From cbbd26fa5a59bc7880e9225555ad4f901da91baa Mon Sep 17 00:00:00 2001
From: Antonio Ospite <a...@ao2.it>
Date: Fri, 28 Oct 2016 13:39:58 +0200
Subject: [PATCH 09/19] debian/control: bump Standards-Version
X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM<pyWR#k60!#=#>/Vb;]yA5<GWI5`6u&+
;6b'@y|8w"wB;4/e!7wYYrcqdJFY,~%Gk_4]cq$Ei/7<j&N3ah(m`ku?pX.&+~:_/wC~dwn^)MizBG
!pE^+iDQQ1yC6^,)YDKkxDd!T>\I~93>J<_`<4)A{':UrE
This also fixes a lintian warning:
W: davmail source: ancient-standards-version 3.9.4 (current is 3.9.8)
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index 2f9f852..e8ac774 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends-Indep: libcommons-codec-java, libservlet3.0-java,
libmail-java, libjcifs-java, libjackrabbit-java,
liblog4j1.2-java, libwoodstox-java, libstax2-api-java,
libswt-gtk-3-java, libslf4j-java
-Standards-Version: 3.9.4
+Standards-Version: 3.9.8
Homepage: http://davmail.sourceforge.net/
Vcs-Git: git://git.debian.org/pkg-java/davmail.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/davmail.git/
--
2.10.1
>From 9660f74926d5a3414bc71c54a24d7830f560120a Mon Sep 17 00:00:00 2001
From: Antonio Ospite <a...@ao2.it>
Date: Fri, 28 Oct 2016 13:43:25 +0200
Subject: [PATCH 10/19] debian/control: fix Vcs-* fields to use secure and
canonical URLs
X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM<pyWR#k60!#=#>/Vb;]yA5<GWI5`6u&+
;6b'@y|8w"wB;4/e!7wYYrcqdJFY,~%Gk_4]cq$Ei/7<j&N3ah(m`ku?pX.&+~:_/wC~dwn^)MizBG
!pE^+iDQQ1yC6^,)YDKkxDd!T>\I~93>J<_`<4)A{':UrE
This fixes these lintian reports about Vcs-Git:
I: davmail source: vcs-field-uses-insecure-uri vcs-git git://git.debian.org/pkg-java/davmail.git
I: davmail source: vcs-field-not-canonical git://git.debian.org/pkg-java/davmail.git https://anonscm.debian.org/git/pkg-java/davmail.git
While at it also use "git" instead of "cgit" in the Vcs-Browser files,
as this is the address lintian suggests.
---
debian/control | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/control b/debian/control
index e8ac774..47fe160 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,8 @@ Build-Depends-Indep: libcommons-codec-java, libservlet3.0-java,
libswt-gtk-3-java, libslf4j-java
Standards-Version: 3.9.8
Homepage: http://davmail.sourceforge.net/
-Vcs-Git: git://git.debian.org/pkg-java/davmail.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/davmail.git/
+Vcs-Git: https://anonscm.debian.org/git/pkg-java/davmail.git
+Vcs-Browser: https://anonscm.debian.org/git/pkg-java/davmail.git/
Package: davmail
Architecture: all
--
2.10.1
>From 3a5ceb9ef1edd219c21ab75a122b82489ac1cd83 Mon Sep 17 00:00:00 2001
From: Antonio Ospite <a...@ao2.it>
Date: Fri, 28 Oct 2016 14:06:57 +0200
Subject: [PATCH 11/19] debian/compat: bump to compatibility level v10
X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM<pyWR#k60!#=#>/Vb;]yA5<GWI5`6u&+
;6b'@y|8w"wB;4/e!7wYYrcqdJFY,~%Gk_4]cq$Ei/7<j&N3ah(m`ku?pX.&+~:_/wC~dwn^)MizBG
!pE^+iDQQ1yC6^,)YDKkxDd!T>\I~93>J<_`<4)A{':UrE
Fixes a lintian warning:
W: davmail source: package-uses-deprecated-debhelper-compat-version 7
---
debian/compat | 2 +-
debian/control | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/compat b/debian/compat
index 7f8f011..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+10
diff --git a/debian/control b/debian/control
index 47fe160..716b2f3 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: davmail
Section: net
Priority: extra
Maintainer: Alexandre Rossi <alexandre.ro...@gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), default-jdk, ant, ant-optional,
+Build-Depends: debhelper (>= 10), default-jdk, ant, ant-optional,
javahelper (>=0.20)
Build-Depends-Indep: libcommons-codec-java, libservlet3.0-java,
libcommons-httpclient-java, libhtmlcleaner-java,
--
2.10.1
>From 00ae1512d9a5060025fc2dfb3aff47fd1ace957f Mon Sep 17 00:00:00 2001
From: Antonio Ospite <a...@ao2.it>
Date: Fri, 28 Oct 2016 14:09:15 +0200
Subject: [PATCH 12/19] debian/copyright: make "cme check dpkg-copyright" pass
X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM<pyWR#k60!#=#>/Vb;]yA5<GWI5`6u&+
;6b'@y|8w"wB;4/e!7wYYrcqdJFY,~%Gk_4]cq$Ei/7<j&N3ah(m`ku?pX.&+~:_/wC~dwn^)MizBG
!pE^+iDQQ1yC6^,)YDKkxDd!T>\I~93>J<_`<4)A{':UrE
Update the debian/copyright file to use a shared License block.
This also fixes a lintian warning:
W: davmail source: dep5-copyright-license-name-not-unique (paragraph at line 54)
While at it also run "cme fix dpkg-copyright":
cme: using Dpkg::Copyright model
cme: running fix on dpkg-copyright configuration...
Warning in 'Format' value 'http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/': Format uses insecure http protocol instead of https
Changes applied to dpkg-copyright configuration:
- Format: 'http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/' -> 'https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/' # applied fix
---
debian/copyright | 47 ++++++++++++++++-------------------------------
1 file changed, 16 insertions(+), 31 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index a280a7b..276af12 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Davmail
Upstream-Contact: Mickaël Guessant <mgues...@free.fr>
Source: http://davmail.sourceforge.net/download.html
@@ -6,6 +6,20 @@ Source: http://davmail.sourceforge.net/download.html
Files: *
Copyright: 2009-2012, Mickael Guessant
License: GPL-2+
+
+Files: src/java/com/ctc/wstx/sr/StreamScanner.java
+Copyright: 2004 Tatu Saloranta <tatu.salora...@iki.fi>
+License: LGPL-2.1+ or Apache-2.0
+
+Files: debian/*
+Copyright: 2012 Alexandre Rossi <alexandre.ro...@gmail.com>
+License: GPL-2+
+
+License: Apache-2.0
+ On Debian systems, the full text of the Apache License version 2 can be
+ found in the file `/usr/share/common-licenses/Apache-2.0'.
+
+License: GPL-2+
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
@@ -27,9 +41,7 @@ License: GPL-2+
License version 2 can be found in the file
`/usr/share/common-licenses/GPL-2'.
-Files: src/java/com/ctc/wstx/sr/StreamScanner.java
-Copyright: 2004 Tatu Saloranta <tatu.salora...@iki.fi>
-License: LGPL-2.1+ or Apache-2.0
+License: LGPL-2.1+
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or (at
@@ -47,30 +59,3 @@ License: LGPL-2.1+ or Apache-2.0
On Debian systems, the full text of the GNU General Public
License version 2 can be found in the file
`/usr/share/common-licenses/LGPL-2.1'.
- .
- On Debian systems, the full text of the Apache License version 2 can be
- found in the file `/usr/share/common-licenses/Apache-2.0'.
-
-Files: debian/*
-Copyright: 2012 Alexandre Rossi <alexandre.ro...@gmail.com>
-License: GPL-2+
- 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 (at your option) any later
- version.
- .
- This program is distributed in the hope that it will be
- useful, but WITHOUT ANY WARRANTY; without even the implied
- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the GNU General Public License for more
- details.
- .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA 02110-1301 USA
- .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
--
2.10.1
>From 9437b6aa4a8cdb372a167ce7e7a976534a5777a8 Mon Sep 17 00:00:00 2001
From: Antonio Ospite <a...@ao2.it>
Date: Fri, 28 Oct 2016 16:18:56 +0200
Subject: [PATCH 13/19] debian/control: suggest ibswt-gtk-3-java and
libswt-cairo-gtk-3-jni
X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM<pyWR#k60!#=#>/Vb;]yA5<GWI5`6u&+
;6b'@y|8w"wB;4/e!7wYYrcqdJFY,~%Gk_4]cq$Ei/7<j&N3ah(m`ku?pX.&+~:_/wC~dwn^)MizBG
!pE^+iDQQ1yC6^,)YDKkxDd!T>\I~93>J<_`<4)A{':UrE
The previous libswt-gtk-3.*-java dependencies are not available anymore.
Add also the libswt-cairo-gtk-3-jni dependency, which seems to be needed
for the tray icon.
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index 716b2f3..59eea67 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Package: davmail
Architecture: all
Depends: lsb-base (>= 3.0-6), logrotate, adduser,
${shlibs:Depends}, ${misc:Depends}, ${java:Depends}
-Suggests: libswt-gtk-3.6-java | libswt-gtk-3.5-java | libswt-gtk-3.4-java
+Suggests: libswt-gtk-3-java, libswt-cairo-gtk-3-jni
Description: POP/IMAP/SMTP/CalDav/LDAP to Microsoft Exchange gateway
Ever wanted to get rid of Outlook? DavMail is a POP/IMAP/SMTP/Caldav/LDAP
exchange gateway allowing users to use any mail/calendar client (e.g.
--
2.10.1
>From ddbb9e72ec09f23a7eb3b3e471be53361f00ccbb Mon Sep 17 00:00:00 2001
From: Antonio Ospite <a...@ao2.it>
Date: Fri, 28 Oct 2016 16:59:22 +0200
Subject: [PATCH 14/19] debian/control: run "cme fix dpkg-control"
X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM<pyWR#k60!#=#>/Vb;]yA5<GWI5`6u&+
;6b'@y|8w"wB;4/e!7wYYrcqdJFY,~%Gk_4]cq$Ei/7<j&N3ah(m`ku?pX.&+~:_/wC~dwn^)MizBG
!pE^+iDQQ1yC6^,)YDKkxDd!T>\I~93>J<_`<4)A{':UrE
This gets rid of some unnecessary version numbers in dependencies.
$ LANG=C cme fix dpkg-control
cme: using Dpkg model
cme: running fix on dpkg configuration...
Reading package lists... Done
Building dependency tree
Reading state information... Done
Warning in 'control source Build-Depends:4' value 'javahelper (>=0.20)': unnecessary versioned dependency: javahelper (>= 0.20). Debian has oldstable -> 0.43; stable-kfreebsd -> 0.48; stable -> 0.48+deb8u1; unstable -> 0.59;
Warning in 'control source Vcs-Browser' value 'https://anonscm.debian.org/git/pkg-java/davmail.git/': URL to debian system is not the recommended one
Warning in 'control binary:davmail Depends:0' value 'lsb-base (>= 3.0-6)': unnecessary versioned dependency: lsb-base (>= 3.0-6). Debian has oldstable -> 4.1+Debian8+deb7u1; stable -> 4.1+Debian13+nmu1; unstable -> 9.20161016;
Changes applied to dpkg configuration:
- control source Build-Depends:4: 'javahelper (>=0.20)' -> 'javahelper' # applied fix
- control binary:davmail Depends:0: 'lsb-base (>= 3.0-6)' -> 'lsb-base' # applied fix
While at it, also sort the dependencies alphabetically.
---
debian/control | 41 ++++++++++++++++++++++++++++-------------
1 file changed, 28 insertions(+), 13 deletions(-)
diff --git a/debian/control b/debian/control
index 59eea67..fc9874f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,24 +1,39 @@
Source: davmail
+Maintainer: Alexandre Rossi <alexandre.ro...@gmail.com>
Section: net
Priority: extra
-Maintainer: Alexandre Rossi <alexandre.ro...@gmail.com>
-Build-Depends: debhelper (>= 10), default-jdk, ant, ant-optional,
- javahelper (>=0.20)
-Build-Depends-Indep: libcommons-codec-java, libservlet3.0-java,
- libcommons-httpclient-java, libhtmlcleaner-java,
- libmail-java, libjcifs-java, libjackrabbit-java,
- liblog4j1.2-java, libwoodstox-java, libstax2-api-java,
- libswt-gtk-3-java, libslf4j-java
+Build-Depends: debhelper (>= 10),
+ default-jdk,
+ ant,
+ ant-optional,
+ javahelper
+Build-Depends-Indep: libcommons-codec-java,
+ libservlet3.0-java,
+ libcommons-httpclient-java,
+ libhtmlcleaner-java,
+ libmail-java,
+ libjcifs-java,
+ libjackrabbit-java,
+ liblog4j1.2-java,
+ libwoodstox-java,
+ libstax2-api-java,
+ libswt-gtk-3-java,
+ libslf4j-java
Standards-Version: 3.9.8
-Homepage: http://davmail.sourceforge.net/
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/davmail.git/
Vcs-Git: https://anonscm.debian.org/git/pkg-java/davmail.git
-Vcs-Browser: https://anonscm.debian.org/git/pkg-java/davmail.git/
+Homepage: http://davmail.sourceforge.net/
Package: davmail
Architecture: all
-Depends: lsb-base (>= 3.0-6), logrotate, adduser,
- ${shlibs:Depends}, ${misc:Depends}, ${java:Depends}
-Suggests: libswt-gtk-3-java, libswt-cairo-gtk-3-jni
+Depends: lsb-base,
+ logrotate,
+ adduser,
+ ${shlibs:Depends},
+ ${misc:Depends},
+ ${java:Depends}
+Suggests: libswt-gtk-3-java,
+ libswt-cairo-gtk-3-jni
Description: POP/IMAP/SMTP/CalDav/LDAP to Microsoft Exchange gateway
Ever wanted to get rid of Outlook? DavMail is a POP/IMAP/SMTP/Caldav/LDAP
exchange gateway allowing users to use any mail/calendar client (e.g.
--
2.10.1
>From 6f0d763d8ccb35d60bf7a0c4dfa83fe8ca2bde43 Mon Sep 17 00:00:00 2001
From: Antonio Ospite <a...@ao2.it>
Date: Fri, 28 Oct 2016 17:07:08 +0200
Subject: [PATCH 15/19] debian/README.source: fix a typo and improve the
wording
X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM<pyWR#k60!#=#>/Vb;]yA5<GWI5`6u&+
;6b'@y|8w"wB;4/e!7wYYrcqdJFY,~%Gk_4]cq$Ei/7<j&N3ah(m`ku?pX.&+~:_/wC~dwn^)MizBG
!pE^+iDQQ1yC6^,)YDKkxDd!T>\I~93>J<_`<4)A{':UrE
---
debian/README.source | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/debian/README.source b/debian/README.source
index 3bfd602..f074e7e 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,8 +1,10 @@
This package uses a version control system as described in
http://wiki.debian.org/Java/JavaVcs and the pages linked from there.
-For a succesfull
+For a successful
debuild -us -uc
-is a davmail_VERSION.orig.tar.gz required. The command
+a davmail_VERSION.orig.tar.gz is required.
+
+The command
uscan
will deliver such file.
--
2.10.1
>From 3f9216be536375dbc8c733b3f3eac7cce84782c6 Mon Sep 17 00:00:00 2001
From: Antonio Ospite <a...@ao2.it>
Date: Fri, 28 Oct 2016 17:01:52 +0200
Subject: [PATCH 16/19] debian/control: update the long description
X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM<pyWR#k60!#=#>/Vb;]yA5<GWI5`6u&+
;6b'@y|8w"wB;4/e!7wYYrcqdJFY,~%Gk_4]cq$Ei/7<j&N3ah(m`ku?pX.&+~:_/wC~dwn^)MizBG
!pE^+iDQQ1yC6^,)YDKkxDd!T>\I~93>J<_`<4)A{':UrE
Copy what upstream provides now in build.xml.
---
debian/control | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/debian/control b/debian/control
index fc9874f..83659f3 100644
--- a/debian/control
+++ b/debian/control
@@ -35,19 +35,21 @@ Depends: lsb-base,
Suggests: libswt-gtk-3-java,
libswt-cairo-gtk-3-jni
Description: POP/IMAP/SMTP/CalDav/LDAP to Microsoft Exchange gateway
- Ever wanted to get rid of Outlook? DavMail is a POP/IMAP/SMTP/Caldav/LDAP
- exchange gateway allowing users to use any mail/calendar client (e.g.
- Thunderbird with Lightning or Apple iCal) with an Exchange server, even from
- the internet or behind a firewall through Outlook Web Access. DavMail now
- includes an LDAP gateway to Exchange global address book to allow recipient
- address completion in mail compoze window and full calendar support with
- attendees free/busy display.
+ Ever wanted to get rid of Outlook ? DavMail is
+ a POP/IMAP/SMTP/Caldav/Carddav/LDAP exchange gateway allowing users to use any
+ mail/calendar client (e.g. Thunderbird with Lightning or Apple iCal) with an
+ Exchange server, even from the internet or behind a firewall through Outlook
+ Web Access. DavMail now includes an LDAP gateway to Exchange global address
+ book and user personal contacts to allow recipient address completion in mail
+ compose window and full calendar support with attendees free/busy display.
.
The main goal of DavMail is to provide standard compliant protocols in front
- of proprietary Exchange. This means LDAP for address book, SMTP to send
+ of proprietary Exchange. This means LDAP for global address book, SMTP to send
messages, IMAP to browse messages on the server in any folder, POP to retrieve
- inbox messages only and Caldav for calendar support. Thus any standard
- compliant client can be used with Microsoft Exchange.
+ inbox messages only, Caldav for calendar support and Carddav for personal
+ contacts sync. Thus any standard compliant client can be used with Microsoft
+ Exchange.
.
DavMail gateway is implemented in java and should run on any platform.
- Releases are tested on Windows, Linux (Ubuntu) and Mac OSX.
+ Releases are tested on Windows, Linux (Ubuntu) and Mac OSX. Tested
+ successfully with the Iphone (gateway running on a server).
--
2.10.1
>From aa56ebab78a102bec302975783c4c4248e5642bc Mon Sep 17 00:00:00 2001
From: Antonio Ospite <a...@ao2.it>
Date: Sat, 29 Oct 2016 18:21:33 +0200
Subject: [PATCH 17/19] debian/davmail.desktop: update and fix a lintian
warning
X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM<pyWR#k60!#=#>/Vb;]yA5<GWI5`6u&+
;6b'@y|8w"wB;4/e!7wYYrcqdJFY,~%Gk_4]cq$Ei/7<j&N3ah(m`ku?pX.&+~:_/wC~dwn^)MizBG
!pE^+iDQQ1yC6^,)YDKkxDd!T>\I~93>J<_`<4)A{':UrE
Use the values from the buil.xml file from upstream, the Comment looks
more up to date, and it specifies a Categories field.
Also add the Keywords field to fix a lintian message:
I: davmail: desktop-entry-lacks-keywords-entry usr/share/applications/davmail.desktop
---
debian/davmail.desktop | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/debian/davmail.desktop b/debian/davmail.desktop
index a9609e1..4aee107 100644
--- a/debian/davmail.desktop
+++ b/debian/davmail.desktop
@@ -4,5 +4,7 @@ Name=DavMail
Type=Application
Terminal=false
Exec=/usr/bin/davmail
-Comment=DavMail Exchange Gateway
+Comment=DavMail POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway
Icon=/usr/share/icons/davmail.png
+Categories=GTK;GNOME;Network;
+Keywords=pop;imap;smtp;exchange;owa;outlook
--
2.10.1
>From 62f93a006b0f50688cae0e032ac16904491ef61b Mon Sep 17 00:00:00 2001
From: Antonio Ospite <a...@ao2.it>
Date: Sat, 29 Oct 2016 19:11:51 +0200
Subject: [PATCH 18/19] debian/patches: drop the patch to the upstrem
davmail.desktop file
X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM<pyWR#k60!#=#>/Vb;]yA5<GWI5`6u&+
;6b'@y|8w"wB;4/e!7wYYrcqdJFY,~%Gk_4]cq$Ei/7<j&N3ah(m`ku?pX.&+~:_/wC~dwn^)MizBG
!pE^+iDQQ1yC6^,)YDKkxDd!T>\I~93>J<_`<4)A{':UrE
The package provides its own davamil.desktop file anyways.
---
...-Encoding-line-from-desktop-file-to-make-linti.patch | 17 -----------------
debian/patches/series | 1 -
2 files changed, 18 deletions(-)
delete mode 100644 debian/patches/0005-Remove-Encoding-line-from-desktop-file-to-make-linti.patch
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
deleted file mode 100644
index ed3fec7..0000000
--- a/debian/patches/0005-Remove-Encoding-line-from-desktop-file-to-make-linti.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From: Matthias Schmitz <matth...@sigxcpu.org>
-Date: Sat, 13 Apr 2013 02:50:56 +0200
-Subject: Remove Encoding: line from desktop file to make lintian happy
-
----
- davmail.desktop | 1 -
- 1 file changed, 1 deletion(-)
-
---- a/davmail.desktop
-+++ b/davmail.desktop
-@@ -1,6 +1,5 @@
- [Desktop Entry]
- Version=1.0
--Encoding=UTF-8
- Name=DavMail
- Type=Application
- Terminal=false
diff --git a/debian/patches/series b/debian/patches/series
index 027fe34..2fcca21 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
0001-no-windows-service.patch
0002-no-osx-tray.patch
0004-Set-classpath-add-target-davmail-lib.patch
-0005-Remove-Encoding-line-from-desktop-file-to-make-linti.patch
0006-Disable-the-check-for-a-new-release.patch
--
2.10.1
>From 3777bdccd0e6bd13230f7efdee1046efbc8d7074 Mon Sep 17 00:00:00 2001
From: Antonio Ospite <a...@ao2.it>
Date: Sun, 30 Oct 2016 00:00:03 +0200
Subject: [PATCH 19/19] debian/davmail.i: update the man page
X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM<pyWR#k60!#=#>/Vb;]yA5<GWI5`6u&+
;6b'@y|8w"wB;4/e!7wYYrcqdJFY,~%Gk_4]cq$Ei/7<j&N3ah(m`ku?pX.&+~:_/wC~dwn^)MizBG
!pE^+iDQQ1yC6^,)YDKkxDd!T>\I~93>J<_`<4)A{':UrE
Refresh the date and update the copyright info.
Mention the "-notray" option, and that even when using it davmail will
still show a GUI.
Mention the user configuration file.
---
debian/davmail.1 | 32 ++++++++++++++++++++++++++------
1 file changed, 26 insertions(+), 6 deletions(-)
diff --git a/debian/davmail.1 b/debian/davmail.1
index 1d50bd6..a8deadc 100644
--- a/debian/davmail.1
+++ b/debian/davmail.1
@@ -1,7 +1,7 @@
.\" Hey, EMACS: -*- nroff -*-
.\" (C) Copyright 2012 Alexandre Rossi <alexandre.ro...@gmail.com>
-.\"
-.TH DAVMAIL 1 "September 2012"
+.\" (C) Copyright 2016 Antonio Ospite <a...@ao2.it>
+.TH DAVMAIL 1 "October 2016"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
@@ -14,12 +14,16 @@
.\" .br insert line break
.\" .sp <n> insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
+
.SH NAME
davmail \- POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway
+
.SH SYNOPSIS
.B davmail
-.RI [ config-file-path ]
-.br
+.RI [-notray]
+.RI [CONFIG_FILE_PATH]
+
+
.SH DESCRIPTION
This manual page documents briefly the
.B davmail
@@ -28,12 +32,28 @@ command.
\fBdavmail\fP creates a gateway making the Microsoft Exchange mail, contacts
and calendar protocol available in standard protocols such as POP, IMAP, CalDAV,
SMTP and LDAP.
+.PP
+This manual page was written for the Debian distribution because the
+original program does not have a manual page.
.SH OPTIONS
-\fBdavmail\fP takes a single command line argument, the configuration file
-path. The configuration file syntax is described deeply on the \fBdavmail\fP
+\fBdavmail\fP can take the path of the configuration file on the command line.
+.PP
+The configuration file syntax is described deeply on the \fBdavmail\fP
website.
+.PP
+davmail accepts the following options:
+.TP
+.B \-notray
+Do not create a system tray icon.
+.PP
+Note that even when passing "\-notray" davmail will still show a graphical user interface.
+.br
+To run davamil without a GUI set the "davmail.server" to "true" in the configuration file.
.SH FILES
.TP
+.I $HOME/.davmail.properties
+The user configuration file. If it exists this will be loaded when the CONFIG_FILE_PATH argument is not passed on the command line.
+.TP
.I /etc/davmail.properties
The system wide configuration file.
.TP
--
2.10.1
