From ebe976d011540d05ef335690097d0358f09d628b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 28 Mar 2017 20:57:31 +0200 Subject: work on d/copyright --- debian/changelog | 1 + debian/copyright | 91 ++++++++++++++++++++++++++------------------------------ 2 files changed, 44 insertions(+), 48 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1f4d1cb3..4d7781e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ libunistring (0.9.7-1) UNRELEASED; urgency=medium - Add myself as Maintainer. * debian/copyright: - Add myself to debian/*. + - Renew licenses and dates. -- Jörg Frings-Fürst Mon, 27 Mar 2017 21:42:44 +0200 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 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 , - 1999-2005, Derek Price , - 1999-2005, Adrian Aichner +Copyright: 1999-2005 Patrice Dumas , + 1999-2005 Derek Price , + 1999-2005 Adrian Aichner 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 - 2017 Jörg Frings-Fürst + 2017 Jörg Frings-Fürst 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. -- cgit v1.2.3