[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 e84194c1a5a68dbc99832001f06c78c19d31f3ee
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Wed Jan 9 12:45:20 2013 +0100

    Fixed locale related issue and missing enable-memcache, mainly.

diff --git a/debian/changelog b/debian/changelog
index c0058ba..a2450a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,20 @@
 proftpd-dfsg (1.3.5~rc1-1) experimental; urgency=low
 
   * New upstream pre-release.
-    (closes: #697526, #691618)
-  * Refreshed main patchset for 1.3.5 source tree.
+    (closes: #697526, #691618, #600596)
+  * Refreshed main patchset for 1.3.5 source tree. CVE-2012-6095 provided
+    by 3841 dropped.
   * Added mod_geoip module among contributed module and a new binary
     package to depend on GeoIP library.
   * Now all calls of /etc/init.d/proftpd or invoke-rc.d cannot fail anymore.
     (closes: #622126)
-  * Now `ftp' user is only removed in postrmi purge, without removing 
+  * Now `ftp' user is only removed in postrm purge, without removing 
     its home dir. (closes: #655514)
-  * 
+  * Missing memcache enabling renders mod_tls_memcache unusable even
+    if present.
+  * Removed it/ru as standalone locale directories. Reason to have them is
+    lost in time and currently wrong. This is also connected with #600596
+    for those languages. Sigh.
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 08 Jan 2013 15:42:27 +0100
 
diff --git a/debian/rules b/debian/rules
index 2286b95..3de8289 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,7 +41,7 @@ CONF_ARGS := --prefix=/usr \
 	     --with-includes=$(shell pg_config --includedir):$(shell mysql_config --include|sed -e 's/-I//') \
 	     --mandir=/usr/share/man --sysconfdir=/etc/$(NAME) --localstatedir=/var/run --libexecdir=/usr/lib/$(NAME) \
 	     --enable-sendfile --enable-facl --enable-dso --enable-autoshadow --enable-ctrls --with-modules=mod_readme \
-	     --enable-ipv6 --enable-nls --with-lastlog=/var/log/lastlog --enable-pcre $(DEVELOPT)
+	     --enable-ipv6 --enable-nls --enable-memcache --with-lastlog=/var/log/lastlog --enable-pcre $(DEVELOPT)
 
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
   CONF_ARGS += --build $(DEB_HOST_GNU_TYPE)
@@ -68,8 +68,6 @@ install: build
 	dh_prep
 	
 	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp INSTALL_STRIP="$(INSTALL_STRIP)" install
-	mv $(CURDIR)/debian/tmp/usr/share/locale/it_IT $(CURDIR)/debian/tmp/usr/share/locale/it
-	mv $(CURDIR)/debian/tmp/usr/share/locale/ru_RU $(CURDIR)/debian/tmp/usr/share/locale/ru
 
 configure: configure-stamp
 configure-stamp: 

-- 
ProFTPD core package