From e90eb4dfe648857c9bccb111bef97175c9d30fc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 7 Dec 2022 10:24:20 +0100 Subject: debian/copyright: Fix some nitpicks --- debian/changelog | 2 ++ debian/copyright | 19 ++++++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e1ac3579..9b0dce44 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,8 @@ libunistring (1.1-1~experimental1) experimental; urgency=medium - debian/patches/0010-AC_INIT.patch - debian/patches/0005-fix_build_musl.patch - debian/patches/0705-gcc-9.patch + * debian/copyright: Fix some nitpicks. + (Many thanks to Bastian Germann ) -- Jörg Frings-Fürst Thu, 27 Oct 2022 14:33:48 +0200 diff --git a/debian/copyright b/debian/copyright index 47894ea7..5c8df23f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -16,7 +16,7 @@ License: FreeSoftware Files: doc/* Copyright: 2001-2022 Free Software Foundation, Inc. -License: GPL-3+ or GFDL-1.2+ +License: GPL-3+ or GFDL-NIV-1.2+ Files: tests/* woe32dll/* autogen.sh Copyright: 1990-2022 Free Software Foundation, Inc. @@ -27,7 +27,6 @@ Copyright: 1995-2017 Free Software Foundation, Inc. License: GPL-2+ Files: m4/init-package-version.m4 - build-aux/ltmain.sh Copyright: 1992-2021, Free Software Foundation, Inc. License: GPL-2+ with distribution exception This file is free software, distributed under the terms of the GNU @@ -42,9 +41,19 @@ Copyright: 1999-2005 Patrice Dumas , 1999-2005 Adrian Aichner License: GPL-2+ +Files: build-aux/ltmain.sh +Copyright: 1996-2021 Free Software Foundation, Inc. + 2004-2019, 2021 Bootstrap Authors +License: GPL-2+ with distribution exception, Expat and GPL-2+ + 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: build-aux/install-sh Copyright: 1994, X Consortium -License: MIT +License: X11 Files: debian/* Copyright: 2009-2011 Andreas Rottmann @@ -107,7 +116,7 @@ License: GPL-2+ version 2 can be found in the file `/usr/share/common-licenses/GPL-2'. -License: GFDL-1.2+ +License: GFDL-NIV-1.2+ This manual is covered by the GNU FDL. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (FDL), either version 1.2 of the @@ -119,7 +128,7 @@ License: GFDL-1.2+ version 1.2 can be found in the file `/usr/share/common-licenses/GFDL-1.2'. -License: MIT +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 -- cgit v1.2.3