[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.8.4-3-5-ge4e44f8

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde4libs.git;a=commitdiff;h=dde4f29

The following commit has been merged in the master branch:
commit dde4f29ec422135705d6625595d5cda0fbcabd76
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Sep 21 14:16:18 2012 -0300

    Also remove bde5aad1e9f7bfb6f8d5c60197797de4a315158d
    
    Also taken from upstream.
---
 debian/changelog                                   |    6 +++-
 ...x_bde5aad1e9f7bfb6f8d5c60197797de4a315158d.diff |   23 --------------------
 debian/patches/series                              |    1 -
 3 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bc4873d..9311cb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ kde4libs (4:4.8.5-1) UNRELEASED; urgency=low
   * New upstream release.
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
-  * Remove 01_upstream_nepomuk_fix_76e0376d7582cfe5b898c56bf3779ca2279dace8.diff
-    which was taken from upstream.
+  * Remove:
+    - 01_upstream_nepomuk_fix_76e0376d7582cfe5b898c56bf3779ca2279dace8.diff
+    - 02_upstream_nepomuk_fix_bde5aad1e9f7bfb6f8d5c60197797de4a315158d.diff
+    which were taken from upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 21 Sep 2012 14:02:51 -0300
 
diff --git a/debian/patches/02_upstream_nepomuk_fix_bde5aad1e9f7bfb6f8d5c60197797de4a315158d.diff b/debian/patches/02_upstream_nepomuk_fix_bde5aad1e9f7bfb6f8d5c60197797de4a315158d.diff
deleted file mode 100644
index ae9aece..0000000
--- a/debian/patches/02_upstream_nepomuk_fix_bde5aad1e9f7bfb6f8d5c60197797de4a315158d.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-commit bde5aad1e9f7bfb6f8d5c60197797de4a315158d
-Author: Vishesh Handa <me at vhanda.in>
-Date:   Thu Jun 14 02:56:31 2012 +0530
-
-    Revert "Always rec-connect if forced (ie. when Nepomuk server restarts)"
-    
-    This reverts commit a43824a200ed76cef48a90bd3aee8547698b7c91.
-    
-    This is done so that 4.8.x works with Soprano 2.7.6
-
-diff --git a/nepomuk/core/nepomukmainmodel.cpp b/nepomuk/core/nepomukmainmodel.cpp
-index ff742d7..be23b38 100644
---- a/nepomuk/core/nepomukmainmodel.cpp
-+++ b/nepomuk/core/nepomukmainmodel.cpp
-@@ -94,7 +94,7 @@ public:
- 
-         // we may get disconnected from the server but we don't want to try
-         // to connect every time the model is requested
--        if ( forced || (!m_socketConnectFailed && !localSocketClient.isConnected()) ) {
-+        if ( !m_socketConnectFailed && !localSocketClient.isConnected() ) {
-             delete localSocketModel;
-             localSocketModel = 0;
-             QString socketName = KGlobal::dirs()->locateLocal( "socket", "nepomuk-socket" );
diff --git a/debian/patches/series b/debian/patches/series
index 58c191e..d318a49 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-02_upstream_nepomuk_fix_bde5aad1e9f7bfb6f8d5c60197797de4a315158d.diff
 03_upstream_powermanager_fix_05f1a19291af5c16745b76c3e0944c5b80ef5870.diff
 kconf_update_migrate_from_kde3_icon_theme.diff
 add_debian_build_type.diff

-- 
KDE Development Platform Libraries module packaging