work on d/copyright

1 files changed, 43 insertions, 48 deletions

diff --git a/debian/copyright b/debian/copyright
index c8aaec9f..b8e61b57 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,80 +3,52 @@ Upstream-Name: libunistring
 Upstream-Contact: Bruno Haible <bruno@clisp.org>
 Source: http://ftp.gnu.org/gnu/libunistring/
 
-Files: lib/*
-Copyright: 1995-2009, Free Software Foundation, Inc.
-License: LGPL-3+
-
-Files: doc/*
-Copyright: 2001-2009, Free Software Foundation, Inc.
-License: GPL-3+ or GFDL-1.2+
-
-Files: tests/* woe32dll/* autogen.sh
-Copyright: 1990-2009, Free Software Foundation, Inc.
-License: GPL-3+
+Files: *
+Copyright: 1995-2016 Free Software Foundation, Inc.
+License: LGPL-3+ or GPL-2+
 
 Files: gnulib-m4/* m4/*.m4
-Copyright: 1995-2009, Free Software Foundation, Inc.
-License:
+Copyright: 1995-2016 Free Software Foundation, Inc.
+License: FreeSoftware
  This file is free software; the Free Software Foundation
  gives unlimited permission to copy and/or distribute it,
  with or without modifications, as long as this notice is preserved.
 
 Files: m4/init-package-version.m4
+       build-aux/ltmain.sh
 Copyright: 1992-2009, Free Software Foundation, Inc.
-License:
+License: GPL-2+ with distribution exception
  This file is free software, distributed under the terms of the GNU
  General Public License.  As a special exception to the GNU General
  Public License, this file may be distributed as part of a program
  that contains a configuration script generated by Autoconf, under
  the same distribution terms as the rest of that program.
 
+Files: doc/*
+Copyright: 2001-2009 Free Software Foundation, Inc.
+License: GPL-3+ or GFDL-1.2+
+
+Files: tests/* woe32dll/* autogen.sh
+Copyright: 1990-2016 Free Software Foundation, Inc.
+License: GPL-3+
+
 Files: build-aux/*
-Copyright: 1995-2009, Free Software Foundation, Inc.
+Copyright: 1995-2014 Free Software Foundation, Inc.
 License: GPL-2+
 
 Files: build-aux/texi2html
-Copyright: 1999-2005, Patrice Dumas <dumas@centre-cired.fr>,
-           1999-2005, Derek Price <derek@ximbiot.com>,
-           1999-2005, Adrian Aichner <adrian@xemacs.org>
+Copyright: 1999-2005 Patrice Dumas <dumas@centre-cired.fr>,
+           1999-2005 Derek Price <derek@ximbiot.com>,
+           1999-2005 Adrian Aichner <adrian@xemacs.org>
 License: GPL-2+
 
-Files: build-aux/ltmain.sh
-Copyright: 1996-2008, Free Software Foundation, Inc.
-License: GPL-2+ with exception
- As a special exception to the GNU General Public License,
- if you distribute this file as part of a program or library that
- is built using GNU Libtool, you may include this file under the
- same distribution terms that you use for the rest of that program.
-
 Files: build-aux/install-sh
 Copyright: 1994, X Consortium
 License: MIT
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to
- deal in the Software without restriction, including without limitation the
- rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- sell copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
- X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
- TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- .
- Except as contained in this notice, the name of the X Consortium shall not
- be used in advertising or otherwise to promote the sale, use or other deal-
- ings in this Software without prior written authorization from the X Consor-
- tium.
 
 Files: debian/*
 Copyright: 2009      Andreas Rottmann <rotty@debian.org>
-           2017      Jörg Frings-Fürst <debian@jff-webhsoting.net>
+           2017      Jörg Frings-Fürst <debian@jff-webhosting.net>
 License: GPL-3+
 
 License: LGPL-3+
@@ -146,3 +118,26 @@ License: GFDL-1.2+
  On Debian systems the full text of the GNU Free Documentation License
  version 1.2 can be found in the file
  `/usr/share/common-licenses/GFDL-1.2'.
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to
+ deal in the Software without restriction, including without limitation the
+ rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ sell copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+ TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ .
+ Except as contained in this notice, the name of the X Consortium shall not
+ be used in advertising or otherwise to promote the sale, use or other deal-
+ ings in this Software without prior written authorization from the X Consor-
+ tium.