[SCM] libmediainfo/master: Refresh patches and drop upstreamed ones

[hyperair at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 3533a6e6537948b241dd795201698913d7ea3fcb
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Fri Jul 3 17:55:14 2015 +0800

    Refresh patches and drop upstreamed ones

diff --git a/debian/patches/Call-PKG_PROG_PKG_CONFIG-manually.patch b/debian/patches/Call-PKG_PROG_PKG_CONFIG-manually.patch
index b5a993e..a39aed0 100644
--- a/debian/patches/Call-PKG_PROG_PKG_CONFIG-manually.patch
+++ b/debian/patches/Call-PKG_PROG_PKG_CONFIG-manually.patch
@@ -9,12 +9,12 @@ 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 8a5d599..20078d6 100755
+index b3124cb..41e4273 100644
 --- a/Project/GNU/Library/configure.ac
 +++ b/Project/GNU/Library/configure.ac
-@@ -595,6 +595,9 @@ else
- 	AM_CONDITIONAL(COMPILE_AES, true)
- fi
+@@ -602,6 +602,9 @@ fi
+ dnl Needed in case with_libmd5=no while using pkg-config for other things
+ PKG_PROG_PKG_CONFIG
  
 +dnl Needed in case with_libmd5=no while using pkg-config for other things
 +PKG_PROG_PKG_CONFIG
diff --git a/debian/patches/Drop-copying-of-libzen-s-flags-into-.pc.patch b/debian/patches/Drop-copying-of-libzen-s-flags-into-.pc.patch
deleted file mode 100644
index ac28a5e..0000000
--- a/debian/patches/Drop-copying-of-libzen-s-flags-into-.pc.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Chow Loong Jin <hyperair at debian.org>
-Date: Fri, 27 Jan 2012 05:18:44 +0800
-Subject: Drop copying of libzen's flags into .pc
-
-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 | 3 ++-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Project/GNU/Library/configure.ac b/Project/GNU/Library/configure.ac
-index beb77c6..8a5d599 100755
---- a/Project/GNU/Library/configure.ac
-+++ b/Project/GNU/Library/configure.ac
-@@ -438,7 +438,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)"
- 		fi
- 	else
-diff --git a/Project/GNU/Library/libmediainfo.pc.in b/Project/GNU/Library/libmediainfo.pc.in
-index 1ee9309..43f43cf 100755
---- a/Project/GNU/Library/libmediainfo.pc.in
-+++ b/Project/GNU/Library/libmediainfo.pc.in
-@@ -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 67632ca..d5d290e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-Drop-copying-of-libzen-s-flags-into-.pc.patch
 Call-PKG_PROG_PKG_CONFIG-manually.patch

-- 
libmediainfo packaging