[SCM] libmediainfo/master: Add use of Requires: libzen into .pc

[hyperair at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 62135a37870d37ae7c1518c13af165e587a50d4a
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Sat Aug 17 02:59:52 2013 +0800

    Add use of Requires: libzen into .pc

diff --git a/debian/patches/Call-PKG_PROG_PKG_CONFIG-manually.patch b/debian/patches/Call-PKG_PROG_PKG_CONFIG-manually.patch
index 6ed6139..b301dce 100644
--- a/debian/patches/Call-PKG_PROG_PKG_CONFIG-manually.patch
+++ b/debian/patches/Call-PKG_PROG_PKG_CONFIG-manually.patch
@@ -9,10 +9,10 @@ pkg-config doesn't exist.
  1 file changed, 3 insertions(+)
 
 diff --git a/Project/GNU/Library/configure.ac b/Project/GNU/Library/configure.ac
-index ec0157a..8696120 100755
+index 03b9d89..1c16f9a 100755
 --- a/Project/GNU/Library/configure.ac
 +++ b/Project/GNU/Library/configure.ac
-@@ -550,6 +550,9 @@ else
+@@ -552,6 +552,9 @@ else
  	using_libmms="not found"
  fi
  
diff --git a/debian/patches/Drop-direct-linkage-of-libzen-in-.pc.patch b/debian/patches/Drop-copying-of-libzen-s-flags-into-.pc.patch
similarity index 70%
rename from debian/patches/Drop-direct-linkage-of-libzen-in-.pc.patch
rename to debian/patches/Drop-copying-of-libzen-s-flags-into-.pc.patch
index e282d84..ca82237 100644
--- a/debian/patches/Drop-direct-linkage-of-libzen-in-.pc.patch
+++ b/debian/patches/Drop-copying-of-libzen-s-flags-into-.pc.patch
@@ -1,19 +1,19 @@
 From: Chow Loong Jin <hyperair at debian.org>
 Date: Fri, 27 Jan 2012 05:18:44 +0800
-Subject: Drop direct linkage of libzen in .pc
+Subject: Drop copying of libzen's flags into .pc
 
-libzen is a private dependency, not a public dependency, so there is no need to
-link against it directly in client code.
+Use pkg-config Requires to handle them instead, so that libzen-dev's flags can
+be upgraded independently.
 ---
  Project/GNU/Library/configure.ac       | 1 -
- Project/GNU/Library/libmediainfo.pc.in | 2 +-
- 2 files changed, 1 insertion(+), 2 deletions(-)
+ Project/GNU/Library/libmediainfo.pc.in | 3 ++-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/Project/GNU/Library/configure.ac b/Project/GNU/Library/configure.ac
-index 80b0386..ec0157a 100755
+index c89538f..03b9d89 100755
 --- a/Project/GNU/Library/configure.ac
 +++ b/Project/GNU/Library/configure.ac
-@@ -412,7 +412,6 @@ else
+@@ -414,7 +414,6 @@ else
  		else
  			with_zenlib="system"
  			LIBS="$LIBS $(pkg-config --libs libzen)"
@@ -22,13 +22,14 @@ index 80b0386..ec0157a 100755
  		fi
  	else
 diff --git a/Project/GNU/Library/libmediainfo.pc.in b/Project/GNU/Library/libmediainfo.pc.in
-index 1ee9309..f9dfd8f 100755
+index 1ee9309..43f43cf 100755
 --- a/Project/GNU/Library/libmediainfo.pc.in
 +++ b/Project/GNU/Library/libmediainfo.pc.in
-@@ -9,5 +9,5 @@ la_name=lib at MediaInfoLib_LibName@.la
+@@ -9,5 +9,6 @@ la_name=lib at MediaInfoLib_LibName@.la
  Name: libmediainfo
  Version: @PACKAGE_VERSION@
  Description: MediaInfoLib
 -Libs: -L at libdir@ -l at MediaInfoLib_LibName@ -lzen -lz -lpthread
++Requires: libzen
 +Libs: -L at libdir@ -l at MediaInfoLib_LibName@ -lz -lpthread
  Cflags: -I at includedir@ @MediaInfoLib_CXXFLAGS@
diff --git a/debian/patches/series b/debian/patches/series
index eabbd81..67632ca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-Drop-direct-linkage-of-libzen-in-.pc.patch
+Drop-copying-of-libzen-s-flags-into-.pc.patch
 Call-PKG_PROG_PKG_CONFIG-manually.patch

-- 
libmediainfo packaging