[SCM] KDE Bindings module packaging branch, kde4.4, updated. debian/4.4.5-5-2-g96b7821

[Pino Toscano]

The following commit has been merged in the kde4.4 branch:
commit 96b782117afeddd6e793b4855e23d69238bd8e9c
Author: Pino Toscano <pino at kde.org>
Date:   Mon May 9 12:28:32 2011 +0200

    fix smokephonon compilation with phonon >= 4.5.0 (#625707)
---
 debian/changelog                    |    3 +++
 debian/patches/series               |    1 +
 debian/patches/smokegen_phonon.diff |   17 +++++++++++++++++
 3 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5e62fe9..7fd8258 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 kdebindings (4:4.4.5-6) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Backport upstream fixes (merged in smokegen_phonon.diff) to make
+    smokephonon compile with Phonon >= 4.5.0. (Closes: #625707)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 09 May 2011 12:21:58 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index d1a7aa7..ef6b9ab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,3 +18,4 @@ backport_r1184022.diff
 backport_r1209688.diff
 backport_r1211266.diff
 add_qtwebkit_includedir.diff
+smokegen_phonon.diff
diff --git a/debian/patches/smokegen_phonon.diff b/debian/patches/smokegen_phonon.diff
new file mode 100644
index 0000000..8d6a1cf
--- /dev/null
+++ b/debian/patches/smokegen_phonon.diff
@@ -0,0 +1,17 @@
+Author: Pino Toscano <pino at kde.org>
+Description: Fix compilation with newer Phonon.
+ This includes two patches committed upstream, slightly adapted to support old
+ smokegen (which does not define __SMOKEGEN_RUN__ when running).
+Forwarded: not-needed
+Origin: vendor
+Last-Update: 2011-05-09
+
+--- a/smoke/phonon/phonon_includes.h
++++ b/smoke/phonon/phonon_includes.h
+@@ -1,4 +1,6 @@
+ #define PHONON_EXPORT
++#define PHONON_DEPRECATED
++#define PHONON_EXPORT_DEPRECATED
+ 
+ #include <phonon/abstractaudiooutput.h>
+ #include <phonon/abstractmediastream.h>

-- 
KDE Bindings module packaging