[proftpd-dfsg] 03/03: Updated for 1.3.5

[Francesco Lovergine]

This is an automated email from the git hooks/post-receive script.

frankie pushed a commit to branch master
in repository proftpd-dfsg.

commit b63ec2128f324610404efa991456b6206095531d
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Fri Jun 13 12:09:03 2014 +0200

    Updated for 1.3.5
---
 debian/changelog         |  6 ++++++
 debian/control           |  2 +-
 debian/patches/4044      | 16 ----------------
 debian/patches/series    |  1 -
 debian/proftpd-substvars |  2 +-
 5 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 22e788d..cbbda02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+proftpd-dfsg (1.3.5-1) unstable; urgency=medium
+
+  * New upstream release. Patch 4044 merged.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Fri, 13 Jun 2014 11:55:22 +0200
+
 proftpd-dfsg (1.3.5~rc4-3) unstable; urgency=medium
 
   * Fixed postinst for invalid usermod call.
diff --git a/debian/control b/debian/control
index 5ada7b8..87393a9 100644
--- a/debian/control
+++ b/debian/control
@@ -41,7 +41,7 @@ Depends: adduser,
 Conflicts: ftp-server
 Breaks: proftpd (<< 1.3.2)
 Replaces: proftpd (<< 1.3.2)
-Provides: ftp-server, proftpd, proftpd-abi-1.3.5rc3
+Provides: ftp-server, proftpd, proftpd-abi-1.3.5
 Suggests: openbsd-inetd | inet-superserver,
           openssl,
           proftpd-doc,
diff --git a/debian/patches/4044 b/debian/patches/4044
deleted file mode 100644
index 20e4fee..0000000
--- a/debian/patches/4044
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: proftpd-dfsg/modules/mod_facl.c
-===================================================================
---- proftpd-dfsg.orig/modules/mod_facl.c	2014-01-30 13:24:08.000000000 +0100
-+++ proftpd-dfsg/modules/mod_facl.c	2014-05-05 08:32:59.000000000 +0200
-@@ -1072,7 +1072,10 @@
- static void facl_mod_unload_ev(const void *event_data, void *user_data) {
-   if (strcmp("mod_facl.c", (const char *) event_data) == 0) {
-     pr_event_unregister(&facl_module, NULL, NULL);
--    pr_unregister_fs("facl");
-+    if (pr_unregister_fs("/") < 0) {
-+      pr_log_debug(DEBUG0, MOD_FACL_VERSION
-+        ": error unregistering 'facl' FS: %s", strerror(errno));
-+    }
-   }
- }
- #endif /* !PR_SHARED_MODULE */
diff --git a/debian/patches/series b/debian/patches/series
index 506be75..01d4f10 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,4 +11,3 @@ odbc
 silent
 use_hypen_in_manpage
 contrib_hardening_flags
-4044
diff --git a/debian/proftpd-substvars b/debian/proftpd-substvars
index 5ad9124..f8a9542 100644
--- a/debian/proftpd-substvars
+++ b/debian/proftpd-substvars
@@ -1 +1 @@
-proftpd:Depends=proftpd-abi-1.3.5rc4 
+proftpd:Depends=proftpd-abi-1.3.5 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-proftpd/proftpd-dfsg.git