[SCM] Phonon Multimedia Framework packaging branch, master, updated. debian/4.6.0.0-1
Modestas Vainius
modax at alioth.debian.org
Sun Feb 19 17:44:02 UTC 2012
The following commit has been merged in the master branch:
commit a338d1f3727e5de372976e3c8f5a38f7532c3afb
Author: Modestas Vainius <modax at debian.org>
Date: Sun Feb 19 18:01:04 2012 +0200
Add globaldescriptioncontainer.h to phonon-inc.patch.
---
debian/changelog | 1 +
debian/patches/phonon-inc.patch | 3 ++-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b956ebf..e17b9f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ phonon (4:4.6.0.0-1) UNRELEASED; urgency=low
[ Modestas Vainius ]
* Adapt findqt4_optional_x11.diff to upstream changes.
* Adapt no_rpath.patch to upstream changes.
+ * Add globaldescriptioncontainer.h to phonon-inc.patch.
-- 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-inc.patch b/debian/patches/phonon-inc.patch
index 1b84f13..b4f3394 100644
--- a/debian/patches/phonon-inc.patch
+++ b/debian/patches/phonon-inc.patch
@@ -15,7 +15,7 @@ Last-Update: 2011-12-20
+DESTINATION ${INCLUDE_INSTALL_DIR}/phonon)
--- /dev/null
+++ b/phonon/phonon
-@@ -0,0 +1,31 @@
+@@ -0,0 +1,32 @@
+#include "abstractaudiooutput.h"
+#include "abstractmediastream.h"
+#include "abstractvideooutput.h"
@@ -28,6 +28,7 @@ Last-Update: 2011-12-20
+#include "effectinterface.h"
+#include "effectparameter.h"
+#include "effectwidget.h"
++#include "globaldescriptioncontainer.h"
+#include "mediacontroller.h"
+#include "medianode.h"
+#include "mediaobject.h"
--
Phonon Multimedia Framework packaging
More information about the pkg-kde-commits
mailing list