diff -Nru pkgconf-1.6.3/debian/changelog pkgconf-1.6.3/debian/changelog --- pkgconf-1.6.3/debian/changelog 2019-07-12 13:40:03.000000000 +0000 +++ pkgconf-1.6.3/debian/changelog 2019-07-18 14:20:46.000000000 +0000 @@ -1,3 +1,16 @@ +pkgconf (1.6.3-4) unstable; urgency=medium + + [ Nicolas Braud-Santoni ] + * debian/copyright: + - Avoid repeating the text for the ISC license + - Update paths for relocated files + - Identify the X11 license for install-sh + * Lintian: Override package-contains-empty-directory when intentional. + * debian/control: Update upstream homepage (moved away from Github). + * Patch issues in manpages. + + -- Andrej Shadura Thu, 18 Jul 2019 11:20:46 -0300 + pkgconf (1.6.3-3) unstable; urgency=medium * Declare Breaks/Replaces against the old package versions (Closes: diff -Nru pkgconf-1.6.3/debian/control pkgconf-1.6.3/debian/control --- pkgconf-1.6.3/debian/control 2019-07-12 13:40:03.000000000 +0000 +++ pkgconf-1.6.3/debian/control 2019-07-18 14:20:46.000000000 +0000 @@ -4,7 +4,7 @@ Maintainer: Andrej Shadura Build-Depends: debhelper-compat (= 12) -Homepage: https://github.com/pkgconf/pkgconf +Homepage: https://git.sr.ht/~kaniini/pkgconf Standards-Version: 4.4.0 Vcs-Git: https://salsa.debian.org/debian/pkgconf.git Vcs-Browser: https://salsa.debian.org/debian/pkgconf diff -Nru pkgconf-1.6.3/debian/copyright pkgconf-1.6.3/debian/copyright --- pkgconf-1.6.3/debian/copyright 2019-07-12 13:40:03.000000000 +0000 +++ pkgconf-1.6.3/debian/copyright 2019-07-18 14:20:46.000000000 +0000 @@ -13,33 +13,13 @@ Copyright: 2013—2019 Andrej Shadura 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 +Files: libpkgconf/bsdstubs.c Copyright: 1998 Todd C. Miller 2012 William Pitcock 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 +Files: cli/getopt_long.c Copyright: 2000 The NetBSD Foundation, Inc. 2002 Todd C. Miller @@ -75,7 +55,7 @@ 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 @@ -104,11 +84,13 @@ 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 @@ -130,8 +112,6 @@ 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 @@ -157,3 +137,17 @@ . 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. diff -Nru pkgconf-1.6.3/debian/patches/0001-Fix-spelling-in-pkg.m4-7.patch pkgconf-1.6.3/debian/patches/0001-Fix-spelling-in-pkg.m4-7.patch --- pkgconf-1.6.3/debian/patches/0001-Fix-spelling-in-pkg.m4-7.patch 1970-01-01 00:00:00.000000000 +0000 +++ pkgconf-1.6.3/debian/patches/0001-Fix-spelling-in-pkg.m4-7.patch 2019-07-18 14:20:46.000000000 +0000 @@ -0,0 +1,34 @@ +From: Nicolas Braud-Santoni +Last-Update: 2019-07-12 +Origin: vendor +Applied-Upstream: db3ba0ef86b67b7f748fc4dd3171eeb30d49796e +Subject: Fix spelling in pkg.m4(7) + +Forwarded: https://lists.sr.ht/~kaniini/pkgconf/patches/6731 +Reviewed-by: Ariadne Conill +--- + man/pkg.m4.7 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/man/pkg.m4.7 b/man/pkg.m4.7 +index 448dda8..f921070 100644 +--- a/man/pkg.m4.7 ++++ b/man/pkg.m4.7 +@@ -87,7 +87,7 @@ be changed by passing the + .Nm DIRECTORY + parameter. + .Pp +-This value can be overriden with the ++This value can be overridden with the + .Fl -with-pkgconfigdir + configure parameter. + .Ss "PKG_NOARCH_INSTALLDIR(DIRECTORY)" +@@ -99,7 +99,7 @@ be changed by passing the + .Nm DIRECTORY + parameter. + .Pp +-This value can be overriden with the ++This value can be overridden with the + .Fl -with-noarch-pkgconfigdir + configure parameter. + .Ss "PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])" diff -Nru pkgconf-1.6.3/debian/patches/0002-Fix-troff-markup-in-pkgconf-personality-5.patch pkgconf-1.6.3/debian/patches/0002-Fix-troff-markup-in-pkgconf-personality-5.patch --- pkgconf-1.6.3/debian/patches/0002-Fix-troff-markup-in-pkgconf-personality-5.patch 1970-01-01 00:00:00.000000000 +0000 +++ pkgconf-1.6.3/debian/patches/0002-Fix-troff-markup-in-pkgconf-personality-5.patch 2019-07-18 14:20:46.000000000 +0000 @@ -0,0 +1,26 @@ +From: Nicolas Braud-Santoni +Last-Update: 2019-07-12 +Origin: vendor +Applied-Upstream: 1d8c6b71d67a121313a204f98729e51157c89f10 +Subject: Fix troff markup in pkgconf-personality(5) + +A list was started with .Bl but not ended (with .El) + +Forwarded: https://lists.sr.ht/~kaniini/pkgconf/patches/6731 +Reviewed-by: Ariadne Conill +--- + man/pkgconf-personality.5 | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/man/pkgconf-personality.5 b/man/pkgconf-personality.5 +index 5815948..8db85b3 100644 +--- a/man/pkgconf-personality.5 ++++ b/man/pkgconf-personality.5 +@@ -72,6 +72,7 @@ A list of directories that are included by default in the search path for + libraries. + (mandatory; fragment list) + .\" ++.El + .Sh EXAMPLES + An example .personality file: + .Bd -literal diff -Nru pkgconf-1.6.3/debian/patches/series pkgconf-1.6.3/debian/patches/series --- pkgconf-1.6.3/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ pkgconf-1.6.3/debian/patches/series 2019-07-18 14:20:46.000000000 +0000 @@ -0,0 +1,2 @@ +0001-Fix-spelling-in-pkg.m4-7.patch +0002-Fix-troff-markup-in-pkgconf-personality-5.patch diff -Nru pkgconf-1.6.3/debian/pkgconf.lintian-overrides pkgconf-1.6.3/debian/pkgconf.lintian-overrides --- pkgconf-1.6.3/debian/pkgconf.lintian-overrides 2019-07-12 13:40:03.000000000 +0000 +++ pkgconf-1.6.3/debian/pkgconf.lintian-overrides 2019-07-18 14:20:46.000000000 +0000 @@ -1 +1,2 @@ pkgconf: file-directly-in-usr-share +pkgconf: package-contains-empty-directory usr/*/pkgconfig/