diff -pruN 0.29.2-1/debian/changelog 0.29.2-1ubuntu1/debian/changelog --- 0.29.2-1/debian/changelog 2020-05-08 22:38:00.000000000 +0000 +++ 0.29.2-1ubuntu1/debian/changelog 2020-05-08 22:38:00.000000000 +0000 @@ -1,3 +1,12 @@ +pkg-config (0.29.2-1ubuntu1) groovy; 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. + + -- Gianfranco Costamagna Sun, 26 Apr 2020 19:42:00 +0200 + pkg-config (0.29.2-1) unstable; urgency=medium * New upstream version. Closes: #922173 @@ -9,6 +18,22 @@ pkg-config (0.29.2-1) unstable; urgency= -- Tollef Fog Heen Tue, 21 Apr 2020 20:30:00 +0200 +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. @@ -39,6 +64,34 @@ pkg-config (0.29-4) unstable; urgency=me -- 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 + 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 @@ -46,6 +99,23 @@ pkg-config (0.29-3) unstable; urgency=me -- 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. @@ -67,6 +137,14 @@ pkg-config (0.29-1) unstable; urgency=me -- 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) diff -pruN 0.29.2-1/debian/pkg-config-crosswrapper 0.29.2-1ubuntu1/debian/pkg-config-crosswrapper --- 0.29.2-1/debian/pkg-config-crosswrapper 2020-05-08 22:38:00.000000000 +0000 +++ 0.29.2-1ubuntu1/debian/pkg-config-crosswrapper 2020-05-08 22:38:00.000000000 +0000 @@ -39,7 +39,11 @@ if [ x"${PKG_CONFIG_LIBDIR+set}" = x ]; # 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" + # 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