[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 52e44f16e423f692be92c3e4bae3dd7871033ee9
Merge: a7056fb352bfbd1acca2a945edd29adf54064d38 e0d6651a0d25fa2d8575b50af5d5331e1e20ea85
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Wed Mar 28 15:26:05 2012 +0200

    Merge branch 'master' of ssh://git.debian.org/git/pkg-proftpd/proftpd-dfsg
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/control.in
    	debian/copyright

diff --combined debian/changelog
index cf6736f,986a8be..facd174
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,30 +1,34 @@@
- proftpd-dfsg (1.3.4a-2) unstable; urgency=low
+ proftpd-dfsg (1.3.4a-2) UNRELEASED; urgency=low
  
-   * Upgraded to copyright format 1.0.
++  [ Mahyuddin Susanto ]
+   * Team upload.
+   * Fix typo in proftpd.conf templates line 133, thanks John Smith.
+     (Closes: #655630)
+   * Updated Danish translations, thanks Joe Dalton. (Closes: #659326)
+   * debian/copyright:
+     - Resync with latest dep5 format.
+     - Use stand-alone license paragraph for repeatable license.
+     - Use whitespace instead of comma separated for Files fields.
+     - wrap-and-sort.
+   * debian/control:
+     - Bump Standards-Version to 3.9.3.
+   * debian/rules: Enabled hardened flags, patch from Moritz Muehlenhoff.
+     (Closes: #657213)
+   * debian/changelog: Wrap latest changelog line 3 to 80 line, thanks lintian.
+   * debian/proftpd-basic.install: Add missing sftp-sql modules.
+     (Closes: 665191)
+ 
 - -- Mahyuddin Susanto <udienz at ubuntu.com>  Mon, 26 Mar 2012 23:27:59 +0700
++  [ Francesco Paolo Lovergine ]
 +  * 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
++ -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 28 Mar 2012 15:24:13 +0200
  
  proftpd-dfsg (1.3.4a-1) unstable; urgency=low
  
    * New upstream release.
    * Merged patch removed: 3711.
-   * Now enabled PCRE instead of glibc POSIX regex and added required libpcre3-dev 
-     build-dep.
+   * Now enabled PCRE instead of glibc POSIX regex and added required
+     libpcre3-dev build-dep.
    * Added libpcre3-dev dependency to libproftpd-dev due to header files
      inclusion.
  
diff --combined debian/copyright
index 8cf2030,71916f1..b9fbe03
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,15 -1,15 +1,17 @@@
 -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ 
 +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
- 	1999-2000, MacGyver aka Habeeb J. Dihu <macgyver at tos.net>
- 	2001-2008, The ProFTPD Project team
- 	2001-2008, TJ Saunders <tj at castaglia.org>
+ Copyright: 1997, 1998 Public Flood Software
+ 	1999, 2000 MacGyver aka Habeeb J. Dihu <macgyver at tos.net>
+ 	2001, 2008 The ProFTPD Project team
+ 	2001, 2008 TJ Saunders <tj at castaglia.org>
+ License: GPL-2+
+ 
  License: GPL-2+
   This package is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@@ -32,10 -32,12 +34,12 @@@ Comment: As a special exemption, Publi
   with OpenSSL, and distribute the resulting executable, without including
   the source code for OpenSSL in the source distribution.
  
- Files: src/xferlog*, include/xferlog.h, contrib/xferstats.holger-preiss
+ Files: src/xferlog* include/xferlog.h contrib/xferstats.holger-preiss
  Copyright: 1999-2000, WU-FTPD Development Group
  	1998, Holger Preiss (TU Dresden)
  License: Academic
+ 
+ License: Academic
   Copyright (c) 1994  Washington University in Saint Louis.
   All rights reserved.
   .
@@@ -92,5 -94,5 +96,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