[SCM] KDE Base Runtime module packaging branch, master, updated. debian/4.14.2-1-35-ge44de4d

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kde-runtime.git;a=commitdiff;h=64aaeab

The following commit has been merged in the master branch:
commit 64aaeabdb32b89e2f0d6d63ebf0f0ad398bacf15
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Feb 23 22:58:49 2015 +0100

    Remove upstream patch upstream_sanitize_path and refresh the others
---
 debian/changelog                                   |  2 ++
 debian/patches/kubuntu_nodisplay_knetattach.diff   |  8 +++----
 debian/patches/series                              |  1 -
 debian/patches/upstream_sanitize_path              | 27 ----------------------
 .../patches/use_always_present_path_to_test.patch  |  8 ++++---
 5 files changed, 11 insertions(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ab57dfd..5bb29b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ kde-runtime (4:14.12.2-1~) UNRELEASED; urgency=medium
 
   * New upstream release (14.12.2).
   * Bump Standards-Version to 3.9.6, no changes needed.
+  * Remove upstream patch: upstream_sanitize_path
+  * Refresh patches.
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 23 Feb 2015 22:19:24 +0100
 
diff --git a/debian/patches/kubuntu_nodisplay_knetattach.diff b/debian/patches/kubuntu_nodisplay_knetattach.diff
index 91bb874..88d04e8 100644
--- a/debian/patches/kubuntu_nodisplay_knetattach.diff
+++ b/debian/patches/kubuntu_nodisplay_knetattach.diff
@@ -1,8 +1,8 @@
-Index: kde-runtime-4.10.3/knetattach/knetattach.desktop
+Index: kde-runtime/knetattach/knetattach.desktop
 ===================================================================
---- kde-runtime-4.10.3.orig/knetattach/knetattach.desktop	2013-05-24 22:15:44.000000000 +0000
-+++ kde-runtime-4.10.3/knetattach/knetattach.desktop	2013-05-24 22:15:44.000000000 +0000
-@@ -187,3 +187,4 @@
+--- kde-runtime.orig/knetattach/knetattach.desktop	2015-02-23 22:57:53.683998274 +0100
++++ kde-runtime/knetattach/knetattach.desktop	2015-02-23 22:57:53.679998329 +0100
+@@ -186,3 +186,4 @@
  Categories=Qt;KDE;Network;RemoteAccess;
  X-DocPath=knetattach/index.html
  OnlyShowIn=KDE;
diff --git a/debian/patches/series b/debian/patches/series
index 4357504..a0c29ba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,7 +5,6 @@ use_the_correct_locale.patch
 use_always_present_path_to_test.patch
 disable_flacky_tests
 disable_kwalletd_autotests
-upstream_sanitize_path
 #kubuntu_langpack_install.diff
 kubuntu_nodisplay_knetattach.diff
 kubuntu_shutup_shutup_shutup.diff
diff --git a/debian/patches/upstream_sanitize_path b/debian/patches/upstream_sanitize_path
deleted file mode 100644
index 88cf297..0000000
--- a/debian/patches/upstream_sanitize_path
+++ /dev/null
@@ -1,27 +0,0 @@
-commit d68703900edc8416fbcd2550cd336cbbb76decb9
-Author: Martin Sandsmark <martin.sandsmark at kde.org>
-Date:   Thu Nov 13 13:29:01 2014 +0100
-
-    Sanitize path
-
-diff --git a/kioslave/bookmarks/kio_bookmarks.cpp b/kioslave/bookmarks/kio_bookmarks.cpp
-index 750495d..53c8aa3 100644
---- a/kioslave/bookmarks/kio_bookmarks.cpp
-+++ b/kioslave/bookmarks/kio_bookmarks.cpp
-@@ -22,6 +22,7 @@
- #include <stdlib.h>
- 
- #include <qregexp.h>
-+#include <qtextdocument.h>
- 
- #include <kapplication.h>
- #include <kcmdlineargs.h>
-@@ -197,7 +198,7 @@ void BookmarksProtocol::get( const KUrl& url )
-     echoImage(regexp.cap(1), regexp.cap(2), url.queryItem("size"));
-   } else {
-     echoHead();
--    echo("<p class=\"message\">" + i18n("Wrong request: %1",path) + "</p>");
-+    echo("<p class=\"message\">" + i18n("Bad request: %1", Qt::escape(Qt::escape(url.prettyUrl()))) + "</p>");
-   }
-   finished();
- }
diff --git a/debian/patches/use_always_present_path_to_test.patch b/debian/patches/use_always_present_path_to_test.patch
index a84006a..8e7bd2d 100644
--- a/debian/patches/use_always_present_path_to_test.patch
+++ b/debian/patches/use_always_present_path_to_test.patch
@@ -8,9 +8,11 @@ Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
 Forwarded: https://bugs.kde.org/show_bug.cgi?id=330107
 Last-Update: 2014-01-17
 
---- kde-runtime-4.11.5.orig/kioslave/trash/tests/testtrash.cpp
-+++ kde-runtime-4.11.5/kioslave/trash/tests/testtrash.cpp
-@@ -856,8 +856,8 @@ void TestTrash::moveDirectoryFromTrash()
+Index: kde-runtime/kioslave/trash/tests/testtrash.cpp
+===================================================================
+--- kde-runtime.orig/kioslave/trash/tests/testtrash.cpp	2015-02-23 22:55:56.275954508 +0100
++++ kde-runtime/kioslave/trash/tests/testtrash.cpp	2015-02-23 22:55:56.231955988 +0100
+@@ -894,8 +894,8 @@
  void TestTrash::trashDirectoryOwnedByRoot()
  {
      KUrl u;

-- 
KDE Base Runtime module packaging