From 31a4da276b78b0424aaafd832e9fb98bf9bb7665 Mon Sep 17 00:00:00 2001 From: Nicolas Braud-Santoni <nicoo@debian.org> Date: Fri, 12 Jul 2019 15:53:50 +0200 Subject: [PATCH 1/3] debian/copyright: Avoid repeating the text for the ISC license --- debian/copyright | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/debian/copyright b/debian/copyright index a9503a1..90bb770 100644 --- a/debian/copyright +++ b/debian/copyright @@ -13,31 +13,11 @@ Files: debian/* Copyright: 2013—2019 Andrej Shadura <andrewsh@debian.org> License: ISC -License: ISC - Permission to use, copy, modify, and/or distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. - . - This software is provided 'as is' and without any warranty, express or - implied. In no event shall the authors be liable for any damages arising - from the use of this software. - Files: bsdstubs.c Copyright: 1998 Todd C. Miller <Todd.Miller@courtesan.com> 2012 William Pitcock <nenolod@dereferenced.org> License: ISC - Permission to use, copy, modify, and distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. - . - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. Files: getopt_long.c Copyright: @@ -157,3 +137,17 @@ License: GPL-2+ . On Debian systems, the complete text of the GNU General Public License version 2 can be found in /usr/share/common-licenses/GPL-2. + + +License: ISC + Permission to use, copy, modify, and distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + . + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -- GitLab From cec5145ec0c296a1e48ea7ce54e457b6ba07c729 Mon Sep 17 00:00:00 2001 From: Nicolas Braud-Santoni <nicoo@debian.org> Date: Fri, 12 Jul 2019 15:55:27 +0200 Subject: [PATCH 2/3] debian/copyright: Update paths for relocated files --- debian/copyright | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/copyright b/debian/copyright index 90bb770..c1bc3ae 100644 --- a/debian/copyright +++ b/debian/copyright @@ -13,13 +13,13 @@ Files: debian/* Copyright: 2013—2019 Andrej Shadura <andrewsh@debian.org> License: ISC -Files: bsdstubs.c +Files: libpkgconf/bsdstubs.c Copyright: 1998 Todd C. Miller <Todd.Miller@courtesan.com> 2012 William Pitcock <nenolod@dereferenced.org> License: ISC -Files: getopt_long.c +Files: cli/getopt_long.c Copyright: 2000 The NetBSD Foundation, Inc. 2002 Todd C. Miller <Todd.Miller@courtesan.com> @@ -55,7 +55,7 @@ License: BSD-4 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Files: getopt_long.h +Files: cli/getopt_long.h Copyright: 2000 The NetBSD Foundation, Inc. License: BSD-2 This code is derived from software contributed to The NetBSD Foundation -- GitLab From 4c681e83eb69037ab4053a13182588386e49266c Mon Sep 17 00:00:00 2001 From: Nicolas Braud-Santoni <nicoo@debian.org> Date: Fri, 12 Jul 2019 15:56:56 +0200 Subject: [PATCH 3/3] debian/copyright: Identify the X11 license for install-sh --- debian/copyright | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/copyright b/debian/copyright index c1bc3ae..bef9049 100644 --- a/debian/copyright +++ b/debian/copyright @@ -84,11 +84,13 @@ License: BSD-2 Files: install-sh Copyright: 1994 X Consortium -License: +Comment: This originates from X11R5 (mit/util/scripts/install.sh), which was later released in X11R6 (xc/config/util/install.sh) with the following copyright and license. . + FSF changes to this file are in the public domain. +License: X11 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 @@ -110,8 +112,6 @@ License: 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. - . - FSF changes to this file are in the public domain. Files: pkg.m4 Copyright: 2004 Scott James Remnant <scott@netsplit.com> -- GitLab