[SCM] davmail packaging branch, master, updated. debian/4.1.0-2042-1_pre+1-26-g256024b

[Alexandre Rossi]

The following commit has been merged in the master branch:
commit 2993d2031d51052c0ca6c61452fda3853d00872a
Author: Alexandre Rossi <alexandre.rossi at gmail.com>
Date:   Fri May 24 20:12:57 2013 +0200

    install upstream example conf file

diff --git a/debian/init b/debian/init
index e4d7c57..dfd4f35 100755
--- a/debian/init
+++ b/debian/init
@@ -35,7 +35,7 @@ SCRIPTNAME=/etc/init.d/$NAME
 # Exit if daemon run by initscript is disabled
 [ "$ENABLE_DAEMON" = "true" ] || echo "Doing nothing, disabled via /etc/default/davmail"; exit 0
 
-DAEMON_ARGS="/etc/davmail.conf"
+DAEMON_ARGS="/etc/davmail.properties"
 
 # Create logfiles if they do not exist
 if [ ! -r "$LOGFILE" ]
diff --git a/debian/install b/debian/install
index 55d6ef5..e93b852 100644
--- a/debian/install
+++ b/debian/install
@@ -1,4 +1,4 @@
-debian/davmail.conf /etc
+src/etc/davmail.properties /etc
 debian/davmail.xpm /usr/share/pixmaps
 dist/davmail.png /usr/share/icons
 debian/davmail.desktop /usr/share/applications

-- 
davmail packaging