[SCM] KTorrent Debian packaging. branch, master, updated. master/3.2.2+dfsg.2-1-11-ga7b496d

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 119334cf1173442aee622a8eb6a8e95feaaf1e03
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Tue Aug 11 02:24:42 2009 +0300

    Add patch to workaround a FTBFS against Qt 4.5.2-1.
    
    This closes #537023.
---
 debian/changelog                                   |    4 ++-
 .../debian/qt_4.5.2-1_phonon_ftbfs_fix.diff        |   26 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 30 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5c5c768..fed1eb5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,10 @@ ktorrent (3.2.3+dfsg.1-0r1) UNRELEASED; urgency=low
     - adjust debian/rules accordingly.
   * Drop quilt from build depends: unused at the moment.
   * Bump Standards-Version to 3.8.2. No changed needed.
+  * Add patch debian/qt_4.5.2-1_phonon_ftbfs_fix  which workarounds a FTBFS
+    against Qt 4.5.2-1 (Closes: #537023).
 
- -- Modestas Vainius <modestas at vainius.eu>  Tue, 11 Aug 2009 02:00:48 +0300
+ -- Modestas Vainius <modestas at vainius.eu>  Tue, 11 Aug 2009 02:22:14 +0300
 
 ktorrent (3.2.2+dfsg.2-1) unstable; urgency=low
 
diff --git a/debian/patches/debian/qt_4.5.2-1_phonon_ftbfs_fix.diff b/debian/patches/debian/qt_4.5.2-1_phonon_ftbfs_fix.diff
new file mode 100644
index 0000000..84c24a1
--- /dev/null
+++ b/debian/patches/debian/qt_4.5.2-1_phonon_ftbfs_fix.diff
@@ -0,0 +1,26 @@
+From: Modestas Vainius <modestas at vainius.eu>
+Subject: [PATCH] debian/qt_4.5.2-1_phonon_ftbfs_fix
+
+A workaround for FTBFS against broken Qt 4.5.2-1 phonon headers.
+
+Signed-off-by: Modestas Vainius <modestas at vainius.eu>
+
+---
+ plugins/mediaplayer/videowidget.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/plugins/mediaplayer/videowidget.h b/plugins/mediaplayer/videowidget.h
+index 157165e..2f228a3 100644
+--- a/plugins/mediaplayer/videowidget.h
++++ b/plugins/mediaplayer/videowidget.h
+@@ -22,7 +22,7 @@
+ #define KTVIDEOWIDGET_H
+ 
+ #include <QWidget>
+-#include <Phonon/VideoWidget>
++#include <phonon/videowidget.h>
+ #include <Phonon/MediaObject>
+ #include <Phonon/SeekSlider>
+ #include <Phonon/VolumeSlider>
+-- 
+tg: (154c8c8..) debian/qt_4.5.2-1_phonon_ftbfs_fix (depends on: upstream)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3888b86
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+debian/qt_4.5.2-1_phonon_ftbfs_fix.diff -p1

-- 
KTorrent Debian packaging.