[SCM] proftpd-dfsg branch, master, updated. debian/1.3.3a-6-35-gef8d7dc

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit ef8d7dc7060612186674c174ccd45ebb3e43a0b9
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Mon Mar 21 12:09:04 2011 +0100

    Merged from debian/1.3.3 branch.

diff --git a/debian/changelog b/debian/changelog
index f24aa11..9b9662f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -47,6 +47,9 @@ proftpd-dfsg (1.3.4~rc1+20110317-1) unstable; urgency=low
   * Now clean target does not remove upstream files to be more nice against gbp.
   * Fixed a typo in debian/proftpd-substvars.in and regenerated the template. 
   * Fixed a typo in proftpd-dev.README.Debian
+  * Moved ftp user home to /srv/ftp as used by other ftp servers.
+  * Now ftp home and user are removed on purge (old or new one).
+  * Removing the whole log directory on purge.
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 17 Mar 2011 13:09:12 +0100
 
diff --git a/debian/proftpd-basic.postinst b/debian/proftpd-basic.postinst
index fb6672e..dde2315 100644
--- a/debian/proftpd-basic.postinst
+++ b/debian/proftpd-basic.postinst
@@ -27,7 +27,7 @@ installftp()
 {
 	if ! grep -q "^ftp:" /etc/passwd
 	then
-	    adduser --system ftp || true
+	    adduser --system ftp --home /srv/ftp || true
             if [ -f /usr/share/proftpd/templates/welcome.msg -a -d ~ftp ] ; then
                 cp -p -v /usr/share/proftpd/templates/welcome.msg ~ftp/welcome.msg.proftpd-new || true
                 do_update ~ftp/welcome.msg || true
diff --git a/debian/proftpd-basic.postrm b/debian/proftpd-basic.postrm
index 1abf5ba..f34aa1a 100644
--- a/debian/proftpd-basic.postrm
+++ b/debian/proftpd-basic.postrm
@@ -10,8 +10,10 @@ fi
 if [ "$1" = "purge" ]
 then
     rm -rf /etc/proftpd 
-    update-rc.d proftpd remove >/dev/null || exit $?
+    rm -rf /var/log/proftpd
     userdel --remove --force proftpd || true
+    userdel --remove --force ftp || true
+    update-rc.d proftpd remove >/dev/null || exit $?
 fi
 
 #DEBHELPER#

-- 
ProFTPD core package