[SCM] libmediainfo/master: Fix pc file location not respecting multiarch paths

[hyperair at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit eda1a64da20803b75c1e89e06eb1580962b2ee59
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Mon Jan 13 02:58:19 2014 +0800

    Fix pc file location not respecting multiarch paths

diff --git a/debian/control b/debian/control
index 76f72e1..1f2a420 100644
--- a/debian/control
+++ b/debian/control
@@ -2,6 +2,7 @@ Source: libmediainfo
 Priority: optional
 Maintainer: Chow Loong Jin <hyperair at debian.org>
 Build-Depends: debhelper (>= 9),
+               dpkg-dev (>= 1.16.1),
                python-all (>= 2.6.6-3~),
                python3-all,
                dh-autoreconf,
diff --git a/debian/libmediainfo-dev.install b/debian/libmediainfo-dev.install
index 002c090..5398b6a 100644
--- a/debian/libmediainfo-dev.install
+++ b/debian/libmediainfo-dev.install
@@ -6,5 +6,3 @@ Source/MediaInfo/MediaInfo_Const.h  /usr/include/MediaInfo
 Source/MediaInfo/MediaInfo_Events.h /usr/include/MediaInfo
 
 Source/MediaInfoDLL/MediaInfoDLL.h  /usr/include/MediaInfoDLL
-
-Project/GNU/Library/libmediainfo.pc /usr/lib/pkgconfig
diff --git a/debian/rules b/debian/rules
index 549d9bc..dd9f182 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,10 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+include /usr/share/dpkg/default.mk
+
 # shared library versions
-version = $(shell dpkg-parsechangelog | sed -nre 's/^Version: (.*)-.*/\1/p')
+version = $(DEB_VERSION_UPSTREAM)
 
 override_dh_auto_configure:
 	dh_auto_configure -DProject/GNU/Library --	\
@@ -26,10 +28,8 @@ override_dh_auto_install:
 	for py3 in $(shell py3versions -vr); do												\
 		install -D -m644 Source/MediaInfoDLL/MediaInfoDLL3.py debian/tmp/usr/lib/python$$py3/dist-packages/MediaInfoDLL3.py;	\
 	done
-
-override_dh_install:
-	dh_install
-	sed -i -e 's|Version: |Version: $(version)|g' debian/libmediainfo-dev/usr/lib/pkgconfig/libmediainfo.pc
+	mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/
+	sed -e 's|Version: |Version: $(version)|g' Project/GNU/Library/libmediainfo.pc > debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/libmediainfo.pc
 
 override_dh_auto_clean:
 	dh_auto_clean -DProject/GNU/Library

-- 
libmediainfo packaging