[SCM] Konversation packaging for Debian branch, master, updated. debian/1.3-1

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 9e989008a2729813e78294f13d24e09d05481633
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Tue Jun 8 01:37:03 2010 +0300

    Drop backport_aa233e3_close_buttons_fix.diff patch, stolen from upstream.
---
 debian/changelog                                   |    1 +
 .../backport_aa233e3_close_buttons_fix.diff        |   18 ------------------
 debian/patches/series                              |    1 -
 3 files changed, 1 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fcbd38a..6221dcb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 konversation (1.3-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Drop backport_aa233e3_close_buttons_fix.diff patch, stolen from upstream.
 
  -- Modestas Vainius <modax at debian.org>  Tue, 08 Jun 2010 01:33:44 +0300
 
diff --git a/debian/patches/backport_aa233e3_close_buttons_fix.diff b/debian/patches/backport_aa233e3_close_buttons_fix.diff
deleted file mode 100644
index 5283613..0000000
--- a/debian/patches/backport_aa233e3_close_buttons_fix.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-From: Eike Hein <hein at kde.org>
-Subject: [PATCH] Fix close buttons on tabs preference not being respected for top/bottom tabs.
-Forwarded: not-needed
-Origin: backport, commit:aa233e3b66b675c62a03f1bce793e67b87b732b9
-Last-Update: 2010-05-22
-Applied-Upstream: 1.3-beta2
-
---- a/src/viewer/viewcontainer.cpp
-+++ b/src/viewer/viewcontainer.cpp
-@@ -409,7 +409,7 @@ void ViewContainer::updateTabWidgetAppea
-     else
-         m_tabWidget->cornerWidget()->hide();
- 
--    m_tabWidget->tabBar()->setTabsClosable(true);
-+    m_tabWidget->tabBar()->setTabsClosable(Preferences::self()->closeButtons());
- 
-     m_tabWidget->setAutomaticResizeTabs(Preferences::self()->useMaxSizedTabs());
- }
diff --git a/debian/patches/series b/debian/patches/series
index 8c3aca6..67ce773 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 debian_dbug_autoreplace.diff
 debian_channel.diff
-backport_aa233e3_close_buttons_fix.diff

-- 
Konversation packaging for Debian