update debian/copright, convert to DEP5

2 files changed, 62 insertions, 28 deletions

diff --git a/debian/copyright b/debian/copyright
index 331385f..a238af4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,69 @@
-This package was debianized by Michael-John Turner <mj@debian.org> on
-Tue,  7 Dec 1999 12:02:43 +0200.  It is currently packaged by
-Greg Norris <adric@debian.org>.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: libpam-pwdfile
+Source: https://github.com/tiwe-de/libpam-pwdfile
 
-It was downloaded from http://cpbotha.net/pam_pwdfile.html
+Files: pam_pwdfile.c
+Copyright:
+ 1999-2003 Charl P. Botha <cpbotha@cpbotha.net>
+ 2012-2013 Timo Weingärtner <timo@tiwe.de>
+License: PAM
+
+Files: bigcrypt.c
+Copyright: Andy Phillips <atp@mssl.ucl.ac.uk>
+License: PAM
+Comment: The file does not have an explicit License but was meant as a
+ contribution to Linux-PAM
+
+Files: md5.c
+Copyright: 1993 Colin Plumb
+License: Public Domain
+ Public Domain
 
-Upstream Author: Charl P. Botha <cpbotha@ieee.org>
+Files: md5_crypt.c
+Copyright: Poul-Henning Kamp <phk@login.dknet.dk>
+License: "THE BEER-WARE LICENSE" (Revision 42):
+ <phk@login.dknet.dk> wrote this file.  As long as you retain this notice you
+ can do whatever you want with this stuff. If we meet some day, and you think
+ this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 
+Files: debian/*
 Copyright:
-  Copyright (c) Charl P. Botha, 1999-2002. All rights reserved
- 
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions
-  are met:
+ 1999-2000 Michael-John Turner <mj@debian.org>
+ 2003-2005 Greg Norris <adric@debian.org>
+ 2013 Timo Weingärtner <timo@tiwe.de>
+License: PAM
+
+License: PAM
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
   1. Redistributions of source code must retain the above copyright
      notice, and the entire permission notice in its entirety,
      including the disclaimer of warranties.
-  2. Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the distribution.
-  3. The name of the author may not be used to endorse or promote
-     products derived from this software without specific prior
-     written permission.
-  
-  ALTERNATIVELY, this product may be distributed under the terms of
-  the GNU Public License, in which case the provisions of the GPL are
-  required INSTEAD OF the above restrictions.  (This clause is
-  necessary due to a potential bad interaction between the GPL and
-  the restrictions contained in a BSD-style copyright.)
-
-On Debian GNU systems, a copy of the GNU GPL can be found in
-/usr/share/common-licenses/GPL
-
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote
+    products derived from this software without specific prior
+    written permission.
+ .
+ ALTERNATIVELY, this product may be distributed under the terms of the
+ GNU General Public License, in which case the provisions of the GPL are
+ required INSTEAD OF the above restrictions.  (This clause is
+ necessary due to a potential bad interaction between the GPL and
+ the restrictions contained in a BSD-style copyright.)
+ .
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ OF THE POSSIBILITY OF SUCH DAMAGE.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in "/usr/share/common-licenses/GPL".
diff --git a/debian/libpam-pwdfile.lintian-overrides b/debian/libpam-pwdfile.lintian-overrides
deleted file mode 100644
index 99542bc..0000000
--- a/debian/libpam-pwdfile.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# spelling error came from upstream
-spelling-error-in-copyright GNU Public License GNU General Public License