[SCM] proftpd-dfsg branch, master, updated. upstream/1.3.4a-82-g99fbc33

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 99fbc334eace80d1e99302b8b9ecc987d45d73a5
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Tue Jan 8 17:22:44 2013 +0100

    Some minor packaging fixes.

diff --git a/debian/changelog b/debian/changelog
index f7f4f59..c0058ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
 proftpd-dfsg (1.3.5~rc1-1) experimental; urgency=low
 
   * New upstream pre-release.
+    (closes: #697526, #691618)
   * Refreshed main patchset for 1.3.5 source tree.
   * Added mod_geoip module among contributed module and a new binary
     package to depend on GeoIP library.
+  * Now all calls of /etc/init.d/proftpd or invoke-rc.d cannot fail anymore.
+    (closes: #622126)
+  * Now `ftp' user is only removed in postrmi purge, without removing 
+    its home dir. (closes: #655514)
+  * 
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 08 Jan 2013 15:42:27 +0100
 
diff --git a/debian/proftpd-basic.postinst b/debian/proftpd-basic.postinst
index dde2315..37c464c 100644
--- a/debian/proftpd-basic.postinst
+++ b/debian/proftpd-basic.postinst
@@ -199,7 +199,7 @@ if [ -e "/etc/init.d/proftpd" ]; then
 	    proftpd -t >/dev/null 2>&1
     	if [ $? = 0 ]; then
 		set -e
-		invoke-rc.d proftpd start
+		invoke-rc.d proftpd start || true
 	else
 		echo "Cannot start proftpd, please check syntax of your configuration file $CONF"
 	fi
diff --git a/debian/proftpd-basic.postrm b/debian/proftpd-basic.postrm
index 569ead7..168adaf 100644
--- a/debian/proftpd-basic.postrm
+++ b/debian/proftpd-basic.postrm
@@ -13,7 +13,7 @@ then
     rm -rf /var/log/proftpd
     rm -f /etc/logrotate.d/proftpd-basic
     userdel --remove --force proftpd || true
-    userdel --remove --force ftp || true
+    userdel ftp || true
     update-rc.d proftpd remove >/dev/null || exit $?
 fi
 
diff --git a/debian/proftpd-basic.prerm b/debian/proftpd-basic.prerm
index 0713b29..c8b570d 100644
--- a/debian/proftpd-basic.prerm
+++ b/debian/proftpd-basic.prerm
@@ -3,10 +3,10 @@
 set -e
 
 if [ -x "/usr/sbin/invoke-rc.d" ]; then
-    invoke-rc.d proftpd stop
+    invoke-rc.d proftpd stop || true
 else 
 	if [ -x "/etc/init.d/proftpd" ]; then
-		/etc/init.d/proftpd stop
+		/etc/init.d/proftpd stop || true
 	fi
 fi
 

-- 
ProFTPD core package