Updating debian/copyright

debian/copyright

@@ -4,49 +4,67 @@ Source: https://fedorahosted.org/kitchen/
 
 Files: *
 Copyright: 2010-2013 Red Hat, Inc
-License: LGPL
+License: LGPL-2.1+
 
-Files: kitchen/text/utf8.py kitchen/text/display.py
+Files:
+ kitchen*/kitchen/text/utf8.py
+ kitchen2/kitchen/text/display.py
 Copyright: 2012 Red Hat, Inc
            2010 Ville Skyttä
            2009 Tim Lauridsen
            2007 Markus Kuhn
-License: LGPL and Kuhn
+License: LGPL-2.1+
 
-Files: kitchen/text/misc.py
+Files: kitchen3/kitchen/text/display.py
+Copyright: 2013 Red Hat, Inc
+           2010 Ville Skyttä
+           2009 Tim Lauridsen
+           2007 Markus Kuhn
+License: LGPL-2.1+
+
+Files: kitchen*/kitchen/text/misc.py
 Copyright: 2012 Red Hat, Inc
            2010 Seth Vidal
-License: LGPL
+License: LGPL-2.1+
 
-Files: kitchen/i18n/__init__.py
+Files: kitchen*/kitchen/i18n/__init__.py
 Copyright: 2010-2012 Red Hat, Inc
            2009 Milos Komarcevic
            2008 Tim Lauridsen
-License: LGPL
+License: LGPL-2.1+
 
-Files: kitchen/pycompat27/subprocess/_subprocess.py
+Files: kitchen2/kitchen/pycompat25/collections/_defaultdict.py
+Copyright: 2007 Justin Kirtland
+License: Python-2.0
+
+Files: kitchen2/kitchen/pycompat27/subprocess/_subprocess.py
 Copyright: 2003-2005 Peter Astrand <astrand@lysator.liu.se>
-License: Python
-
-Files: kitchen/pycompat24/base64/_base64.py
-Copyright: 1995 Jack Jensen
-           2003 Barry Warsaw
-License: Python
-
-Files: kitchen/pycompat25/collections/_defaultdict.py
-Copyright: 2007 Justin Kirkland
-License: Python
+License: Python-2.0
 
 Files: debian/*
-Copyright: 2011-2013 Simon Chopin <chopin.simon@gmail.com>
-License: LGPL
+Copyright:
+ 2011-2013 Simon Chopin <chopin.simon@gmail.com>
+ 2016 Sergio Durigan Junior <sergiodj@sergiodj.net>
+License: LGPL-2.1+
 
-License: Kuhn
- Permission to use, copy, modify, and distribute this software
- for any purpose and without fee is hereby granted. The author
- disclaims all warranties with regard to this software.
+License: LGPL-2.1+
+ kitchen is free software; you can redistribute it and/or modify it under the
+ terms of the GNU Lesser General Public License as published by the Free
+ Software Foundation; either version 2.1 of the License, or (at your option)
+ any later version.
+ .
+ kitchen is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
+ more details.
+ .
+ You should have received a copy of the GNU Lesser General Public License
+ along with kitchen; if not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, a copy of the LGPLv2.1 can be found at
+ /usr/share/common-licenses/LGPL-2.1
 
-License: Python
+License: Python-2.0
  1. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"),
     and the Individual or Organization ("Licensee") accessing and otherwise
     using this software ("Python") in source or binary form and its
@@ -90,20 +108,3 @@ License: Python
  .
  8. By copying, installing or otherwise using Python, Licensee agrees to be
     bound by the terms and conditions of this License Agreement.
-
-License: LGPL
- kitchen is free software; you can redistribute it and/or modify it under the
- terms of the GNU Lesser General Public License as published by the Free
- Software Foundation; either version 2.1 of the License, or (at your option)
- any later version.
- .
- kitchen is distributed in the hope that it will be useful, but WITHOUT ANY
- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
- more details.
- .
- You should have received a copy of the GNU Lesser General Public License
- along with kitchen; if not, see <http://www.gnu.org/licenses/>
- .
- On Debian systems, a copy of the LGPLv2.1 can be found at
- /usr/share/common-licenses/LGPL-2.1