[SCM] Phonon Multimedia Framework packaging branch, master, updated. debian/4.8.0-3-3-g3bc74b5

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit 3bc74b56d5efab69dc66ab96e2cf1cc1bf4d31bf
Author: Rohan Garg <rohan at kde.org>
Date:   Fri Nov 7 15:03:56 2014 +0100

    Update phonon_is_not_forced_in_KDE.diff so that the new include path is properly exported.
---
 debian/changelog                                |  4 ++++
 debian/patches/phonon_is_not_forced_in_KDE.diff | 21 ++++++++++++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1c1fd44..7fb54f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ phonon (4:4.8.0-4) UNRELEASED; urgency=medium
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Add myself to Uploaders.
 
+  [ Rohan Garg ]
+  * Update phonon_is_not_forced_in_KDE.diff so that the
+    new include path is properly exported.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 06 Oct 2014 14:03:01 -0300
 
 phonon (4:4.8.0-3) unstable; urgency=medium
diff --git a/debian/patches/phonon_is_not_forced_in_KDE.diff b/debian/patches/phonon_is_not_forced_in_KDE.diff
index 7665bce..b8f90c9 100644
--- a/debian/patches/phonon_is_not_forced_in_KDE.diff
+++ b/debian/patches/phonon_is_not_forced_in_KDE.diff
@@ -2,9 +2,11 @@ From: Sune Vuorela <debian at pusling.com>
 Subject: Install headers where they were earlier
 Forwarded: no
 
---- a/includes/CMakeLists.txt
-+++ b/includes/CMakeLists.txt
-@@ -91,7 +91,7 @@ install( FILES
+Index: phonon-4.8.0/includes/CMakeLists.txt
+===================================================================
+--- phonon-4.8.0.orig/includes/CMakeLists.txt	2014-09-06 16:14:24.000000000 +0000
++++ phonon-4.8.0/includes/CMakeLists.txt	2014-10-29 14:31:14.000000000 +0000
+@@ -91,7 +91,7 @@
    old/Phonon/VolumeFaderEffect
    old/Phonon/VolumeFaderInterface
    old/Phonon/VolumeSlider
@@ -13,3 +15,16 @@ Forwarded: no
  
  if (PHONON_BUILD_EXPERIMENTAL)
      install(FILES
+Index: phonon-4.8.0/PhononConfig.cmake.in
+===================================================================
+--- phonon-4.8.0.orig/PhononConfig.cmake.in	2014-09-06 16:14:24.000000000 +0000
++++ phonon-4.8.0/PhononConfig.cmake.in	2014-10-29 14:32:01.374544000 +0000
+@@ -30,7 +30,7 @@
+ # The following one is only for compatiblity
+ set(PHONON_LIBS ${PHONON_LIBRARIES})
+ 
+-set(PHONON_INCLUDES ${PHONON_INCLUDE_DIR} ${PHONON_INCLUDE_DIR}/KDE )
++set(PHONON_INCLUDES ${PHONON_INCLUDE_DIR} ${PHONON_INCLUDE_DIR}/KDE ${PHONON_INCLUDE_DIR}/phonon )
+ 
+ # Find Internal is included in the backends' finders rather than here.
+ # http://lists.kde.org/?l=kde-multimedia&m=135934335320148&w=2

-- 
Phonon Multimedia Framework packaging