reverted: --- pkg-config-0.29.1/.pc/.quilt_patches +++ pkg-config-0.29.1.orig/.pc/.quilt_patches @@ -1 +0,0 @@ -debian/patches reverted: --- pkg-config-0.29.1/.pc/.quilt_series +++ pkg-config-0.29.1.orig/.pc/.quilt_series @@ -1 +0,0 @@ -series reverted: --- pkg-config-0.29.1/.pc/.version +++ pkg-config-0.29.1.orig/.pc/.version @@ -1 +0,0 @@ -2 reverted: --- pkg-config-0.29.1/.pc/applied-patches +++ pkg-config-0.29.1.orig/.pc/applied-patches @@ -1,2 +0,0 @@ -fix-autoreconf.diff -test-list-all-arbitrary-order.patch reverted: --- pkg-config-0.29.1/.pc/fix-autoreconf.diff/glib/m4macros/glib-gettext.m4 +++ pkg-config-0.29.1.orig/.pc/fix-autoreconf.diff/glib/m4macros/glib-gettext.m4 @@ -1,435 +0,0 @@ -# Copyright (C) 1995-2002 Free Software Foundation, Inc. -# Copyright (C) 2001-2003,2004 Red Hat, Inc. -# -# 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. -# -# This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# -# Macro to add for using GNU gettext. -# Ulrich Drepper , 1995, 1996 -# -# Modified to never use included libintl. -# Owen Taylor , 12/15/1998 -# -# Major rework to remove unused code -# Owen Taylor , 12/11/2002 -# -# Added better handling of ALL_LINGUAS from GNU gettext version -# written by Bruno Haible, Owen Taylor 5/30/3002 -# -# Modified to require ngettext -# Matthias Clasen 08/06/2004 -# -# We need this here as well, since someone might use autoconf-2.5x -# to configure GLib then an older version to configure a package -# using AM_GLIB_GNU_GETTEXT -AC_PREREQ(2.53) - -dnl -dnl We go to great lengths to make sure that aclocal won't -dnl try to pull in the installed version of these macros -dnl when running aclocal in the glib directory. -dnl -m4_copy([AC_DEFUN],[glib_DEFUN]) -m4_copy([AC_REQUIRE],[glib_REQUIRE]) -dnl -dnl At the end, if we're not within glib, we'll define the public -dnl definitions in terms of our private definitions. -dnl - -# GLIB_LC_MESSAGES -#-------------------- -glib_DEFUN([GLIB_LC_MESSAGES], - [AC_CHECK_HEADERS([locale.h]) - if test $ac_cv_header_locale_h = yes; then - AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, - [AC_TRY_LINK([#include ], [return LC_MESSAGES], - am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) - if test $am_cv_val_LC_MESSAGES = yes; then - AC_DEFINE(HAVE_LC_MESSAGES, 1, - [Define if your file defines LC_MESSAGES.]) - fi - fi]) - -# GLIB_PATH_PROG_WITH_TEST -#---------------------------- -dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, -dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], -[# Extract the first word of "$2", so it can be a program name with args. -set dummy $2; ac_word=[$]2 -AC_MSG_CHECKING([for $ac_word]) -AC_CACHE_VAL(ac_cv_path_$1, -[case "[$]$1" in - /*) - ac_cv_path_$1="[$]$1" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in ifelse([$5], , $PATH, [$5]); do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if [$3]; then - ac_cv_path_$1="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" -dnl If no 4th arg is given, leave the cache variable unset, -dnl so AC_PATH_PROGS will keep looking. -ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" -])dnl - ;; -esac])dnl -$1="$ac_cv_path_$1" -if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then - AC_MSG_RESULT([$]$1) -else - AC_MSG_RESULT(no) -fi -AC_SUBST($1)dnl -]) - -# GLIB_WITH_NLS -#----------------- -glib_DEFUN([GLIB_WITH_NLS], - dnl NLS is obligatory - [USE_NLS=yes - AC_SUBST(USE_NLS) - - gt_cv_have_gettext=no - - CATOBJEXT=NONE - XGETTEXT=: - INTLLIBS= - - AC_CHECK_HEADER(libintl.h, - [gt_cv_func_dgettext_libintl="no" - libintl_extra_libs="" - - # - # First check in libc - # - AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, - [AC_TRY_LINK([ -#include -], - [return !ngettext ("","", 1)], - gt_cv_func_ngettext_libc=yes, - gt_cv_func_ngettext_libc=no) - ]) - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, - [AC_TRY_LINK([ -#include -], - [return !dgettext ("","")], - gt_cv_func_dgettext_libc=yes, - gt_cv_func_dgettext_libc=no) - ]) - fi - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - AC_CHECK_FUNCS(bind_textdomain_codeset) - fi - - # - # If we don't have everything we want, check in libintl - # - if test "$gt_cv_func_dgettext_libc" != "yes" \ - || test "$gt_cv_func_ngettext_libc" != "yes" \ - || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then - - AC_CHECK_LIB(intl, bindtextdomain, - [AC_CHECK_LIB(intl, ngettext, - [AC_CHECK_LIB(intl, dgettext, - gt_cv_func_dgettext_libintl=yes)])]) - - if test "$gt_cv_func_dgettext_libintl" != "yes" ; then - AC_MSG_CHECKING([if -liconv is needed to use gettext]) - AC_MSG_RESULT([]) - AC_CHECK_LIB(intl, ngettext, - [AC_CHECK_LIB(intl, dcgettext, - [gt_cv_func_dgettext_libintl=yes - libintl_extra_libs=-liconv], - :,-liconv)], - :,-liconv) - fi - - # - # If we found libintl, then check in it for bind_textdomain_codeset(); - # we'll prefer libc if neither have bind_textdomain_codeset(), - # and both have dgettext and ngettext - # - if test "$gt_cv_func_dgettext_libintl" = "yes" ; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS -lintl $libintl_extra_libs" - unset ac_cv_func_bind_textdomain_codeset - AC_CHECK_FUNCS(bind_textdomain_codeset) - LIBS="$glib_save_LIBS" - - if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then - gt_cv_func_dgettext_libc=no - else - if test "$gt_cv_func_dgettext_libc" = "yes" \ - && test "$gt_cv_func_ngettext_libc" = "yes"; then - gt_cv_func_dgettext_libintl=no - fi - fi - fi - fi - - if test "$gt_cv_func_dgettext_libc" = "yes" \ - || test "$gt_cv_func_dgettext_libintl" = "yes"; then - gt_cv_have_gettext=yes - fi - - if test "$gt_cv_func_dgettext_libintl" = "yes"; then - INTLLIBS="-lintl $libintl_extra_libs" - fi - - if test "$gt_cv_have_gettext" = "yes"; then - AC_DEFINE(HAVE_GETTEXT,1, - [Define if the GNU gettext() function is already present or preinstalled.]) - GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl - if test "$MSGFMT" != "no"; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS $INTLLIBS" - AC_CHECK_FUNCS(dcgettext) - MSGFMT_OPTS= - AC_MSG_CHECKING([if msgfmt accepts -c]) - GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ -msgid "" -msgstr "" -"Content-Type: text/plain; charset=UTF-8\n" -"Project-Id-Version: test 1.0\n" -"PO-Revision-Date: 2007-02-15 12:01+0100\n" -"Last-Translator: test \n" -"Language-Team: C \n" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) - AC_SUBST(MSGFMT_OPTS) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr], - [CATOBJEXT=.gmo - DATADIRNAME=share], - [case $host in - *-*-solaris*) - dnl On Solaris, if bind_textdomain_codeset is in libc, - dnl GNU format message catalog is always supported, - dnl since both are added to the libc all together. - dnl Hence, we'd like to go with DATADIRNAME=share and - dnl and CATOBJEXT=.gmo in this case. - AC_CHECK_FUNC(bind_textdomain_codeset, - [CATOBJEXT=.gmo - DATADIRNAME=share], - [CATOBJEXT=.mo - DATADIRNAME=lib]) - ;; - *-*-openbsd*) - CATOBJEXT=.mo - DATADIRNAME=share - ;; - *) - CATOBJEXT=.mo - DATADIRNAME=lib - ;; - esac]) - LIBS="$glib_save_LIBS" - INSTOBJEXT=.mo - else - gt_cv_have_gettext=no - fi - fi - ]) - - if test "$gt_cv_have_gettext" = "yes" ; then - AC_DEFINE(ENABLE_NLS, 1, - [always defined to indicate that i18n is enabled]) - fi - - dnl Test whether we really found GNU xgettext. - if test "$XGETTEXT" != ":"; then - dnl If it is not GNU xgettext we define it as : so that the - dnl Makefiles still can work. - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then - : ; - else - AC_MSG_RESULT( - [found xgettext program is not GNU xgettext; ignore it]) - XGETTEXT=":" - fi - fi - - # We need to process the po/ directory. - POSUB=po - - AC_OUTPUT_COMMANDS( - [case "$CONFIG_FILES" in *po/Makefile.in*) - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile - esac]) - - dnl These rules are solely for the distribution goal. While doing this - dnl we only have to keep exactly one list of the available catalogs - dnl in configure.ac. - for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" - done - - dnl Make all variables we use known to autoconf. - AC_SUBST(CATALOGS) - AC_SUBST(CATOBJEXT) - AC_SUBST(DATADIRNAME) - AC_SUBST(GMOFILES) - AC_SUBST(INSTOBJEXT) - AC_SUBST(INTLLIBS) - AC_SUBST(PO_IN_DATADIR_TRUE) - AC_SUBST(PO_IN_DATADIR_FALSE) - AC_SUBST(POFILES) - AC_SUBST(POSUB) - ]) - -# AM_GLIB_GNU_GETTEXT -# ------------------- -# Do checks necessary for use of gettext. If a suitable implementation -# of gettext is found in either in libintl or in the C library, -# it will set INTLLIBS to the libraries needed for use of gettext -# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable -# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() -# on various variables needed by the Makefile.in.in installed by -# glib-gettextize. -dnl -glib_DEFUN([GLIB_GNU_GETTEXT], - [AC_REQUIRE([AC_PROG_CC])dnl - - GLIB_LC_MESSAGES - GLIB_WITH_NLS - - if test "$gt_cv_have_gettext" = "yes"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - AC_MSG_CHECKING(for catalogs to be installed) - NEW_LINGUAS= - for presentlang in $ALL_LINGUAS; do - useit=no - if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then - desiredlanguages="$LINGUAS" - else - desiredlanguages="$ALL_LINGUAS" - fi - for desiredlang in $desiredlanguages; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - NEW_LINGUAS="$NEW_LINGUAS $presentlang" - fi - done - LINGUAS=$NEW_LINGUAS - AC_MSG_RESULT($LINGUAS) - fi - - dnl Construct list of names of catalog files to be constructed. - if test -n "$LINGUAS"; then - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done - fi - fi - - dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly - dnl find the mkinstalldirs script in another subdir but ($top_srcdir). - dnl Try to locate is. - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi - AC_SUBST(MKINSTALLDIRS) - - dnl Generate list of files to be processed by xgettext which will - dnl be included in po/Makefile. - test -d po || mkdir po - if test "x$srcdir" != "x."; then - if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then - posrcprefix="$srcdir/" - else - posrcprefix="../$srcdir/" - fi - else - posrcprefix="../" - fi - rm -f po/POTFILES - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES - ]) - -# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) -# ------------------------------- -# Define VARIABLE to the location where catalog files will -# be installed by po/Makefile. -glib_DEFUN([GLIB_DEFINE_LOCALEDIR], -[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl -glib_save_prefix="$prefix" -glib_save_exec_prefix="$exec_prefix" -glib_save_datarootdir="$datarootdir" -test "x$prefix" = xNONE && prefix=$ac_default_prefix -test "x$exec_prefix" = xNONE && exec_prefix=$prefix -datarootdir=`eval echo "${datarootdir}"` -if test "x$CATOBJEXT" = "x.mo" ; then - localedir=`eval echo "${libdir}/locale"` -else - localedir=`eval echo "${datadir}/locale"` -fi -prefix="$glib_save_prefix" -exec_prefix="$glib_save_exec_prefix" -datarootdir="$glib_save_datarootdir" -AC_DEFINE_UNQUOTED($1, "$localedir", - [Define the location where the catalogs will be installed]) -]) - -dnl -dnl Now the definitions that aclocal will find -dnl -ifdef(glib_configure_ac,[],[ -AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) -AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) -])dnl - -# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) -# -# Create a temporary file with TEST-FILE as its contents and pass the -# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with -# 0 and perform ACTION-IF-FAIL for any other exit status. -AC_DEFUN([GLIB_RUN_PROG], -[cat >conftest.foo <<_ACEOF -$2 -_ACEOF -if AC_RUN_LOG([$1 conftest.foo]); then - m4_ifval([$3], [$3], [:]) -m4_ifvaln([$4], [else $4])dnl -echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD -sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD -fi]) - reverted: --- pkg-config-0.29.1/.pc/test-list-all-arbitrary-order.patch/check/check-print-options +++ pkg-config-0.29.1.orig/.pc/test-list-all-arbitrary-order.patch/check/check-print-options @@ -1,62 +0,0 @@ -#! /bin/sh - -set -e -. ${srcdir}/common - -# --version -RESULT=$PACKAGE_VERSION -run_test --version - -# --modversion -RESULT=1.0.0 -run_test --modversion simple - -# --print-variables, make sure having no variables doesn't crash -RESULT="pcfiledir" -run_test --print-variables no-variables - -RESULT="exec_prefix -includedir -libdir -pcfiledir -prefix" -run_test --print-variables simple - -# --print-provides -RESULT="simple = 1.0.0" -run_test --print-provides simple - -# --print-requires -RESULT="public-dep >= 1" -run_test --print-requires requires-test - -# --print-requires-private -RESULT="private-dep >= 1" -run_test --print-requires-private requires-test - -# --list-all, limit to a subdirectory -RESULT="sub1 Subdirectory package 1 - Test package 1 for subdirectory -sub2 Subdirectory package 2 - Test package 2 for subdirectory -broken Broken package - Module with broken .pc file" -PKG_CONFIG_LIBDIR="$srcdir/sub" run_test --list-all - -# Check handling when multiple incompatible options are set -RESULT="Ignoring incompatible output option \"--modversion\" -$PACKAGE_VERSION" -run_test --version --modversion simple - -RESULT="Ignoring incompatible output option \"--version\" -1.0.0" -run_test --modversion --version simple - -# --print-requires/--print-requires-private allowed together -RESULT="public-dep >= 1 -private-dep >= 1" -run_test --print-requires --print-requires-private requires-test -run_test --print-requires-private --print-requires requires-test - -# --exists and --atleast/exact/max-version can be mixed -RESULT="" -run_test --exists --atleast-version=1.0.0 simple -run_test --exists --exact-version=1.0.0 simple -run_test --exists --max-version=1.0.0 simple diff -u pkg-config-0.29.1/debian/changelog pkg-config-0.29.1/debian/changelog --- pkg-config-0.29.1/debian/changelog +++ pkg-config-0.29.1/debian/changelog @@ -1,3 +1,49 @@ +pkg-config (0.29.1-0ubuntu4) focal; urgency=medium + + * Merge with Debian; remaining changes: + - On Ubuntu, in pkg-config-crosswrapper add /usr/lib/pkgconfig to + PKG_CONFIG_LIBDIR. As a lot of packages that are cross-build on + regular basis rely on cross-building with non-multiarched libraries. + - add dpkg-dev dependency, as dpkg-architecture binary is called from + wrapper. + * New upstream version 0.29.1. + - Fix regression quoting variables. LP: #1523508. + * Fix build failure with recent glib2.0. + * debian/patches/test-list-all-arbitrary-order.patch: Fix wrong test + of pkg-config --list-all output. Closes LP: #1823434. + + -- Gianfranco Costamagna Fri, 07 Feb 2020 10:04:31 +0100 + +pkg-config (0.29-6) unstable; urgency=medium + + * Add missing "warning" in use in dpkg hook, and corresponding test. + Closes: #920553 + * Add missing set -e to tests. + + -- Tollef Fog Heen Sun, 27 Jan 2019 05:56:33 +0100 + +pkg-config (0.29-5) unstable; urgency=medium + + * Add dpkg-dev to Suggests and make pkg-config-crosswrapper error if + dpkg-dev is not installed. Add corresponding autopkgtest. + Closes: #916772 + * Ignore unknown architectures when setting up symlinks. Thanks to Jim + Patterson for the patch. Closes: #848706 + * Bump debhelper compat version to 10. + * Add Rules-requires-root: no to control file. + + -- Tollef Fog Heen Thu, 24 Jan 2019 10:01:45 +0100 + +pkg-config (0.29-4) unstable; urgency=medium + + * Update glib/m4macros/glib-gettext.m4 from newer upstream version to + avoid m4 redefinition/overwrite. Closes: #822409 + * Add Conflicts and Replaces on pkg-config-bin. This was a suggested + change earlier which some users have picked up, even if it never made + it into Debian. Closes: #809221 + + -- Tollef Fog Heen Sun, 01 May 2016 08:26:59 +0200 + pkg-config (0.29.1-0ubuntu3) eoan; urgency=medium * debian/patches/test-list-all-arbitrary-order.patch: Fix wrong test @@ -392 +437,0 @@ - reverted: --- pkg-config-0.29.1/debian/compat +++ pkg-config-0.29.1.orig/debian/compat @@ -1 +0,0 @@ -7 diff -u pkg-config-0.29.1/debian/control pkg-config-0.29.1/debian/control --- pkg-config-0.29.1/debian/control +++ pkg-config-0.29.1/debian/control @@ -1,17 +1,20 @@ Source: pkg-config Section: devel Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Tollef Fog Heen -Build-Depends: debhelper (>= 7.0.50), dh-autoreconf, libglib2.0-dev +Maintainer: Tollef Fog Heen +Build-Depends: debhelper-compat (= 10), dh-autoreconf, libglib2.0-dev Homepage: http://pkg-config.freedesktop.org Standards-Version: 3.8.4 +Rules-Requires-Root: no Package: pkg-config Architecture: any Multi-Arch: foreign -Depends: ${shlibs:Depends}, ${misc:Depends}, dpkg-dev, +Depends: ${shlibs:Depends}, ${misc:Depends}, libdpkg-perl +Suggests: dpkg-dev +Conflicts: pkg-config-bin +Replaces: pkg-config-bin Description: manage compile and link flags for libraries pkg-config is a system for managing library compile and link flags that works with automake and autoconf. diff -u pkg-config-0.29.1/debian/pkg-config-crosswrapper pkg-config-0.29.1/debian/pkg-config-crosswrapper --- pkg-config-0.29.1/debian/pkg-config-crosswrapper +++ pkg-config-0.29.1/debian/pkg-config-crosswrapper @@ -7,10 +7,14 @@ if [ x"${PKG_CONFIG_LIBDIR+set}" = x ]; then # GNU triplet for the compiler, e.g. i486-linux-gnu for Debian i386, # i686-linux-gnu for Ubuntu i386 - basename="`basename "$0"`" + basename="$(basename "$0")" triplet="${basename%-pkg-config}" # Normalized multiarch path if any, e.g. i386-linux-gnu for i386 - multiarch="`dpkg-architecture -t"${triplet}" -qDEB_HOST_MULTIARCH 2>/dev/null`" + multiarch="$(dpkg-architecture -t"${triplet}" -qDEB_HOST_MULTIARCH 2>/dev/null)" + if [ "$?" != 0 ]; then + echo "Please install dpkg-dev to use pkg-config when cross-building" >&2 + exit 1 + fi # Native multiarch path native_multiarch="$(cat /usr/lib/pkg-config.multiarch)" diff -u pkg-config-0.29.1/debian/pkg-config-dpkghook pkg-config-0.29.1/debian/pkg-config-dpkghook --- pkg-config-0.29.1/debian/pkg-config-dpkghook +++ pkg-config-0.29.1/debian/pkg-config-dpkghook @@ -12,7 +12,7 @@ use warnings; use Dpkg::Arch qw(debarch_to_gnutriplet); -use Dpkg::ErrorHandling qw(error); +use Dpkg::ErrorHandling qw(error warning); my $crosswrapper = "/usr/share/pkg-config-crosswrapper"; @@ -27,7 +27,15 @@ push @architectures, $arch; chomp @architectures; -my %gnutriplets = map { debarch_to_gnutriplet($_) => 1 } @architectures; +my %gnutriplets; +foreach my $arch (@architectures) { + my $triplet = debarch_to_gnutriplet($arch); + if (not defined($triplet)) { + warning("Architecture $arch not defined in architecture tables, ignored"); + next; + } + $gnutriplets{$triplet} = 1; +} my %symlinks = map { $_ => 1 } ; only in patch2: unchanged: --- pkg-config-0.29.1.orig/debian/tests/control +++ pkg-config-0.29.1/debian/tests/control @@ -0,0 +1,2 @@ +Tests: crosswrapper foreign-arch invalid-arch +Restrictions: needs-root, allow-stderr only in patch2: unchanged: --- pkg-config-0.29.1.orig/debian/tests/crosswrapper +++ pkg-config-0.29.1/debian/tests/crosswrapper @@ -0,0 +1,7 @@ +#! /bin/sh + +set -e + +ln -s /usr/share/pkg-config-crosswrapper $AUTOPKGTEST_TMP/i686-linux-gnu-pkg-config +[ "$($AUTOPKGTEST_TMP/i686-linux-gnu-pkg-config --modversion pkg-config)" = "$(pkg-config --modversion pkg-config)" ] +exit $? only in patch2: unchanged: --- pkg-config-0.29.1.orig/debian/tests/foreign-arch +++ pkg-config-0.29.1/debian/tests/foreign-arch @@ -0,0 +1,12 @@ +#! /bin/sh + +set -e + +dpkg --add-architecture i386 + +if [ ! -x /usr/bin/i686-linux-gnu-pkg-config ]; then + echo "cross symlink missing" + echo "pkg-config symlinks found: $(find /usr/bin/ -name \*pkg-config)" + exit 1 +fi +exit 0 only in patch2: unchanged: --- pkg-config-0.29.1.orig/debian/tests/invalid-arch +++ pkg-config-0.29.1/debian/tests/invalid-arch @@ -0,0 +1,12 @@ +#! /bin/sh + +# Test that the dpkg hook does not error for invalid dpkg archictures. +# Regression test for 920553. + +set -e + +# This is an intentionally invalid architecture. +dpkg --add-architecture x86 +apt-get install sash + +exit 0