[SCM] proftpd-dfsg branch, master, updated. upstream/1.3.5_rc1-96-g4752fb6

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 4752fb639ca3aa9bd4bbfceaba86620ccd357eb6
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Thu Mar 7 10:53:37 2013 +0100

    New 1.3.5 pre-release

diff --git a/debian/changelog b/debian/changelog
index 89762bf..eba0dfa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+proftpd-dfsg (1.3.5~rc2-1) experimental; urgency=low
+
+  * New upstream pre-releaese.
+  * Refreshed all Debian related patches.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 07 Mar 2013 10:23:59 +0100
+
 proftpd-dfsg (1.3.5~rc1-2) experimental; urgency=low
 
   * Now signal() uses a schedule for --retry in start-stop-daemon instead of a 
diff --git a/debian/patches/ftpasswd.cracklib.location b/debian/patches/ftpasswd.cracklib.location
index b651186..67da322 100644
--- a/debian/patches/ftpasswd.cracklib.location
+++ b/debian/patches/ftpasswd.cracklib.location
@@ -6,8 +6,8 @@ Forwarded: not needed
 
 Index: proftpd-dfsg/contrib/ftpasswd
 ===================================================================
---- proftpd-dfsg.orig/contrib/ftpasswd	2011-10-05 18:05:31.000000000 +0200
-+++ proftpd-dfsg/contrib/ftpasswd	2011-10-05 18:06:25.000000000 +0200
+--- proftpd-dfsg.orig/contrib/ftpasswd	2013-03-07 10:26:00.000000000 +0100
++++ proftpd-dfsg/contrib/ftpasswd	2013-03-07 10:26:00.000000000 +0100
 @@ -36,7 +36,8 @@
  my $default_passwd_file = "./ftpd.passwd";
  my $default_group_file = "./ftpd.group";
@@ -17,4 +17,4 @@ Index: proftpd-dfsg/contrib/ftpasswd
 +my $default_cracklib_dict = "/var/cache/cracklib";
  my $cracklib_dict;
  my $output_file;
- my $version = "1.1.3";
+ my $version = "1.2.0";
diff --git a/debian/patches/mod_wrap_noparanoid b/debian/patches/mod_wrap_noparanoid
index 6b7c6aa..ae714d0 100644
--- a/debian/patches/mod_wrap_noparanoid
+++ b/debian/patches/mod_wrap_noparanoid
@@ -5,9 +5,9 @@ Bug-Debian: http://bugs.debian.org/366397
 
 Index: proftpd-dfsg/contrib/mod_wrap.c
 ===================================================================
---- proftpd-dfsg.orig/contrib/mod_wrap.c	2011-10-05 18:05:31.000000000 +0200
-+++ proftpd-dfsg/contrib/mod_wrap.c	2011-10-05 18:06:49.000000000 +0200
-@@ -924,8 +924,7 @@
+--- proftpd-dfsg.orig/contrib/mod_wrap.c	2013-03-07 10:26:21.000000000 +0100
++++ proftpd-dfsg/contrib/mod_wrap.c	2013-03-07 10:26:21.000000000 +0100
+@@ -942,8 +942,7 @@
  
    fromhost(&request);
  
diff --git a/debian/patches/silent b/debian/patches/silent
index 246d462..de0c999 100644
--- a/debian/patches/silent
+++ b/debian/patches/silent
@@ -5,9 +5,9 @@ Forwarded: not needed
 
 Index: proftpd-dfsg/src/dirtree.c
 ===================================================================
---- proftpd-dfsg.orig/src/dirtree.c	2013-01-08 15:42:19.000000000 +0100
-+++ proftpd-dfsg/src/dirtree.c	2013-01-08 15:46:50.000000000 +0100
-@@ -3156,9 +3156,6 @@
+--- proftpd-dfsg.orig/src/dirtree.c	2013-03-07 10:26:35.000000000 +0100
++++ proftpd-dfsg/src/dirtree.c	2013-03-07 10:26:35.000000000 +0100
+@@ -3219,9 +3219,6 @@
        }
      }
  

-- 
ProFTPD core package