[SCM] kio packaging branch, kubuntu_unstable, updated. ubuntu/5.15.0-0ubuntu3-85-gba35ed2

[Bhushan Shah]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kio.git;a=commitdiff;h=ba35ed2

The following commit has been merged in the kubuntu_unstable branch:
commit ba35ed24af8d081858427d2cc9a312eaa05fdb54
Author: Bhushan Shah <bhush94 at gmail.com>
Date:   Wed Feb 17 16:08:35 2016 +0530

    more upstream'd patches
---
 debian/patches/series                              |  2 --
 debian/patches/upstream_fix_wrong_path.patch       | 26 ----------------------
 .../patches/upstream_kioslavetest_fix_crash.patch  | 21 -----------------
 3 files changed, 49 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index ede0465..498808c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,5 +4,3 @@ report_error_removing_dirs
 wait_for_a_bit_longer
 kubuntu_kdelibs4-docs-path.diff
 fix_kfreebsd_build
-upstream_fix_wrong_path.patch
-upstream_kioslavetest_fix_crash.patch
diff --git a/debian/patches/upstream_fix_wrong_path.patch b/debian/patches/upstream_fix_wrong_path.patch
deleted file mode 100644
index 1e517fe..0000000
--- a/debian/patches/upstream_fix_wrong_path.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 15dc16141df44b4a8291a07383bd63d9154807f2
-Author: David Faure <faure at kde.org>
-Date:   Mon Feb 8 09:04:48 2016 +0100
-
-    Fix wrong path -> QUrl conversion in URL combo history (e.g. file dialog)
-    
-    Change-Id: I52ce97e28dc8a947ddd2ef9fdfefd875cf1d1ca7
-
-diff --git a/src/widgets/kurlcombobox.cpp b/src/widgets/kurlcombobox.cpp
-index dfe5d68..8eb3fbe 100644
---- a/src/widgets/kurlcombobox.cpp
-+++ b/src/widgets/kurlcombobox.cpp
-@@ -224,7 +224,12 @@ void KUrlComboBox::setUrls(const QStringList &_urls, OverLoadResolving remove)
-             ++it;
-             continue;
-         }
--        QUrl u(*it);
-+        QUrl u;
-+        if (QDir::isAbsolutePath(*it)) {
-+            u = QUrl::fromLocalFile(*it);
-+        } else {
-+            u.setUrl(*it);
-+        }
- 
-         // Don't restore if file doesn't exist anymore
-         if (u.isLocalFile() && !QFile::exists(u.toLocalFile())) {
diff --git a/debian/patches/upstream_kioslavetest_fix_crash.patch b/debian/patches/upstream_kioslavetest_fix_crash.patch
deleted file mode 100644
index 972acb9..0000000
--- a/debian/patches/upstream_kioslavetest_fix_crash.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 8d016d2950778168a9deb90bd51a1d78f91e7705
-Author: David Faure <faure at kde.org>
-Date:   Mon Feb 8 09:05:26 2016 +0100
-
-    kioslavetest: fix crash
-    
-    Change-Id: Ie28859307a4d8a698464c779752745c5f32e2220
-
-diff --git a/tests/kioslavetest.cpp b/tests/kioslavetest.cpp
-index 619d0b6..33dfb86 100644
---- a/tests/kioslavetest.cpp
-+++ b/tests/kioslavetest.cpp
-@@ -314,7 +314,7 @@ void KioslaveTest::startJob()
- void KioslaveTest::slotResult(KJob *_job)
- {
-     if (_job->error()) {
--        job->uiDelegate()->showErrorMessage();
-+        _job->uiDelegate()->showErrorMessage();
-     } else if (selectedOperation == Stat) {
-         UDSEntry entry = ((KIO::StatJob *)_job)->statResult();
-         printUDSEntry(entry);

-- 
kio packaging