Package: pkg-config
Version: 0.25-1.1
Severity: normal
Tags: patch
User: [email protected]
Usertags: natty ubuntu-patch
Hi Tollef,
Attached is the patch from Ubuntu for this bug. Now that dpkg 1.16.0 is
uploaded to unstable, it's safe to upload this to the archive as well.
Changelog entry from the Ubuntu upload:
* Switch to multiarch triplets instead of using GNU triplets; and use
directories of the form /usr/lib/$(triplet)/pkgconfig, not
/usr/lib/pkgconfig/$(triplet), since that's what autoconf and --libdir
give us everywhere. Closes: #590992.
This needs to be fixed before we can progress much farther with multiarch in
the archive, so please let me know if you would like me to NMU for this.
Thanks,
--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
Ubuntu Developer http://www.debian.org/
[email protected] [email protected]
=== modified file 'debian/control'
--- debian/control 2010-05-28 18:16:36 +0000
+++ debian/control 2011-03-15 03:03:32 +0000
@@ -2,7 +2,7 @@
Section: devel
Priority: optional
Maintainer: Tollef Fog Heen <[email protected]>
-Build-Depends: debhelper (>= 7.0.50), libglib2.0-dev, libpopt-dev
+Build-Depends: debhelper (>= 7.0.50), libglib2.0-dev, libpopt-dev, dpkg-dev
(>= 1.16.0)
Homepage: http://pkg-config.freedesktop.org
Standards-Version: 3.8.4
=== modified file 'debian/rules'
--- debian/rules 2010-05-28 18:16:36 +0000
+++ debian/rules 2011-03-15 03:00:55 +0000
@@ -1,5 +1,7 @@
#! /usr/bin/make -f
+DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
pkgdir := `pwd`/debian/sash
%:
@@ -10,7 +12,7 @@
--with-installed-popt \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info --disable-shared \
-
--with-pc-path=/usr/local/lib/pkgconfig:/usr/local/lib/pkgconfig/$(DEB_BUILD_GNU_TYPE):/usr/local/share/pkgconfig:/usr/lib/pkgconfig:/usr/lib/pkgconfig/$(DEB_BUILD_GNU_TYPE):/usr/share/pkgconfig
\
+
--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
\
override_dh_auto_clean:
[ ! -f Makefile ] || $(MAKE) distclean DIST_SUBDIRS="popt check"
