[SCM] Konversation packaging for Debian branch, master, updated. master/1.2-alpha4-2-11-g84a5706

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 2ab0304104782513567370e0abb13fdc6432be50
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Wed Aug 5 18:09:18 2009 +0300

    Update patches.
---
 debian/changelog                            |    4 ++-
 debian/patches/debian/dbug_autoreplace.diff |    2 +-
 debian/patches/debian/debian_channel.diff   |    2 +-
 debian/patches/general/qt4.4_build_fix.diff |   39 ---------------------------
 debian/patches/series                       |    1 -
 5 files changed, 5 insertions(+), 43 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6c6ba07..fe11776 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ konversation (1.2~alpha5-1) unstable; urgency=low
     - debhelper 7.3 provides cmake support;
     - pkg-kde-tools 0.4.10 provides debhelper/kde.mk;
     - adjust build dependencies and debian/rules accordingly.
+  * Remove general/qt4.4_build_fix.diff patch, merged upstream.
+  * Refresh patches.
 
- -- Modestas Vainius <modestas at vainius.eu>  Wed, 05 Aug 2009 17:53:11 +0300
+ -- Modestas Vainius <modestas at vainius.eu>  Wed, 05 Aug 2009 18:08:30 +0300
 
 konversation (1.2~alpha4-2) unstable; urgency=low
 
diff --git a/debian/patches/debian/dbug_autoreplace.diff b/debian/patches/debian/dbug_autoreplace.diff
index 8b6cce2..2579501 100644
--- a/debian/patches/debian/dbug_autoreplace.diff
+++ b/debian/patches/debian/dbug_autoreplace.diff
@@ -23,4 +23,4 @@ index f809202..07de2d2 100644
  }
  
 -- 
-tg: (cc79915..) debian/dbug_autoreplace (depends on: upstream)
+tg: (3787b1d..) debian/dbug_autoreplace (depends on: upstream)
diff --git a/debian/patches/debian/debian_channel.diff b/debian/patches/debian/debian_channel.diff
index 8149bfa..68bf5c3 100644
--- a/debian/patches/debian/debian_channel.diff
+++ b/debian/patches/debian/debian_channel.diff
@@ -36,4 +36,4 @@ index f809202..dda420d 100644
      serverGroup->setExpanded(false);
      mServerGroupHash.insert(0, serverGroup);
 -- 
-tg: (cc79915..) debian/debian_channel (depends on: upstream)
+tg: (3787b1d..) debian/debian_channel (depends on: upstream)
diff --git a/debian/patches/general/qt4.4_build_fix.diff b/debian/patches/general/qt4.4_build_fix.diff
deleted file mode 100644
index 6d25dde..0000000
--- a/debian/patches/general/qt4.4_build_fix.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-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 1286138..1ad5bb7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 debian/dbug_autoreplace.diff -p1
 debian/debian_channel.diff -p1
-general/qt4.4_build_fix.diff -p1

-- 
Konversation packaging for Debian