[SCM] Phonon Multimedia Framework packaging branch, master, updated. debian/4.7.0.0-1

[Modestas Vainius]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-req/phonon.git;a=commitdiff;h=07b4a83

The following commit has been merged in the master branch:
commit 07b4a83104e1aa134b3415c97c7eb031a1f04da4
Author: Modestas Vainius <modax at debian.org>
Date:   Tue Nov 5 12:18:54 2013 +0200

    No longer explicitly pass multiarch LIB_SUFFIX to cmake.
    
    Phonon gets the multiarch libdir from cmake (as of cmake 2.8.7).
---
 debian/changelog |    2 ++
 debian/control   |    2 +-
 debian/rules     |    4 +---
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c8d38f4..dc0c6a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ phonon (4:4.7.0.0-0r1) UNRELEASED; urgency=low
     has already been released with Wheezy.
   * Bump Standards-Version to 3.9.5: no further changes needed.
   * Use canonical Vcs URLs.
+  * No longer explicitly pass multiarch LIB_SUFFIX to cmake. Phonon gets the
+    multiarch libdir from cmake (as of cmake 2.8.7).
 
  -- Modestas Vainius <modax at debian.org>  Tue, 05 Nov 2013 09:55:14 +0200
 
diff --git a/debian/control b/debian/control
index 58d437d..9712c43 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Modestas Vainius <modax at debian.org>, Fathi Boudra <fabo at debian.org>
 Build-Depends: automoc,
-               cmake (>= 2.6.2),
+               cmake (>= 2.8.7),
                debhelper (>= 8.1.3~),
                dpkg-dev (>= 1.15.5),
                libglib2.0-dev,
diff --git a/debian/rules b/debian/rules
index 2924e70..11ec4d7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,5 @@
 #!/usr/bin/make -f
 
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
 dh = --dbg-package=phonon-dbg
 
 include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
@@ -13,7 +11,7 @@ include /usr/share/pkg-kde-tools/qt-kde-team/2/library-packages.mk
 RECOMMENDED_PHONON_BACKEND := phonon-backend-vlc
 
 override_dh_auto_configure:
-	$(overridden_command) -- -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH)
+	$(overridden_command) -- -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON
 
 # shlibs is needed for library-packages.mk (strict shlibs) to work
 override_dh_makeshlibs:

-- 
Phonon Multimedia Framework packaging