[SCM] libmediainfo/master: Drop public dependency of libzen in .pc file

[hyperair at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 3e7e828e958909392ee0364bf17f04638d68e746
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Sun Jan 29 07:54:04 2012 +0800

    Drop public dependency of libzen in .pc file

diff --git a/debian/patches/0002-Add-libzen-to-Requires-of-.pc-file.patch b/debian/patches/0002-Drop-direct-linkage-of-libzen-in-.pc.patch
similarity index 69%
rename from debian/patches/0002-Add-libzen-to-Requires-of-.pc-file.patch
rename to debian/patches/0002-Drop-direct-linkage-of-libzen-in-.pc.patch
index 344167d..7722b16 100644
--- a/debian/patches/0002-Add-libzen-to-Requires-of-.pc-file.patch
+++ b/debian/patches/0002-Drop-direct-linkage-of-libzen-in-.pc.patch
@@ -1,28 +1,26 @@
 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
+Subject: Drop direct linkage of libzen in .pc
 
-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
+libzen is a private dependnecy, not a public dependency, so there is no need to
+link against it directly in client code.
 ---
- Project/GNU/Library/configure.ac       |    2 +-
+ Project/GNU/Library/configure.ac       |    1 -
  Project/GNU/Library/libmediainfo.pc.in |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ 2 files changed, 1 insertions(+), 2 deletions(-)
 
 diff --git a/Project/GNU/Library/configure.ac b/Project/GNU/Library/configure.ac
-index 08f7ca1..a1ce06b 100755
+index 08f7ca1..d410017 100755
 --- a/Project/GNU/Library/configure.ac
 +++ b/Project/GNU/Library/configure.ac
-@@ -386,8 +386,8 @@ else
+@@ -386,7 +386,6 @@ 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
diff --git a/debian/patches/series b/debian/patches/series
index 10c5994..f20c3fb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
 0001-Don-t-expose-tinyxml-dependency.patch
-0002-Add-libzen-to-Requires-of-.pc-file.patch
+0002-Drop-direct-linkage-of-libzen-in-.pc.patch

-- 
libmediainfo packaging