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

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 32edcaa189307e76d8d927525f9a18b8f5fbfba3
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Sat Feb 12 17:36:39 2011 +0100

    Minor fix for grep use in postinst.

diff --git a/debian/changelog b/debian/changelog
index ebb7738..c157079 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ proftpd-dfsg (1.3.3d-3) unstable; urgency=low
 
   * Updated danish template.
     (closes: #599862)
+  * Now grep use --silet to avoid warning at /etc/inetd.conf parsing.
+    (closes: #605781)
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Sat, 12 Feb 2011 15:52:37 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Sat, 12 Feb 2011 17:35:25 +0100
 
 proftpd-dfsg (1.3.3d-2) unstable; urgency=low
 
diff --git a/debian/proftpd-basic.postinst b/debian/proftpd-basic.postinst
index e2266d0..fb6672e 100644
--- a/debian/proftpd-basic.postinst
+++ b/debian/proftpd-basic.postinst
@@ -150,7 +150,7 @@ if [ "$1" = "configure" ]; then
     done
     
     # update-inetd does not manage hostlist prefix to service, at least avoid to add a duplicated line
-    if [ -f /etc/inetd.conf -a $(grep -q '^([[:alnum:],.]+)?:?ftp[[:space:]]+' /etc/inetd.conf|wc -l) -eq 0 ]; then
+    if [ -f /etc/inetd.conf -a $(grep -qs '^([[:alnum:],.]+)?:?ftp[[:space:]]+' /etc/inetd.conf|wc -l) -eq 0 ]; then
     	update-inetd --group STANDARD --add 'ftp	stream	tcp	nowait	root	/usr/sbin/tcpd /usr/sbin/proftpd' 
     fi
 

-- 
ProFTPD core package