[SCM] dolphin-plugins packaging branch, master, updated. debian/4.12.4-1-47-ge05b158

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/dolphin-plugins.git;a=commitdiff;h=945c89b

The following commit has been merged in the master branch:
commit 945c89b8347d547e488ea9cd649ba4a42e4af6d2
Author: Jonathan Riddell <jriddell at ubuntu.com>
Date:   Thu Apr 10 16:23:22 2014 +0100

    remove upstream patches
---
 debian/patches/series                              |  2 -
 ...01-SVN_SILENT-made-messages-.desktop-file.patch | 24 ---------
 ...crash-on-startup-caused-by-Dropbox-plugin.patch | 57 ----------------------
 3 files changed, 83 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index c287df6..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-upstream_git/0001-SVN_SILENT-made-messages-.desktop-file.patch
-upstream_git/0002-Fix-crash-on-startup-caused-by-Dropbox-plugin.patch
diff --git a/debian/patches/upstream_git/0001-SVN_SILENT-made-messages-.desktop-file.patch b/debian/patches/upstream_git/0001-SVN_SILENT-made-messages-.desktop-file.patch
deleted file mode 100644
index d97dd91..0000000
--- a/debian/patches/upstream_git/0001-SVN_SILENT-made-messages-.desktop-file.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From a56489cf130b907c6092e7b3d94ce93e0fdef6ce Mon Sep 17 00:00:00 2001
-From: l10n daemon script <scripty at kde.org>
-Date: Thu, 27 Mar 2014 04:51:10 +0000
-Subject: [PATCH 1/2] SVN_SILENT made messages (.desktop file)
-
----
- dropbox/fileviewdropboxplugin.desktop | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/dropbox/fileviewdropboxplugin.desktop b/dropbox/fileviewdropboxplugin.desktop
-index 599f6a5..901a9d8 100644
---- a/dropbox/fileviewdropboxplugin.desktop
-+++ b/dropbox/fileviewdropboxplugin.desktop
-@@ -18,6 +18,7 @@ Name[nl]=Dropbox
- Name[pl]=Dropbox
- Name[pt]=Dropbox
- Name[pt_BR]=Dropbox
-+Name[ro]=Dropbox
- Name[ru]=Dropbox
- Name[sk]=Dropbox
- Name[sl]=Dropbox
--- 
-1.9.1
-
diff --git a/debian/patches/upstream_git/0002-Fix-crash-on-startup-caused-by-Dropbox-plugin.patch b/debian/patches/upstream_git/0002-Fix-crash-on-startup-caused-by-Dropbox-plugin.patch
deleted file mode 100644
index 048e230..0000000
--- a/debian/patches/upstream_git/0002-Fix-crash-on-startup-caused-by-Dropbox-plugin.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 671b27877b22b0e9ba3dd2bdaa0a3909c501161f Mon Sep 17 00:00:00 2001
-From: Emmanuel Pescosta <emmanuelpescosta099 at gmail.com>
-Date: Thu, 3 Apr 2014 02:03:14 +0200
-Subject: [PATCH 2/2] Fix crash on startup caused by Dropbox plugin
-
-Create the item state socket on "begin retrieval" and delete
-it again in "end retrieval".
-
-BUG: 332481
-FIXED-IN: 4.13.0
-REVIEW: 117344
----
- dropbox/fileviewdropboxplugin.cpp | 9 +++------
- 1 file changed, 3 insertions(+), 6 deletions(-)
-
-diff --git a/dropbox/fileviewdropboxplugin.cpp b/dropbox/fileviewdropboxplugin.cpp
-index 0026d59..3496ce1 100644
---- a/dropbox/fileviewdropboxplugin.cpp
-+++ b/dropbox/fileviewdropboxplugin.cpp
-@@ -44,17 +44,11 @@ public:
-         contextFilePaths(),
-         controlSocketPath(),
-         controlSocket(new QLocalSocket(parent)),
--        itemStateSocket(new QLocalSocket),
-         databaseFileWatcher(new QFileSystemWatcher(parent)),
-         contextActions(new KActionCollection(parent))
-     {
-     }
- 
--    ~Private()
--    {
--        delete itemStateSocket;
--    }
--
-     QStringList contextFilePaths;
-     QString controlSocketPath;
-     QPointer<QLocalSocket> controlSocket;
-@@ -106,6 +100,8 @@ bool FileViewDropboxPlugin::beginRetrieval(const QString& directory)
-     qRegisterMetaType<QAbstractSocket::SocketError>("QAbstractSocket::SocketError");
-     qRegisterMetaType<QAbstractSocket::SocketState>("QAbstractSocket::SocketState");
- 
-+    d->itemStateSocket = new QLocalSocket;
-+
-     return connectWithDropbox(d->itemStateSocket, LongTimeout);
- }
- 
-@@ -123,6 +119,7 @@ KVersionControlPlugin2::ItemVersion FileViewDropboxPlugin::itemVersion(const KFi
- 
- void FileViewDropboxPlugin::endRetrieval()
- {
-+    delete d->itemStateSocket;
- }
- 
- QList<QAction*> FileViewDropboxPlugin::actions(const KFileItemList& items) const
--- 
-1.9.1
-

-- 
dolphin-plugins packaging