[SCM] Konversation packaging for Debian branch, master, updated. master/1.2-alpha4-1-1-g075e597

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 075e5978963f8a3bdd60f64d451bc81c49564e11
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sat Jul 4 14:34:44 2009 +0300

    Add patch fixing FTBFS with Qt 4.4.
    
    Signed-off-by: Modestas Vainius <modestas at vainius.eu>
---
 debian/changelog                            |    7 +++++
 debian/patches/general/qt4.4_build_fix.diff |   39 +++++++++++++++++++++++++++
 debian/patches/series                       |    1 +
 3 files changed, 47 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6ebc0da..dd6cd35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+konversation (1.2~alpha4-2) unstable; urgency=low
+
+  * Add patch from upstream svn repository (r991115) to fix building with
+    Qt 4.4 (general/qt4.4_build_fix). Resolves FTBFS on s390.
+
+ -- Modestas Vainius <modestas at vainius.eu>  Sat, 04 Jul 2009 14:33:11 +0300
+
 konversation (1.2~alpha4-1) unstable; urgency=low
 
   * New upstream development release (1.2 Alpha 4).
diff --git a/debian/patches/general/qt4.4_build_fix.diff b/debian/patches/general/qt4.4_build_fix.diff
new file mode 100644
index 0000000..6d25dde
--- /dev/null
+++ b/debian/patches/general/qt4.4_build_fix.diff
@@ -0,0 +1,39 @@
+From: Modestas Vainius <modestas at vainius.eu>
+Subject: [PATCH] general/qt4.4_build_fix (r991115)
+
+Patch from upstream subversion repository to fix build with Qt 4.4
+
+Signed-off-by: Modestas Vainius <modestas at vainius.eu>
+
+---
+ src/config/ignore_config.cpp     |    2 ++
+ src/irc/channeloptionsdialog.cpp |    1 +
+ 2 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/src/config/ignore_config.cpp b/src/config/ignore_config.cpp
+index 34256bf..3907d52 100644
+--- a/src/config/ignore_config.cpp
++++ b/src/config/ignore_config.cpp
+@@ -10,6 +10,8 @@
+   Copyright (C) 2006 John Tapsell <johnflux at gmail.com>
+ */
+ 
++#include <QHeaderView>
++
+ #include "ignore_config.h"
+ #include "ignorelistviewitem.h"
+ #include "ignore.h"
+diff --git a/src/irc/channeloptionsdialog.cpp b/src/irc/channeloptionsdialog.cpp
+index 64c1ed6..55b78c3 100644
+--- a/src/irc/channeloptionsdialog.cpp
++++ b/src/irc/channeloptionsdialog.cpp
+@@ -22,6 +22,7 @@
+ #include <QToolButton>
+ #include <QKeyEvent>
+ #include <QItemSelectionModel>
++#include <QHeaderView>
+ 
+ #include <KTextEdit>
+ #include <KLineEdit>
+-- 
+tg: (cc79915..) general/qt4.4_build_fix (depends on: upstream)
diff --git a/debian/patches/series b/debian/patches/series
index 1ad5bb7..1286138 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 debian/dbug_autoreplace.diff -p1
 debian/debian_channel.diff -p1
+general/qt4.4_build_fix.diff -p1

-- 
Konversation packaging for Debian