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

Modestas Vainius modax at alioth.debian.org
Tue Nov 5 11:43:07 UTC 2013


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

The following commit has been merged in the master branch:
commit ad052898d0006e1f4aed2b99d5e8d390dfd0eb47
Author: Modestas Vainius <modax at debian.org>
Date:   Tue Nov 5 10:04:45 2013 +0200

    Refresh phonon-inc.patch.
---
 debian/changelog                |    1 +
 debian/patches/phonon-inc.patch |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 98b054f..4daa375 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ phonon (4:4.7.0.0-0r1) UNRELEASED; urgency=low
 
   * New upstream release (4.7.0).
   * Adapt no_rpath.patch to upstream changes.
+  * Refresh phonon-inc.patch.
 
  -- Modestas Vainius <modax at debian.org>  Tue, 05 Nov 2013 09:55:14 +0200
 
diff --git a/debian/patches/phonon-inc.patch b/debian/patches/phonon-inc.patch
index b4f3394..84e171f 100644
--- a/debian/patches/phonon-inc.patch
+++ b/debian/patches/phonon-inc.patch
@@ -6,8 +6,8 @@ Last-Update: 2011-12-20
 
 --- a/phonon/CMakeLists.txt
 +++ b/phonon/CMakeLists.txt
-@@ -153,3 +153,6 @@ if (QT_QTDBUS_FOUND AND NOT PHONON_NO_DB
-     install(FILES org.kde.Phonon.AudioOutput.xml  DESTINATION  ${DBUS_INTERFACES_INSTALL_DIR})
+@@ -222,3 +222,6 @@ if (QT_QTDBUS_FOUND AND NOT PHONON_NO_DB
+     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.${PHONON_LIB_SONAME_CAMEL}.AudioOutput.xml DESTINATION  ${DBUS_INTERFACES_INSTALL_DIR})
  endif (QT_QTDBUS_FOUND AND NOT PHONON_NO_DBUS)
  
 +install(FILES

-- 
Phonon Multimedia Framework packaging



More information about the pkg-kde-commits mailing list