[SCM] proftpd-dfsg branch, master, updated. upstream/1.3.5_rc4-110-gc47ae94

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit a3059d149cdca4482e163782020d1ac4b67670d6
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Thu Jan 30 13:54:14 2014 +0100

    Refreshed one more patch.

diff --git a/debian/patches/ftpasswd.cracklib.location b/debian/patches/ftpasswd.cracklib.location
index 67da322..27c9ae7 100644
--- a/debian/patches/ftpasswd.cracklib.location
+++ b/debian/patches/ftpasswd.cracklib.location
@@ -6,9 +6,9 @@ Forwarded: not needed
 
 Index: proftpd-dfsg/contrib/ftpasswd
 ===================================================================
---- 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 @@
+--- proftpd-dfsg.orig/contrib/ftpasswd	2014-01-30 13:53:27.000000000 +0100
++++ proftpd-dfsg/contrib/ftpasswd	2014-01-30 13:53:27.000000000 +0100
+@@ -37,7 +37,8 @@
  my $default_passwd_file = "./ftpd.passwd";
  my $default_group_file = "./ftpd.group";
  my $shell_file = "/etc/shells";
@@ -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.2.0";
+ my $version = "1.3.0";

-- 
ProFTPD core package