[SCM] KDE Base Applications module packaging branch, master, updated. debian/4.10.5-1-4-gdef78e8

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit def78e8e6ae86a99cbb52d59a66b47ca2e9a35c7
Author: Pino Toscano <pino at debian.org>
Date:   Sat Jul 13 15:26:21 2013 +0200

    remove traces of non-uploaded 4:4.8.4-3
    
    all its content is already available in kde-baseapps 4.10.x
---
 debian/changelog                                   |   11 -----
 debian/patches/series                              |    1 -
 ...en-in-new-window-to-work-with-remote-URLs.patch |   45 --------------------
 3 files changed, 57 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e581ca6..f635448 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,17 +39,6 @@ kde-baseapps (4:4.10.2-1) experimental; urgency=low
 
  -- Sune Vuorela <sune at debian.org>  Wed, 03 Apr 2013 18:55:57 +0000
 
-kde-baseapps (4:4.8.4-3) UNRELEASED; urgency=low
-
-  [ Pino Toscano ]
-  * Backport upstream commit bc8df3d5a1e3747a8971107bc17f593c506a6dc9 to fix
-    the "open in new window" functionality in Dolphin for remote URLs (this
-    assumes libkio5 has the fix for in-memory services; patch
-    upstream_Fix-open-in-new-window-to-work-with-remote-URLs.patch.
-    (Closes: #685980)
-
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 04 Dec 2012 15:15:40 +0100
-
 kde-baseapps (4:4.8.4-2) unstable; urgency=low
 
   [ Pino Toscano ]
diff --git a/debian/patches/series b/debian/patches/series
index e9cfce6..b3dd74f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 enable_debianabimanager.diff
 enable_dlrestrictions.diff
-upstream_Fix-open-in-new-window-to-work-with-remote-URLs.patch
diff --git a/debian/patches/upstream_Fix-open-in-new-window-to-work-with-remote-URLs.patch b/debian/patches/upstream_Fix-open-in-new-window-to-work-with-remote-URLs.patch
deleted file mode 100644
index b9a0722..0000000
--- a/debian/patches/upstream_Fix-open-in-new-window-to-work-with-remote-URLs.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From bc8df3d5a1e3747a8971107bc17f593c506a6dc9 Mon Sep 17 00:00:00 2001
-From: David Faure <faure at kde.org>
-Date: Wed, 18 Jul 2012 20:40:56 +0200
-Subject: [PATCH] Fix open-in-new-window to work with remote URLs
-
-FIXED-IN: 4.9.0
-BUGS: 274655, 292822
----
- dolphin/src/dolphinmainwindow.cpp |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/dolphin/src/dolphinmainwindow.cpp b/dolphin/src/dolphinmainwindow.cpp
-index 1ce5193..1726829 100644
---- a/dolphin/src/dolphinmainwindow.cpp
-+++ b/dolphin/src/dolphinmainwindow.cpp
-@@ -462,7 +462,7 @@ void DolphinMainWindow::updateFilterBarAction(bool show)
- 
- void DolphinMainWindow::openNewMainWindow()
- {
--    KRun::run("dolphin", KUrl::List(), this);
-+    KRun::run("dolphin %u", KUrl::List(), this);
- }
- 
- void DolphinMainWindow::openNewTab()
-@@ -567,7 +567,7 @@ void DolphinMainWindow::openInNewWindow()
-     }
- 
-     if (!newWindowUrl.isEmpty()) {
--        KRun::run("dolphin", KUrl::List() << newWindowUrl, this);
-+        KRun::run("dolphin %u", KUrl::List() << newWindowUrl, this);
-     }
- }
- 
-@@ -1399,7 +1399,7 @@ void DolphinMainWindow::openContextMenu(const QPoint& pos,
- 
-     switch (command) {
-     case DolphinContextMenu::OpenParentFolderInNewWindow: {
--        KRun::run("dolphin", KUrl::List() << item.url().upUrl(), this);
-+        KRun::run("dolphin %u", KUrl::List() << item.url().upUrl(), this);
-         break;
-     }
- 
--- 
-1.7.10.4
-

-- 
KDE Base Applications module packaging