[SCM] proftpd-dfsg branch, master, updated. upstream/1.3.5_rc1-91-gdeb8e1a

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit c140d3693239363711d357d8167bf3180ac6bcd1
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Thu Jan 10 13:48:19 2013 +0100

    Removed update-inetd dependency

diff --git a/debian/changelog b/debian/changelog
index d64623d..414f3e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ proftpd-dfsg (1.3.5~rc1-2) UNRELEASED; urgency=low
     non standalone mode. Also in that case one could use xinetd which renders
     the update-inetd tool superfluous.
     (closes: #626527)
+  * Added Suggests for the new -geoip module.
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 10 Jan 2013 10:57:37 +0100
 
diff --git a/debian/control b/debian/control
index 9b8b066..0d88523 100644
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,6 @@ Depends: adduser,
          netbase (>= 4.13),
          sed (>= 4.1.5),
          ucf (>= 0.30),
-         update-inetd,
          ${misc:Depends},
          ${shlibs:Depends}
 Conflicts: ftp-server
@@ -49,7 +48,8 @@ Suggests: openbsd-inetd | inet-superserver,
           proftpd-mod-mysql,
           proftpd-mod-odbc,
           proftpd-mod-pgsql,
-          proftpd-mod-sqlite
+          proftpd-mod-sqlite,
+          proftpd-mod-geoip
 Description: Versatile, virtual-hosting FTP daemon - binaries
  ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
  Protocol daemon supports also hidden directories, virtual hosts, and
diff --git a/debian/control.in b/debian/control.in
index c3c4b93..9904f91 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -48,7 +48,8 @@ Suggests: openbsd-inetd | inet-superserver,
           proftpd-mod-mysql,
           proftpd-mod-odbc,
           proftpd-mod-pgsql,
-          proftpd-mod-sqlite
+          proftpd-mod-sqlite,
+          proftpd-mod-geoip
 Description: Versatile, virtual-hosting FTP daemon - binaries
  ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
  Protocol daemon supports also hidden directories, virtual hosts, and

-- 
ProFTPD core package