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

[Francesco P. Lovergine]

The following commit has been merged in the master branch:
commit 4725c078b38db62a8d5eedbe89d43e4cbf206cf2
Author: Francesco P. Lovergine <francesco at lovergine.com>
Date:   Thu Mar 17 11:12:31 2011 +0100

    Generated all templates

diff --git a/debian/changelog b/debian/changelog
index cd38f75..fa63535 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,7 @@
-proftpd-dfsg (1.3.3d-5) unstable; urgency=low
+proftpd-dfsg (1.3.4~rc1+20110317-1) unstable; urgency=low
 
-  [ Francesco Paolo Lovergine <frankie at debian.org> ]
-  * Annotated CVE IDs in debian/changelog for recent vulnerabilities fixed.
-  
   [ Mahyuddin Susanto <udienz at ubuntu.com> ]
+
   * Add DEP-3 header in patches:
     - debian/patches/mod_cap
     - debian/patches/ftpstats
@@ -36,7 +34,18 @@ proftpd-dfsg (1.3.3d-5) unstable; urgency=low
     - debian/proftpd-basic.lintian-overrides
     - debian/proftpd-dev.lintian-overrides
 
- -- Mahyuddin Susanto <udienz at ubuntu.com>  Fri, 11 Mar 2011 14:33:29 +0700
+  [ Francesco Paolo Lovergine ]
+
+  * Annotated CVE IDs in debian/changelog for recent vulnerabilities fixed.
+  * New upstream snapshot from 1.3.4 pre-release series.
+  * Patch removed: 
+        debian/patches/prxs (merged upstream)
+  * Patch updated:
+        debian/patches/odbc
+  * Patch use_hypen_in_manpage.patch: dropped extension.
+  * Now debian/control is also a phony target.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 17 Mar 2011 11:05:31 +0100
 
 proftpd-dfsg (1.3.3d-4) unstable; urgency=high
 
diff --git a/debian/control b/debian/control
index 8ffc514..8e4637a 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Depends: netbase (>= 4.13), ${shlibs:Depends}, ${misc:Depends}, debconf (>= 0.5.
 Conflicts: ftp-server
 Breaks: proftpd (<< 1.3.2)
 Replaces: proftpd (<< 1.3.2)
-Provides: ftp-server, proftpd, proftpd-abi-1.3.3d
+Provides: ftp-server, proftpd, proftpd-abi-1.3.4rc2
 Suggests: proftpd-doc, openssl, proftpd-mod-mysql, proftpd-mod-pgsql, proftpd-mod-ldap, proftpd-mod-odbc, proftpd-mod-sqlite, openbsd-inetd | inet-superserver
 Description: Versatile, virtual-hosting FTP daemon - binaries
  ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
diff --git a/debian/patches/odbc b/debian/patches/odbc
index d30fefe..c242d1f 100644
--- a/debian/patches/odbc
+++ b/debian/patches/odbc
@@ -5,12 +5,12 @@ Bug-Debian: http://bugs.debian.org/366397
 
 Index: proftpd-dfsg/contrib/mod_sql_odbc.c
 ===================================================================
---- proftpd-dfsg.orig/contrib/mod_sql_odbc.c	2011-02-07 17:47:07.000000000 +0100
-+++ proftpd-dfsg/contrib/mod_sql_odbc.c	2011-02-08 13:37:54.000000000 +0100
+--- proftpd-dfsg.orig/contrib/mod_sql_odbc.c	2011-03-17 10:44:56.000000000 +0100
++++ proftpd-dfsg/contrib/mod_sql_odbc.c	2011-03-17 10:48:28.000000000 +0100
 @@ -22,6 +22,7 @@
   * the source code for OpenSSL in the source distribution.
   *
-  * $Id: mod_sql_odbc.c,v 1.11 2009/10/02 21:22:56 castaglia Exp $
+  * $Id: mod_sql_odbc.c,v 1.12 2011/02/27 21:36:04 castaglia Exp $
 + * $Libraries: -lodbc $
   */
  
diff --git a/debian/patches/series b/debian/patches/series
index 5731575..8c40ce7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,7 +9,5 @@ ftpstats
 mod_cap
 odbc
 mod_vroot
-prxs
 silent
-CVE-2011-1137
-use_hypen_in_manpage.patch
+use_hypen_in_manpage
diff --git a/debian/proftpd-substvars b/debian/proftpd-substvars
index 60feb1f..1909836 100644
--- a/debian/proftpd-substvars
+++ b/debian/proftpd-substvars
@@ -1 +1 @@
-proftpd:depends=proftpd-abi-1.3.3d 
+proftpd:depends=proftpd-abi-1.3.4rc2 
diff --git a/debian/rules b/debian/rules
index a040d0c..bf1161a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -172,5 +172,5 @@ checkroot:
 	dh_testdir
 	dh_testroot
 
-.PHONY: binary binary-arch binary-indep clean checkroot myclean install configure debian/proftpd-substvars
+.PHONY: binary binary-arch binary-indep clean checkroot myclean install configure debian/proftpd-substvars debian/control
 

-- 
ProFTPD core package