r28956 - in /packages/unstable/libxklavier/debian: changelog patches/ patches/series patches/use-pkgconfig-properly.patch

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Jul 20 15:31:28 2011
New Revision: 28956

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=28956
Log:
* debian/patches/use-pkgconfig-properly.patch:
  - Use Requires.private in libxklavier.pc to specify the dependencies
    instead of substituting CFLAGS/LIBS for other libraries as this will
    break with multiarch. Patch courtesy of Steve Langasek. Closes: #620110

Added:
    packages/unstable/libxklavier/debian/patches/
    packages/unstable/libxklavier/debian/patches/series
    packages/unstable/libxklavier/debian/patches/use-pkgconfig-properly.patch
Modified:
    packages/unstable/libxklavier/debian/changelog

Modified: packages/unstable/libxklavier/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libxklavier/debian/changelog?rev=28956&op=diff
==============================================================================
--- packages/unstable/libxklavier/debian/changelog [utf-8] (original)
+++ packages/unstable/libxklavier/debian/changelog [utf-8] Wed Jul 20 15:31:28 2011
@@ -11,6 +11,10 @@
     - Bump Standards-Version to 3.9.2. No further changes.
     - Add Vcs-* fields.
     - Remove old Conflicts and Replaces which are no longer necessary.
+  * debian/patches/use-pkgconfig-properly.patch:
+    - Use Requires.private in libxklavier.pc to specify the dependencies
+      instead of substituting CFLAGS/LIBS for other libraries as this will
+      break with multiarch. Patch courtesy of Steve Langasek. Closes: #620110
 
  -- Michael Biebl <biebl at debian.org>  Wed, 20 Jul 2011 14:14:35 +0200
 

Added: packages/unstable/libxklavier/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libxklavier/debian/patches/series?rev=28956&op=file
==============================================================================
--- packages/unstable/libxklavier/debian/patches/series (added)
+++ packages/unstable/libxklavier/debian/patches/series [utf-8] Wed Jul 20 15:31:28 2011
@@ -1,0 +1,1 @@
+use-pkgconfig-properly.patch

Added: packages/unstable/libxklavier/debian/patches/use-pkgconfig-properly.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libxklavier/debian/patches/use-pkgconfig-properly.patch?rev=28956&op=file
==============================================================================
--- packages/unstable/libxklavier/debian/patches/use-pkgconfig-properly.patch (added)
+++ packages/unstable/libxklavier/debian/patches/use-pkgconfig-properly.patch [utf-8] Wed Jul 20 15:31:28 2011
@@ -1,0 +1,22 @@
+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>
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37278
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=620110
+
+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}