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

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit b4947143a350900299dab2e1e4ee119a4bf073b0
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Fri Apr 22 16:59:38 2011 +0200

    Added new modules building and fixed for mod_vroot still loadedi at configuration time.

diff --git a/debian/changelog b/debian/changelog
index e1dee0d..d12793a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+proftpd-dfsg (1.3.4~rc2-3) unstable; urgency=low
+
+  * Added new contributed modules building and loading: mod_copy, mod_deflate, 
+    mod_ifversion, mod_tls_memcache
+  * Removed mod_vroot loading in modules.conf.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Fri, 22 Apr 2011 16:58:35 +0200
+
 proftpd-dfsg (1.3.4~rc2-2) unstable; urgency=low
 
   * Removed mod_vroot patches, because it will be provided by the separate
diff --git a/debian/proftpd-basic.install b/debian/proftpd-basic.install
index 26b9153..bc24bca 100644
--- a/debian/proftpd-basic.install
+++ b/debian/proftpd-basic.install
@@ -30,4 +30,8 @@ usr/lib/proftpd/mod_wrap2_file.so
 usr/lib/proftpd/mod_wrap2_sql.so
 usr/lib/proftpd/mod_wrap.so
 usr/lib/proftpd/mod_unique_id.so
+usr/lib/proftpd/mod_copy.so
+usr/lib/proftpd/mod_deflate.so
+usr/lib/proftpd/mod_ifversion.so
+usr/lib/proftpd/mod_tls_memcache.so
 usr/share/locale/*
diff --git a/debian/rules b/debian/rules
index a8c865c..abd813a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ endif
 # Note: use --localstatedir=/var/run/proftpd for > 1.3.2
 DSOMODS1 = mod_unique_id:mod_site_misc:mod_load:mod_ban:mod_quotatab:mod_sql:mod_sql_mysql:mod_sql_postgres:mod_sql_sqlite:mod_sql_odbc:mod_dynmasq:
 DSOMODS2 = mod_quotatab_sql:mod_ldap:mod_quotatab_ldap:mod_ratio:mod_tls:mod_rewrite:mod_radius:mod_wrap:mod_wrap2:mod_wrap2_file:
-DSOMODS3 = mod_wrap2_sql:mod_quotatab_file:mod_quotatab_radius:mod_facl:mod_ctrls_admin:
+DSOMODS3 = mod_wrap2_sql:mod_quotatab_file:mod_quotatab_radius:mod_facl:mod_ctrls_admin:mod_copy:mod_deflate:mod_ifversion:mod_tls_memcache:
 DSOMODS4 = mod_exec:mod_sftp:mod_sftp_pam:mod_sftp_sql:mod_shaper:mod_sql_passwd:mod_ifsession
 CONF_ARGS := --prefix=/usr \
 	     --with-includes=$(shell pg_config --includedir):$(shell mysql_config --include|sed -e 's/-I//') \
diff --git a/debian/templates/modules.conf b/debian/templates/modules.conf
index 61bcb0b..1da78e2 100644
--- a/debian/templates/modules.conf
+++ b/debian/templates/modules.conf
@@ -71,7 +71,6 @@ LoadModule mod_wrap2_file.c
 # the previous mod_sql.c module to use this
 #LoadModule mod_wrap2_sql.c
 LoadModule mod_dynmasq.c
-LoadModule mod_vroot.c
 LoadModule mod_exec.c
 LoadModule mod_shaper.c
 LoadModule mod_ratio.c
@@ -85,6 +84,10 @@ LoadModule mod_sftp_pam.c
 
 LoadModule mod_facl.c
 LoadModule mod_unique_id.c
+LoadModule mod_copy.c
+LoadModule mod_deflate.c
+LoadModule mod_ifversion.c
+LoadModule mod_tls_memcache.c
 
 # keep this module the last one
 LoadModule mod_ifsession.c

-- 
ProFTPD core package