[SCM] KDE PIM module packaging branch, experimental, updated. debian/4.4.11.1+l10n-1-30-g5ce14a2

[Modestas Vainius]

The following commit has been merged in the experimental branch:
commit 5bc07d5c7a125faf8c76e52d22d69b9ec21844ef
Author: Modestas Vainius <modax at debian.org>
Date:   Sun Jun 12 16:55:42 2011 +0300

    Drop displaying_only_unread_issue.diff patch, applied upstream.
---
 debian/changelog                                 |    1 +
 debian/patches/displaying_only_unread_issue.diff |   39 ----------------------
 debian/patches/series                            |    1 -
 3 files changed, 1 insertions(+), 40 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e8c75d8..bf28ec2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,7 @@ kdepim (4:4.6.0-0r1) UNRELEASED; urgency=low
   * Wildcardize l10n stuff in *.install files.
   * Wildcardize non-en documentation.
   * Drop kdepim_l10n.diff patch, not needed.
+  * Drop displaying_only_unread_issue.diff patch, applied upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 05 Sep 2010 12:51:05 +0300
 
diff --git a/debian/patches/displaying_only_unread_issue.diff b/debian/patches/displaying_only_unread_issue.diff
deleted file mode 100644
index dbb6939..0000000
--- a/debian/patches/displaying_only_unread_issue.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-commit 1380ce172e4f98ab433085721f0e8fddef4ba621
-Author: Christophe Giboudeaux <cgiboudeaux at gmx.com>
-Date:   Thu Apr 28 11:34:39 2011 +0200
-
-    Revert "Maintain sort order when new articles are added"
-    
-    While fixing the new article sorting issue, this introduced regressions
-    when displaying only unread articles.
-    
-    Alex, please fix and resubmit to kdepim/4.6.
-    BUG: 271794
-    BUG: 271149
-    CCBUG: 271640
-    FIXED-IN: kdepim 4.6
-    
-    This reverts commit e95e0f8e3687137f02e19d3ecf5ea0a9463f5962.
-
---- a/akregator/src/articlelistview.cpp
-+++ b/akregator/src/articlelistview.cpp
-@@ -156,11 +156,9 @@
-     m_proxy->setSourceModel( model );
-     m_proxy->setSortRole( ArticleModel::SortRole );
-     m_proxy->setFilters( m_matchers );
--    m_proxy->setDynamicSortFilter( true );
-     FilterDeletedProxyModel* const proxy2 = new FilterDeletedProxyModel( model );
-     proxy2->setSortRole( ArticleModel::SortRole );
-     proxy2->setSourceModel( m_proxy );
--    proxy2->setDynamicSortFilter( true );
- 
-     FilterColumnsProxyModel* const columnsProxy = new FilterColumnsProxyModel( model );
-     columnsProxy->setSortRole( ArticleModel::SortRole );
-@@ -169,7 +167,6 @@
-     columnsProxy->setColumnEnabled( ArticleModel::FeedTitleColumn );
-     columnsProxy->setColumnEnabled( ArticleModel::DateColumn );
-     columnsProxy->setColumnEnabled( ArticleModel::AuthorColumn );
--    columnsProxy->setDynamicSortFilter( true );
- 
-     setModel( columnsProxy );
-     header()->setContextMenuPolicy( Qt::CustomContextMenu );
diff --git a/debian/patches/series b/debian/patches/series
index cbcef98..4235252 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 debianize_akregator_default.diff
-displaying_only_unread_issue.diff

-- 
KDE PIM module packaging