[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=a04e066

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

    Remove 76e0376d7582cfe5b898c56bf3779ca2279dace8
    
    It was taken from upstream, so it's already applied.
---
 debian/changelog                                   |    4 +++
 ...x_76e0376d7582cfe5b898c56bf3779ca2279dace8.diff |   22 --------------------
 debian/patches/series                              |    1 -
 3 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5c8bf0f..bc4873d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,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.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 21 Sep 2012 14:02:51 -0300
 
 kde4libs (4:4.8.4-3) unstable; urgency=low
diff --git a/debian/patches/01_upstream_nepomuk_fix_76e0376d7582cfe5b898c56bf3779ca2279dace8.diff b/debian/patches/01_upstream_nepomuk_fix_76e0376d7582cfe5b898c56bf3779ca2279dace8.diff
deleted file mode 100644
index e943d0b..0000000
--- a/debian/patches/01_upstream_nepomuk_fix_76e0376d7582cfe5b898c56bf3779ca2279dace8.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 76e0376d7582cfe5b898c56bf3779ca2279dace8
-Author: Vishesh Handa <me at vhanda.in>
-Date:   Thu Jun 14 02:55:32 2012 +0530
-
-    Revert "Disconnect before re-connecting. Soprano does not do that for us."
-    
-    This reverts commit 3708be2d09700b21f934c2129218e1c7ea44efdf.
-    
-    This is being done so that KDE 4.8.x works with Soprano 2.7.6
-
-diff --git a/nepomuk/core/nepomukmainmodel.cpp b/nepomuk/core/nepomukmainmodel.cpp
-index 8dc0b1f..ff742d7 100644
---- a/nepomuk/core/nepomukmainmodel.cpp
-+++ b/nepomuk/core/nepomukmainmodel.cpp
-@@ -97,7 +97,6 @@ public:
-         if ( forced || (!m_socketConnectFailed && !localSocketClient.isConnected()) ) {
-             delete localSocketModel;
-             localSocketModel = 0;
--            localSocketClient.disconnect();
-             QString socketName = KGlobal::dirs()->locateLocal( "socket", "nepomuk-socket" );
-             kDebug() << "Connecting to local socket" << socketName;
-             if ( localSocketClient.connect( socketName ) ) {
diff --git a/debian/patches/series b/debian/patches/series
index 8d23b22..58c191e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-01_upstream_nepomuk_fix_76e0376d7582cfe5b898c56bf3779ca2279dace8.diff
 02_upstream_nepomuk_fix_bde5aad1e9f7bfb6f8d5c60197797de4a315158d.diff
 03_upstream_powermanager_fix_05f1a19291af5c16745b76c3e0944c5b80ef5870.diff
 kconf_update_migrate_from_kde3_icon_theme.diff

-- 
KDE Development Platform Libraries module packaging