Bug#620110: please fix libxklavier.pc to use Requires.private like God intended

[Steve Langasek]

Package: libxklavier
Version: 5.0-2
Severity: normal
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu natty ubuntu-patch

Hi folks,

The libxklavier.pc file currently hardcodes the contents of @GLIB_CFLAGS@,
@GLIB_LIBS@, etc. variables that are resolved at build time.  This is
obviously wrong - the whole point of pkg-config is that you only declare
which other libraries your library depends on, and when your /reverse
build-depends/ are built, the paths for these other libraries are resolved
to their current locations.

This will be a non-theoretical issue shortly, when multiarch begins to roll
out ond /usr/lib/glib-2.0 will move.  Please consider applying the attached
patch for this, which will be uploaded to Ubuntu shortly (after the beta
freeze), to help preserve archive buildability during the multiarch
transition.

-- 
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/
slangasek at ubuntu.com                                     vorlon at debian.org
-------------- next part --------------
--- debian/patches/use-pkgconfig-properly.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/use-pkgconfig-properly.patch	2011-03-30 06:49:58 +0000
@@ -0,0 +1,20 @@
+Description: don't substitute cflags/ldflags for other libraries into .pc file
+ Don't substitute the cflags and ldflags of other libraries into
+ libxklavier.pc.in.  Use Requires.private, which is what pkg-config is
+ designed *for*.
+Author: Steve Langasek <steve.langasek at linaro.org>
+
+diff -Nur -x '*.orig' -x '*~' libxklavier//libxklavier.pc.in libxklavier.new//libxklavier.pc.in
+--- libxklavier//libxklavier.pc.in	2011-03-29 14:46:26.000000000 -0700
++++ libxklavier.new//libxklavier.pc.in	2011-03-29 23:46:50.529880034 -0700
+@@ -5,7 +5,7 @@
+ 
+ Name: libxklavier
+ Description: libxklavier library
+-Requires: libxml-2.0
++Requires.private: gobject-2.0 glib-2.0 libxml-2.0
+ Version: @VERSION@
+-Libs: -L${libdir} -lxklavier @GLIB_LIBS@ @XML_LIBS@
+-Cflags: -I${includedir} @GLIB_CFLAGS@
++Libs: -L${libdir} -lxklavier
++Cflags: -I${includedir}