[SCM] proftpd-dfsg branch, master, updated. upstream/1.3.5_rc3-103-gc36f392

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit dd42abf7a179077812d9df52cc5ec9119fef9e8f
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Wed Jul 3 15:04:01 2013 +0200

    Some fixes for geoip module.

diff --git a/debian/changelog b/debian/changelog
index 9a41d28..168ae6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+proftpd-dfsg (1.3.5~rc3-2) UNRELEASED; urgency=low
+
+  * Added version for dependency on memcached, for completeness.
+    (closes: #699514)
+  * The old proftpd-mod-geoip addon module is now onbsoleted by core proftpd,
+    so required Breaks/Replaces are provided to avoid piuparts breakages.
+    (closes: #699647)
+  * Modified modules.conf template to suggest the geoip module.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 03 Jul 2013 14:09:32 +0200
+
 proftpd-dfsg (1.3.5~rc3-1) unstable; urgency=low
 
   * New upstream pre-release. 
diff --git a/debian/control b/debian/control
index 4eb5dd0..f63d4e5 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends: autotools-dev,
                unixodbc-dev,
                zlib1g-dev,
                libgeoip-dev,
-               libmemcached-dev,
+               libmemcached-dev (>= 0.41),
                hardening-includes
 Homepage: http://www.proftpd.org/
 Vcs-Git: git://git.debian.org/pkg-proftpd/proftpd-dfsg.git
@@ -192,6 +192,8 @@ Description: Versatile, virtual-hosting FTP daemon - SQLite3 module
 Package: proftpd-mod-geoip
 Architecture: any
 Depends: proftpd-basic (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Breaks: proftpd-mod-geoip (<< 1.3.5)
+Replaces: proftpd-mod-geoip (<< 1.3.5)
 Description: Versatile, virtual-hosting FTP daemon - GeoIP module
  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 009e827..970d503 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -21,7 +21,7 @@ Build-Depends: autotools-dev,
                unixodbc-dev,
                zlib1g-dev,
                libgeoip-dev,
-               libmemcached-dev,
+               libmemcached-dev (>= 0.41),
                hardening-includes
 Homepage: http://www.proftpd.org/
 Vcs-Git: git://git.debian.org/pkg-proftpd/proftpd-dfsg.git
@@ -192,6 +192,8 @@ Description: Versatile, virtual-hosting FTP daemon - SQLite3 module
 Package: proftpd-mod-geoip
 Architecture: any
 Depends: proftpd-basic (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Breaks: proftpd-mod-geoip (<< 1.3.5)
+Replaces: proftpd-mod-geoip (<< 1.3.5)
 Description: Versatile, virtual-hosting FTP daemon - GeoIP module
  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/templates/modules.conf b/debian/templates/modules.conf
index 1da78e2..23037d2 100644
--- a/debian/templates/modules.conf
+++ b/debian/templates/modules.conf
@@ -89,6 +89,9 @@ LoadModule mod_deflate.c
 LoadModule mod_ifversion.c
 LoadModule mod_tls_memcache.c
 
+# Install proftpd-mod-geoip to use the GeoIP feature
+#LoadModule mod_geoip.c
+
 # keep this module the last one
 LoadModule mod_ifsession.c
 

-- 
ProFTPD core package