[SCM] libmediainfo/master: Add libzen to Requires of .pc file

[hyperair at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 1a438612436f91dd7f63a2442381efea3e19150a
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Fri Jan 27 05:19:06 2012 +0800

    Add libzen to Requires of .pc file

diff --git a/debian/patches/0002-Add-libzen-to-Requires-of-.pc-file.patch b/debian/patches/0002-Add-libzen-to-Requires-of-.pc-file.patch
new file mode 100644
index 0000000..344167d
--- /dev/null
+++ b/debian/patches/0002-Add-libzen-to-Requires-of-.pc-file.patch
@@ -0,0 +1,38 @@
+From: Chow Loong Jin <hyperair at debian.org>
+Date: Fri, 27 Jan 2012 05:18:44 +0800
+Subject: Add libzen to Requires of .pc file
+
+Don't link to libzen directly in Libs:, but let pkg-config pull in the Libs:
+from libzen.pc, allowing the extra Cflags to come in as well
+---
+ Project/GNU/Library/configure.ac       |    2 +-
+ Project/GNU/Library/libmediainfo.pc.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Project/GNU/Library/configure.ac b/Project/GNU/Library/configure.ac
+index 08f7ca1..a1ce06b 100755
+--- a/Project/GNU/Library/configure.ac
++++ b/Project/GNU/Library/configure.ac
+@@ -386,8 +386,8 @@ else
+ 		else
+ 			with_zenlib="system"
+ 			LIBS="$LIBS $(pkg-config --libs libzen)"
+-			MediaInfoLib_LIBS="$MediaInfoLib_LIBS $(pkg-config --libs libzen)"
+ 			MediaInfoLib_LIBS_Static="$MediaInfoLib_LIBS_Static $(pkg-config --variable=LIBS libzen)"
++			MediaInfoLib_Requires="${MediaInfoLib_Requires:+$MediaInfoLib_Requires, }libzen"
+ 		fi
+ 	else
+ 		AC_MSG_ERROR([libzen configuration is not found])
+diff --git a/Project/GNU/Library/libmediainfo.pc.in b/Project/GNU/Library/libmediainfo.pc.in
+index 18f2cc0..5b9d57d 100755
+--- a/Project/GNU/Library/libmediainfo.pc.in
++++ b/Project/GNU/Library/libmediainfo.pc.in
+@@ -8,6 +8,6 @@ Libs_Static=@libdir@/libmediainfo.a ${libdir}/libzen.a -lpthread -lz
+ Name: libmediainfo
+ Version: @PACKAGE_VERSION@
+ Description: MediaInfoLib
+-Libs: -L at libdir@ -lmediainfo -lzen -lz -lpthread
++Libs: -L at libdir@ -lmediainfo -lz -lpthread
+ Cflags: -I at includedir@ @MediaInfoLib_CXXFLAGS@
+ Requires: @MediaInfoLib_Requires@
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index bb31f67..10c5994 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Don-t-expose-tinyxml-dependency.patch
+0002-Add-libzen-to-Requires-of-.pc-file.patch

-- 
libmediainfo packaging