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

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 7b526cf002d571ab91cceee5ddad303b32a87b56
Author: Modestas Vainius <modax at debian.org>
Date:   Sun Feb 19 18:49:48 2012 +0200

    Refresh phonon_is_not_forced_in_KDE.diff.
---
 debian/changelog                                |    1 +
 debian/patches/phonon_is_not_forced_in_KDE.diff |    6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e17b9f9..14373dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ phonon (4:4.6.0.0-1) UNRELEASED; urgency=low
   * Adapt findqt4_optional_x11.diff to upstream changes.
   * Adapt no_rpath.patch to upstream changes.
   * Add globaldescriptioncontainer.h to phonon-inc.patch.
+  * Refresh phonon_is_not_forced_in_KDE.diff.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 22 Jan 2012 22:51:45 +0100
 
diff --git a/debian/patches/phonon_is_not_forced_in_KDE.diff b/debian/patches/phonon_is_not_forced_in_KDE.diff
index 9dc76d4..7665bce 100644
--- a/debian/patches/phonon_is_not_forced_in_KDE.diff
+++ b/debian/patches/phonon_is_not_forced_in_KDE.diff
@@ -4,12 +4,12 @@ Forwarded: no
 
 --- a/includes/CMakeLists.txt
 +++ b/includes/CMakeLists.txt
-@@ -90,7 +90,7 @@ install( FILES
+@@ -91,7 +91,7 @@ install( FILES
    old/Phonon/VolumeFaderEffect
    old/Phonon/VolumeFaderInterface
    old/Phonon/VolumeSlider
 -DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Phonon COMPONENT Devel)
 +DESTINATION ${INCLUDE_INSTALL_DIR}/phonon/Phonon COMPONENT Devel)
  
- install(FILES
-   old/Phonon/Experimental/AbstractVideoDataOutput
+ if (PHONON_BUILD_EXPERIMENTAL)
+     install(FILES

-- 
Phonon Multimedia Framework packaging