[SCM] proftpd-dfsg branch, master, updated. upstream/1.3.5_rc1-98-gf499bf9

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 5cfc49385f825b579aa7cae5a7f57d9b82ab6ad4
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Thu Mar 7 13:32:55 2013 +0100

    Fixed a few minor bugs.

diff --git a/debian/changelog b/debian/changelog
index eba0dfa..418d75b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
 proftpd-dfsg (1.3.5~rc2-1) experimental; urgency=low
 
   * New upstream pre-releaese.
+    (closes: #671063)
   * Refreshed all Debian related patches.
+  * Do not install ftpasswd.1 anymore.
+    (closes: #699800)
+  * Added support for inetutils-inetd. Thanks Mats Erik Andersson.
+    (closes: #679221)
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 07 Mar 2013 10:23:59 +0100
 
diff --git a/debian/proftpd-basic.init b/debian/proftpd-basic.init
index 212e5aa..7b8cfb6 100755
--- a/debian/proftpd-basic.init
+++ b/debian/proftpd-basic.init
@@ -46,9 +46,10 @@ test -f $DAEMON || exit 0
 #
 if ! egrep -qi "^[[:space:]]*ServerType.*standalone" $CONFIG_FILE
 then
-	if egrep -qi "server[[:space:]]*=[[:space:]]*/usr/sbin/proftpd" /etc/xinetd.conf 2>/dev/null || \
-	   egrep -qi "server[[:space:]]*=[[:space:]]*/usr/sbin/proftpd" /etc/xinetd.d/* 2>/dev/null || \
-       egrep -qi "^ftp.*/usr/sbin/proftpd" /etc/inetd.conf 2>/dev/null
+	if egrep -qi "server[[:space:]]*=[[:space:]]*/usr/sbin/(in\.)?proftpd" /etc/xinetd.conf 2>/dev/null || \
+	   egrep -qi "server[[:space:]]*=[[:space:]]*/usr/sbin/(in\.)?proftpd" /etc/xinetd.d/* 2>/dev/null || \
+	   egrep -qi "^ftp.*/usr/sbin/(in\.)?proftpd" /etc/inetd.d/* 2>/dev/null || \
+	   egrep -qi "^ftp.*/usr/sbin/(in\.)?proftpd" /etc/inetd.conf 2>/dev/null
 	then
     		RUN="no"
     		INETD="yes"
@@ -70,7 +71,8 @@ fi
 
 inetd_check()
 {
-	if [ ! -x /usr/sbin/inetd -a ! -x /usr/sbin/xinetd ]; then
+	if [ ! -x /usr/sbin/inetd -a ! -x /usr/sbin/xinetd -a \
+	     ! -x /usr/sbin/inetutils-inetd ]; then
 		echo "Neither inetd nor xinetd appears installed: check your configuration."
 	fi
 }
diff --git a/debian/rules b/debian/rules
index bd6a61a..bc78758 100755
--- a/debian/rules
+++ b/debian/rules
@@ -138,6 +138,8 @@ binary-arch: checkroot build install
 	dh_installlogrotate -a
 	dh_installpam -a --name=$(NAME)
 	dh_lintian -a
+	# removes ftpasswd.1 installed by upstream see #671063
+	rm -f debian/$(PACKAGE)/usr/share/man/man1/ftpasswd.1*
 	# removes proftpd.conf installed by upstream
 	rm -f debian/$(PACKAGE)/etc/$(NAME)/$(NAME).conf
 	

-- 
ProFTPD core package