[SCM] proftpd-dfsg branch, master, updated. upstream/1.3.4a-70-g52e44f1

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit a7056fb352bfbd1acca2a945edd29adf54064d38
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Wed Mar 28 15:20:59 2012 +0200

    Minor changes for copyright new format.

diff --git a/debian/changelog b/debian/changelog
index fbcee81..cf6736f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+proftpd-dfsg (1.3.4a-2) unstable; urgency=low
+
+  * Upgraded to copyright format 1.0.
+  * Added a note about the need of removing rfc/ folder in upstream sources.
+  * Policy bumped to 3.9.3, no changes required.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 27 Feb 2012 11:27:24 +0100
+
 proftpd-dfsg (1.3.4a-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 148b502..078cd62 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: net
 Priority: optional
 Maintainer: ProFTPD Maintainance Team <pkg-proftpd-maintainers at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Build-Depends: libmysqlclient-dev, libpam-dev, debhelper (>= 7), zlib1g-dev, 
  libpq-dev, libldap2-dev, libssl-dev (>= 0.9.8l), libwrap0-dev, libcap-dev [linux-any], 
  autotools-dev, libncurses5-dev, libacl1-dev, libattr1-dev, unixodbc-dev, libsqlite3-dev,
diff --git a/debian/control.in b/debian/control.in
index cf569e6..f3ec91b 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,7 +3,7 @@ Section: net
 Priority: optional
 Maintainer: ProFTPD Maintainance Team <pkg-proftpd-maintainers at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Build-Depends: libmysqlclient-dev, libpam-dev, debhelper (>= 7), zlib1g-dev, 
  libpq-dev, libldap2-dev, libssl-dev (>= 0.9.8l), libwrap0-dev, libcap-dev [linux-any], 
  autotools-dev, libncurses5-dev, libacl1-dev, libattr1-dev, unixodbc-dev, libsqlite3-dev,
diff --git a/debian/copyright b/debian/copyright
index e4a2537..8cf2030 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,9 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: ProFTPD
 Upstream-Contact: The ProFTPD Project team, TJ Saunders <tj at castaglia.org>
 Source: http://www.proftpd.org/
+Comment: The DFSG tarball is created by removing by hand the rfc/ folder
+ distributed by upstream, because IETF RFCs license is not compatible.
 
 Files: *
 Copyright:  1997-1998, Public Flood Software
@@ -90,5 +92,5 @@ Files: debian/*
 Copyright: 1997-2000, Johnie Ingram <johnie at debian.org>
 	2001-2002, Ivo Timmermans <ivo at debian.org>
 	2002-2003, Paul Martin <pm at debian.org>
-	2003-2011, Francesco Paolo Lovergine <frankie at debian.org>
+	2003-2012, Francesco Paolo Lovergine <frankie at debian.org>
 License: GPL-2+

-- 
ProFTPD core package