[SCM] KDE Base Runtime module packaging branch, master, updated. debian/4.14.0-1-8-g7000dc4

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit b8090c8871e0b802f372832178b6435cf73c7f28
Author: Maximiliano Curia <maxy at debian.org>
Date:   Fri Sep 19 13:33:41 2014 +0200

    Remove patch: use_always_present_path_to_test.patch, no longer needed.
---
 debian/changelog                                   |  2 ++
 debian/patches/series                              |  1 -
 .../patches/use_always_present_path_to_test.patch  | 23 ----------------------
 3 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e70f49e..acb3a9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ kde-runtime (4:4.14.1-1~) UNRELEASED; urgency=medium
 
   * New upstream release (4.14.1).
   * kde-runtime-data: Update install file.
+  * Remove patch: use_always_present_path_to_test.patch, no longer
+    needed.
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 12 Sep 2014 20:29:07 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 602d014..264ec71 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@ kde4_information_menu.diff
 disable_usr_lib_install_rpath.diff
 khelp_htdig.diff
 use_the_correct_locale.patch
-use_always_present_path_to_test.patch
 kshorturifilter_qgetenv_calling_error.diff
 disable_flacky_tests
 disable_kwalletd_autotests
diff --git a/debian/patches/use_always_present_path_to_test.patch b/debian/patches/use_always_present_path_to_test.patch
deleted file mode 100644
index a84006a..0000000
--- a/debian/patches/use_always_present_path_to_test.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: use a path that's always there
- Or at least in Debian ;)
- .
- To try to use /etc/cups/ it will require to install cups first. But to be
- able to achieve the same result one can simply use /etc/crond.d, which
- is present both in Debian and Red Hat almost always (if not always).
-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()
- void TestTrash::trashDirectoryOwnedByRoot()
- {
-     KUrl u;
--    if ( QFile::exists( "/etc/cups" ) )
--        u.setPath( "/etc/cups" );
-+    if ( QFile::exists( "/etc/cron.d" ) )
-+        u.setPath( "/etc/cron.d" );
-     else if ( QFile::exists( "/boot" ) )
-         u.setPath( "/boot" );
-     else

-- 
KDE Base Runtime module packaging