--- pkg-config-0.29.1.orig/.pc/.quilt_patches +++ pkg-config-0.29.1/.pc/.quilt_patches @@ -0,0 +1 @@ +debian/patches --- pkg-config-0.29.1.orig/.pc/.quilt_series +++ pkg-config-0.29.1/.pc/.quilt_series @@ -0,0 +1 @@ +series --- pkg-config-0.29.1.orig/.pc/.version +++ pkg-config-0.29.1/.pc/.version @@ -0,0 +1 @@ +2 --- pkg-config-0.29.1.orig/.pc/applied-patches +++ pkg-config-0.29.1/.pc/applied-patches @@ -0,0 +1,2 @@ +fix-autoreconf.diff +test-list-all-arbitrary-order.patch --- pkg-config-0.29.1.orig/.pc/fix-autoreconf.diff/glib/m4macros/glib-gettext.m4 +++ pkg-config-0.29.1/.pc/fix-autoreconf.diff/glib/m4macros/glib-gettext.m4 @@ -0,0 +1,435 @@ +# 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]) + --- pkg-config-0.29.1.orig/.pc/test-list-all-arbitrary-order.patch/check/check-print-options +++ pkg-config-0.29.1/.pc/test-list-all-arbitrary-order.patch/check/check-print-options @@ -0,0 +1,62 @@ +#! /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 --- pkg-config-0.29.1.orig/check/check-print-options +++ pkg-config-0.29.1/check/check-print-options @@ -36,8 +36,8 @@ # --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" +broken Broken package - Module with broken .pc file +sub2 Subdirectory package 2 - Test package 2 for subdirectory" PKG_CONFIG_LIBDIR="$srcdir/sub" run_test --list-all # Check handling when multiple incompatible options are set --- pkg-config-0.29.1.orig/debian/changelog +++ pkg-config-0.29.1/debian/changelog @@ -0,0 +1,392 @@ +pkg-config (0.29.1-0ubuntu3) eoan; urgency=medium + + * debian/patches/test-list-all-arbitrary-order.patch: Fix wrong test + of pkg-config --list-all output. Closes LP: #1823434. + + -- Steve Langasek Thu, 06 Jun 2019 20:30:50 +0000 + +pkg-config (0.29.1-0ubuntu2) artful; urgency=medium + + * No-change rebuild to pick up -fPIE compiler default in static + libraries + + -- Steve Langasek Fri, 21 Apr 2017 20:54:08 +0000 + +pkg-config (0.29.1-0ubuntu1) xenial; 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. + + -- Matthias Klose Wed, 06 Apr 2016 15:22:03 +0200 + +pkg-config (0.29-3) unstable; urgency=medium + + * Store pkg-config architecture in /usr/lib/pkg-config.multiarch and + pick that up in the crosswrapper. Closes: #807289, #807946 + + -- Tollef Fog Heen Fri, 15 Jan 2016 21:46:07 +0100 + +pkg-config (0.29-2ubuntu2) xenial; urgency=medium + + * Fix pkg-config-crosswrapper to do something for cross builds. + + -- Matthias Klose Mon, 14 Dec 2015 19:00:25 +0100 + +pkg-config (0.29-2ubuntu1) xenial; urgency=low + + * Merge from Debian unstable. 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. + + -- Dimitri John Ledkov Thu, 19 Nov 2015 14:48:58 +0000 + +pkg-config (0.29-2) unstable; urgency=medium + + * Fix typo in crosswrapper. + * Add set -e to postinst and prerm + + -- Tollef Fog Heen Sun, 15 Nov 2015 15:38:06 +0100 + +pkg-config (0.29-1) unstable; urgency=medium + + * Drop unused build-dep on libpopt-dev. Closes: #751897 + * Add symlinks to pkg-config-crosswrapper using dpkg hooks. Thanks to + Helmut Grohne for this, both design and implementation. Closes: #759556 + * Export LC_ALL=C in debian/rules to make the build more reproducible. + Closes: #792821 + * Remove fixing of test running, it now works out of the box. + * Correct spelling of pkg-config in debian/copyright. + * Add missing quoting for arguments in crosswrapper. + * Make crosswrapper handle native builds correctly. + + -- Tollef Fog Heen Sun, 15 Nov 2015 13:58:45 +0100 + +pkg-config (0.28-1ubuntu1) utopic; urgency=medium + + * 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. + + -- Dimitri John Ledkov Fri, 23 May 2014 12:46:55 +0100 + +pkg-config (0.28-1) unstable; urgency=medium + + * New upstream release. (Closes: #699476, #744031) + - Updated man page with fewer errors. (Closes: #661838) + * Fix test running with newer automake. + * Drop popt stuff from debian/rules, upstream no longer ships popt. + + -- Tollef Fog Heen Wed, 23 Apr 2014 18:16:22 +0200 + +pkg-config (0.26-1+autoconf) unreleased; urgency=medium + + * Non-maintainer upload. + * Update config.{sub,guess} for new arches (with dh-autoreconf) (Closes: #742665) + * Add Multiarch metadata (M-A: foreign), so this package can + satisfy cross- build-dependencies. The cross-build environment is + responsible for providing the $triplet-pkg-config symlink to + pkg-config-crosswrapper. (Closes: #726598) + * Update crosswrapper script to search multiarch paths, traditional + cross-compilation paths, arch-independent paths, and /usr/local counterparts. + Thanks to Simon McVittie, Steve Langasek, Vincent Danjean, Wookey + (Closes: #642292, #650298, #631275) + * Make pkg-config itself cross-buildable. (Closes: #716918) + + -- Wookey Mon, 24 Mar 2014 17:58:55 +0000 + +pkg-config (0.26-1) unstable; urgency=low + + * New upstream release + - Updated usage message. Closes: #389066 + - Fixes old bug. Closes: #475031 + - Allows PKG_CONFIG_LIBDIR. Closes: #398901 + - Man page documents how to get the default search path. + Closes: #576320 + * Switch to multiarch paths. Thanks to Steve Langasek for the patch. + Closes: #590992 + * Strip out multiarch library paths. Closes: #482884 + * Drop a cross wrapper into /usr/share. Thanks to Wookey for the + implementation. Closes: #217902 + * Re-add two missing lines in Changelog which were accidentially + removed. + + -- Tollef Fog Heen Sun, 15 May 2011 14:37:09 +0200 + +pkg-config (0.25-1.1) unstable; urgency=low + + * Non-maintainer upload. + * pkg.m4: Apply commit 2b86e9b from upstream, to fix compatibility with + autoconf (>= 2.66). (Closes: #591547) + + -- Tim Retout Sun, 03 Oct 2010 17:13:29 +0100 + +pkg-config (0.25-1) unstable; urgency=low + + * New upstream release + - Stops escaping = and : in output. Closes: #582995 + * Build with external libpopt. + + -- Tollef Fog Heen Fri, 28 May 2010 18:16:36 +0200 + +pkg-config (0.24-1) unstable; urgency=low + + * New upstream release. closes: #476947 + - Marks PKG_CONFIG_PATH and PKG_CONFIG_LIBDIR as precious. + Closes: #398901 + - Give the ability to log, closes: #528240 + - Adds description of Requires.Private to man page. Closes: #341977 + - Fixes man page formatting. Closes: #398434 + * Add ${misc:Depends} to control + * Bump debhelper version to 7, switch to dh + * Add homepage field to control + * Update Standards-Version field to 3.8.4. + + -- Tollef Fog Heen Sun, 23 May 2010 23:38:20 +0200 + +pkg-config (0.22-1) unstable; urgency=low + + * New upstream release + - Make Requires.private a whole lot more useful by traversing the + whole tree, not just the top-level, for Cflags. Closes: #390132 + - Add support for using the system glib. + * Build using system glib. + * Add _GNU_SOURCE to the list of defines to make strsignal appear. + Closes: #316384 + * Remove suggests for libgnome-dev. Closes: #405901 + + -- Tollef Fog Heen Mon, 18 Jun 2007 23:38:59 +0200 + +pkg-config (0.21-1) unstable; urgency=low + + * New upstream release + - Adds internal pkg-config package. (closes: #254289) + - Supports escaping $ rather than %. (closes: #378570) + - Always adds all cflags. (closes: #340904) + * Includes full NEWS file. (closes: #334896) + * Remove libglib2.0-dev build-deps. (closes: #350176) + + -- Tollef Fog Heen Wed, 16 Aug 2006 21:11:21 +0200 + +pkg-config (0.20-1) unstable; urgency=low + + * New upstream release + - Fixes segfault with --help and gcc4 (closes: #321961) + - New pkg.m4 uses --short-errors and spits out a more sensible error + when some dependencies aren't found. (closes: #321970) + * Install upstream ChangeLog (closes: #318718) + + -- Tollef Fog Heen Mon, 17 Oct 2005 07:47:58 +0200 + +pkg-config (0.19-1) unstable; urgency=low + + * New upstream release + + -- Tollef Fog Heen Sat, 16 Jul 2005 12:26:33 +0200 + +pkg-config (0.18.1-1) unstable; urgency=low + + * New upstream release + - Fix brown bag bug where pkg.m4 always set pkg_failed to + untried. (closes: #316181) + + -- Tollef Fog Heen Wed, 29 Jun 2005 12:58:21 +0200 + +pkgconfig (0.18-1) unstable; urgency=low + + * New upstream release + - Fixes PKG_CONFIG_LIBDIR again. (closes: #313004) + - Includes documentation on the fact that the first check for + PKG_CHECK_MODULES must not be conditional. (closes: #303211) + - Only links with public libraries now. (closes: #229980) + * Remove --no-indirect-deps to configure. + + -- Tollef Fog Heen Mon, 27 Jun 2005 23:07:03 +0200 + +pkgconfig (0.17.2-1) unstable; urgency=low + + * New upstream release, no Debian-related changes. + + -- Tollef Fog Heen Sun, 17 Apr 2005 13:23:59 +0200 + +pkgconfig (0.17.1-1) unstable; urgency=low + + * New upstream release + + -- Tollef Fog Heen Tue, 12 Apr 2005 23:12:48 +0200 + +pkgconfig (0.17-1) unstable; urgency=low + + * New upstream release + - evaluate second argument again (closes: #303969) + * pass --disable-indirect-deps to configure for now. This'll change + post-sarge, but we don't want to introduce breakage now. + * lowercase first letter in description to shut up lintian + + -- Tollef Fog Heen Tue, 12 Apr 2005 13:21:08 +0200 + +pkgconfig (0.16.0-1) unstable; urgency=low + + * New maintainer. + * New upstream release + - Don't break off from --list-all when provides isn't met + (closes: #232719) + - Quote PKG_CHECK_MODULES properly (closes: #274477) + - Minor man page fix (closes: #223245) + - Fixes --errors-to-stdout (closes: #202409) + - Include more robust pkg.m4 (closes: #221818) + * Add multiarch search paths to default search path + * Make sure /usr/local/pkgconfig is in the default search path + (closes: #245717) + * Add /usr/local/share/pkgconfig and /usr/share/pkgconfig to default + search path + + -- Tollef Fog Heen Fri, 18 Feb 2005 18:08:58 +0100 + +pkgconfig (0.15.0-4) unstable; urgency=low + + * New Maintainer. + * Moved into my package infrastructure and cleaned up: + - debian/copyright updated to my template to include no warranty + disclaimer. + - AUTHORS added to docs, removed from copyright + - NEWS added to docs. + * Regenerated auto* using libtool_1.5.2-2 which really contains the + FreeBSD support, the experimental 1.6 package doesn't. + + -- Scott James Remnant Sun, 28 Mar 2004 19:04:50 +0100 + +pkgconfig (0.15.0-3) unstable; urgency=low + + * [debian/rules] Extended the 'autogen' target. + * [debian/control] Updated Standards-Version. + * Regenerated auto* using libtool 1.6-0+1.5a-1 from experimental to support + the Debian GNU/KFreeBSD port. (Closes: 218415) + + -- J.H.M. Dassen (Ray) Fri, 31 Oct 2003 09:33:04 +0100 + +pkgconfig (0.15.0-2) unstable; urgency=low + + * [configure.in] Removed some leftover experimental code; test for the + actual system glib when deciding whether to use the sytem glib or the + local copy. This means that in a bootstrapping setting the Build-Depends + on glib can be ignored. (Closes: #181947) + * [debian/rules] Clean out autom4te.cache . + + -- J.H.M. Dassen (Ray) Sun, 2 Mar 2003 11:48:32 +0100 + +pkgconfig (0.15.0-1) unstable; urgency=low + + * New maintainer. + * Acknowledge NMUs. (Closes: #132474, #135742, #149825, #149831, #162870, + #164500) + * New upstream release. Changes include: + - add PKG_CONFIG_LIBDIR for cross-compiling (David Schleef) + (Closes: #177709) + * [debian/control] Added Suggests: libgnome-dev (for gnome-config, which + pkg-config falls back on when no .pc file is found). (Closes: #172008) + * [debian/control] Updated Standards-Version; changed description. + * [debian/rules] Added "autogen" target to re-auto* things. + * [debian/copyright] Updated; fixed lintian warning. + * [configure.in, debian/control] On Debian, use the system glib instead of + the local copy. (Closes: #159895) + * [pkg.c] Include /usr/local/lib/pkgconfig in the default search path for + .pc files. (Closes: #159507) + + -- J.H.M. Dassen (Ray) Sun, 16 Feb 2003 14:01:27 +0100 + +pkgconfig (0.14.0-0.4) unstable; urgency=low + + * NMU + * Update config.{sub,guess} in the included glib source automatically as + well. + + -- J.H.M. Dassen (Ray) Mon, 14 Oct 2002 08:10:06 +0200 + +pkgconfig (0.14.0-0.3) unstable; urgency=low + + * NMU + * -0.2 still had a FTBFS on mipsel. Now use dpkg-architecture to set --build + argument to configure. + + -- J.H.M. Dassen (Ray) Sun, 13 Oct 2002 16:09:46 +0200 + +pkgconfig (0.14.0-0.2) unstable; urgency=low + + * NMU + * Updated config.{sub,guess} (20010907 -> 20020703). Should fix the FTBFS + on mipsel. + * Automatically update config.{sub,guess} from autotools-dev in 'clean' + target, if possible. + + -- J.H.M. Dassen (Ray) Sun, 13 Oct 2002 16:09:46 +0200 + +pkgconfig (0.14.0-0.1) unstable; urgency=low + + * NMU, OKed by maintainer. + * New upstream release. (Closes: #162870) + Includes + * parse.c, pkg.c: handle other_libs other_cflags same as -l/-L/-I flags, + so we pull in from dependent packages. + which fixes the with issues -pthread and the likes. + * Dropped obsoleted "dh_testversion" from debian/rules. + * Updated Standards-Version. + + -- J.H.M. Dassen (Ray) Fri, 11 Oct 2002 19:16:30 +0200 + +pkgconfig (0.12.0-0.1) unstable; urgency=low + + * NMU + * New upstream release (Closes: #135742, #149825, #149831) + + -- David Schleef Fri, 28 Jun 2002 15:38:52 -0700 + +pkgconfig (0.11.0-0.1) unstable; urgency=low + + * New upstream release + * NMU + + -- Takuo KITAME Sun, 10 Mar 2002 19:27:18 +0900 + +pkgconfig (0.10.0-0.1) unstable; urgency=low + + * New upstream release (closes: #132474, #133585) + * NMU + + -- Takuo KITAME Wed, 6 Feb 2002 02:54:26 +0900 + +pkgconfig (0.8.0-1.1) unstable; urgency=low + + * NMU + * Also need to update glib-1.2.8/config.{guess,sub}. Re Closes: #103344 + + -- LaMont Jones Fri, 19 Oct 2001 08:10:36 -0600 + +pkgconfig (0.8.0-1) unstable; urgency=low + + * New upstream version (Closes: bug#106112). + * Updated config.sub and config.guess (Closes: bug#103344). + + -- Paolo Molaro Sun, 16 Sep 2001 18:34:00 +0200 + +pkgconfig (0.7.0-1) unstable; urgency=low + + * New upstream version. + + -- Paolo Molaro Sun, 10 Jun 2001 15:57:15 +0200 + +pkgconfig (0.5.0-1) unstable; urgency=low + + * Initial Release. + + -- Paolo Molaro Wed, 7 Mar 2001 17:45:15 +0100 + --- pkg-config-0.29.1.orig/debian/compat +++ pkg-config-0.29.1/debian/compat @@ -0,0 +1 @@ +7 --- pkg-config-0.29.1.orig/debian/control +++ pkg-config-0.29.1/debian/control @@ -0,0 +1,21 @@ +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 +Homepage: http://pkg-config.freedesktop.org +Standards-Version: 3.8.4 + +Package: pkg-config +Architecture: any +Multi-Arch: foreign +Depends: ${shlibs:Depends}, ${misc:Depends}, dpkg-dev, + libdpkg-perl +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. + . + Increasingly libraries ship with ".pc" files that allow querying of the + compiler and linker flags needed to use them through the pkg-config(1) + program. --- pkg-config-0.29.1.orig/debian/copyright +++ pkg-config-0.29.1/debian/copyright @@ -0,0 +1,19 @@ +This is the Debian package of freedesktop.org pkg-config. + +Copyright (C) 2001, 2002 Red Hat Inc. +Copyright (C) 2004, 2005 Tollef Fog Heen + +License: + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +On Debian GNU/Linux systems, the complete text of the GNU General Public +License can be found in `/usr/share/common-licenses/GPL'. --- pkg-config-0.29.1.orig/debian/dirs +++ pkg-config-0.29.1/debian/dirs @@ -0,0 +1,2 @@ +usr/lib/pkgconfig +usr/share/pkgconfig --- pkg-config-0.29.1.orig/debian/docs +++ pkg-config-0.29.1/debian/docs @@ -0,0 +1,3 @@ +README +AUTHORS +NEWS --- pkg-config-0.29.1.orig/debian/patches/fix-autoreconf.diff +++ pkg-config-0.29.1/debian/patches/fix-autoreconf.diff @@ -0,0 +1,23 @@ +Index: b/glib/m4macros/glib-gettext.m4 +=================================================================== +--- a/glib/m4macros/glib-gettext.m4 ++++ b/glib/m4macros/glib-gettext.m4 +@@ -313,7 +313,7 @@ msgstr "" + # on various variables needed by the Makefile.in.in installed by + # glib-gettextize. + dnl +-glib_DEFUN([GLIB_GNU_GETTEXT], ++AU_DEFUN([GLIB_GNU_GETTEXT], + [AC_REQUIRE([AC_PROG_CC])dnl + + GLIB_LC_MESSAGES +@@ -383,7 +383,8 @@ glib_DEFUN([GLIB_GNU_GETTEXT], + rm -f po/POTFILES + sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ + < $srcdir/po/POTFILES.in > po/POTFILES +- ]) ++ ], ++ [[$0: This macro is deprecated. You should use upstream gettext instead.]]) + + # AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) + # ------------------------------- --- pkg-config-0.29.1.orig/debian/patches/series +++ pkg-config-0.29.1/debian/patches/series @@ -0,0 +1,2 @@ +fix-autoreconf.diff +test-list-all-arbitrary-order.patch --- pkg-config-0.29.1.orig/debian/patches/test-list-all-arbitrary-order.patch +++ pkg-config-0.29.1/debian/patches/test-list-all-arbitrary-order.patch @@ -0,0 +1,27 @@ +Description: Fix wrong test of pkg-config --list-all output + The testsuite checks that the output of pkg-config --list-all is correct, + but it does this by doing a text comparison of the output *without sorting + it*, and the order of --list-all's output is dependent on the behavior of + g_hash_table_foreach(). + . + Rather than disabling the unit test, update the test case to match the + behavior of current glib. +Author: Steve Langasek +Last-Modified: 2019-06-06 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1823434 + +Index: pkg-config-0.29.1/check/check-print-options +=================================================================== +--- pkg-config-0.29.1.orig/check/check-print-options ++++ pkg-config-0.29.1/check/check-print-options +@@ -36,8 +36,8 @@ + + # --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" ++broken Broken package - Module with broken .pc file ++sub2 Subdirectory package 2 - Test package 2 for subdirectory" + PKG_CONFIG_LIBDIR="$srcdir/sub" run_test --list-all + + # Check handling when multiple incompatible options are set --- pkg-config-0.29.1.orig/debian/pkg-config-crosswrapper +++ pkg-config-0.29.1/debian/pkg-config-crosswrapper @@ -0,0 +1,48 @@ +#! /bin/sh +# pkg-config wrapper for cross-building +# Sets pkg-config search path to search multiarch and historical cross-compiling paths. + +# If the user has already set PKG_CONFIG_LIBDIR, believe it (even if empty): +# it's documented to be an override +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"`" + 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`" + # Native multiarch path + native_multiarch="$(cat /usr/lib/pkg-config.multiarch)" + + # This can be used for native builds as well, in that case, just exec pkg-config "$@" directly. + if [ "$native_multiarch" = "$multiarch" ]; then + exec pkg-config "$@" + fi + + PKG_CONFIG_LIBDIR="/usr/local/${triplet}/lib/pkgconfig" + # For a native build we would also want to append /usr/local/lib/pkgconfig + # at this point; but this is a cross-building script, so don't + PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR:/usr/local/share/pkgconfig" + + if [ -n "$multiarch" ]; then + PKG_CONFIG_LIBDIR="/usr/local/lib/${multiarch}/pkgconfig:$PKG_CONFIG_LIBDIR" + PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR:/usr/lib/${multiarch}/pkgconfig" + fi + + PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR:/usr/${triplet}/lib/pkgconfig" + # For a native build we would also want to append /usr/lib/pkgconfig + # at this point; but this is a cross-building script, so don't + # If you want to allow use of un-multiarched -dev packages for crossing + # (at the risk of finding build-arch stuff you didn't want, if not in a clean chroot) + # Uncomment the next line: + # PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR:/usr/lib/pkgconfig" + # ... but on Ubuntu we rely cross-building with non-multiarch libraries: + if dpkg-vendor --derives-from Ubuntu; then + PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR:/usr/lib/pkgconfig" + fi + PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR:/usr/share/pkgconfig" + + export PKG_CONFIG_LIBDIR +fi + +exec pkg-config "$@" --- pkg-config-0.29.1.orig/debian/pkg-config-dpkghook +++ pkg-config-0.29.1/debian/pkg-config-dpkghook @@ -0,0 +1,51 @@ +#! /usr/bin/perl +# +# Sets up /usr/bin/*-pkg-config symlinks to point to the cross wrapper. +# +# It is called from dpkg --post-invoke and from postinst with the "update" +# argument to instate the necessary symlinks. +# +# It is called from prerm with the "remove" argument to remove all symlinks. +# + +use strict; +use warnings; + +use Dpkg::Arch qw(debarch_to_gnutriplet); +use Dpkg::ErrorHandling qw(error); + +my $crosswrapper = "/usr/share/pkg-config-crosswrapper"; + +my $action = $ARGV[0]; +error("parameter must be 'remove' or 'update'") + unless defined $action && ($action eq "remove" || $action eq "update"); + +my $arch = `dpkg --print-architecture`; +error('dpkg --print-architecture failed') if $? >> 8; +my @architectures = `dpkg --print-foreign-architectures`; +error('dpkg --print-foreign-architectures failed') if $? >> 8; +push @architectures, $arch; +chomp @architectures; + +my %gnutriplets = map { debarch_to_gnutriplet($_) => 1 } @architectures; + +my %symlinks = map { $_ => 1 } ; + +foreach my $symlink (keys %symlinks) { + $symlink =~ m,^/usr/bin/([^-]+-[^-]+-[^-]+)-pkg-config, or next; + next if exists $gnutriplets{$1} && $action eq "update"; + next unless -l $symlink; + next unless readlink $symlink eq $crosswrapper; + unlink $symlink or + error("failed to remove symlink $symlink: $!"); +} + +if ($action eq 'update') { + foreach (keys %gnutriplets) { + my $linktarget = "/usr/bin/${_}-pkg-config"; + next if exists $symlinks{$linktarget}; + next if -e $linktarget; + symlink $crosswrapper, $linktarget or + error("failed to create symlink $linktarget to $crosswrapper: $!"); + } +} --- pkg-config-0.29.1.orig/debian/pkg-config-hook-config +++ pkg-config-0.29.1/debian/pkg-config-hook-config @@ -0,0 +1 @@ +post-invoke=if { test "$DPKG_HOOK_ACTION" = add-architecture || test "$DPKG_HOOK_ACTION" = remove-architecture; } && test -x /usr/share/pkg-config-dpkghook; then /usr/share/pkg-config-dpkghook update; fi --- pkg-config-0.29.1.orig/debian/pkg-config.install +++ pkg-config-0.29.1/debian/pkg-config.install @@ -0,0 +1,3 @@ +debian/pkg-config-crosswrapper usr/share +debian/pkg-config-dpkghook usr/share +debian/pkg-config-hook-config etc/dpkg/dpkg.cfg.d/ --- pkg-config-0.29.1.orig/debian/postinst +++ pkg-config-0.29.1/debian/postinst @@ -0,0 +1,9 @@ +#! /bin/sh + +set -e + +#DEBHELPER# + +if test "$1" = configure; then + /usr/share/pkg-config-dpkghook update +fi --- pkg-config-0.29.1.orig/debian/prerm +++ pkg-config-0.29.1/debian/prerm @@ -0,0 +1,9 @@ +#! /bin/sh + +set -e + +#DEBHELPER# + +if test "$1" = remove; then + /usr/share/pkg-config-dpkghook remove +fi --- pkg-config-0.29.1.orig/debian/rules +++ pkg-config-0.29.1/debian/rules @@ -0,0 +1,39 @@ +#! /usr/bin/make -f + +DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +export LC_ALL=C + +ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) + SET_PKG_CONFIG = PKG_CONFIG=$(DEB_HOST_GNU_TYPE)-pkg-config + GCC = $(DEB_HOST_GNU_TYPE)-gcc +else + GCC = gcc +endif + +SYSTEM_LIBDIRS := $(shell for opt in '' $$($${CC-$(GCC)} -print-multi-lib | sed -n -e's/.*;@/-/p'); do \ + $(GCC) $$opt -print-search-dirs | sed -n -e's/^libraries: =//p' \ + | sed -e's/:/\n/g' | xargs -n1 readlink -f | grep -v 'gcc\|/[0-9.]\+$$'; \ + done | sort -u | tr '\n' : | sed 's/:$$//') + +%: + dh $@ --with autoreconf + +override_dh_auto_configure: + $(SET_PKG_CONFIG) ./configure --prefix=/usr \ + --build=$(DEB_BUILD_GNU_TYPE) \ + --host=$(DEB_HOST_GNU_TYPE) \ + --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info --disable-shared \ + --with-pc-path=/usr/local/lib/$(DEB_HOST_MULTIARCH)/pkgconfig:/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig \ + --with-system-library-path=$(SYSTEM_LIBDIRS) + +override_dh_auto_clean: + [ ! -f Makefile ] || $(MAKE) distclean DIST_SUBDIRS="check" + chmod +x debian/pkg-config-crosswrapper debian/pkg-config-dpkghook + +override_dh_install: + dh_install + echo $(DEB_HOST_MULTIARCH) > debian/pkg-config/usr/lib/pkg-config.multiarch --- pkg-config-0.29.1.orig/glib/m4macros/glib-gettext.m4 +++ pkg-config-0.29.1/glib/m4macros/glib-gettext.m4 @@ -313,7 +313,7 @@ # on various variables needed by the Makefile.in.in installed by # glib-gettextize. dnl -glib_DEFUN([GLIB_GNU_GETTEXT], +AU_DEFUN([GLIB_GNU_GETTEXT], [AC_REQUIRE([AC_PROG_CC])dnl GLIB_LC_MESSAGES @@ -383,7 +383,8 @@ rm -f po/POTFILES sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ < $srcdir/po/POTFILES.in > po/POTFILES - ]) + ], + [[$0: This macro is deprecated. You should use upstream gettext instead.]]) # AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) # -------------------------------