[SCM] KDE Base Runtime module packaging branch, master, updated. debian/4.11.3-1-13-g151ec0a

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 151ec0add00cc89a09f638aae75577a14248745d
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Jan 17 21:47:25 2014 -0300

    Patch testtrash.cpp to use a more commonly available directory for the test
    
    (use_always_present_path_to_test.patch).
---
 debian/changelog                                   |  2 ++
 debian/patches/series                              |  1 +
 .../patches/use_always_present_path_to_test.patch  | 23 ++++++++++++++++++++++
 3 files changed, 26 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5314131..24a5536 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ kde-runtime (4:4.11.5-1) UNRELEASED; urgency=low
   * Update Standards-Version to 3.9.5, no changes required.
   * Add basic support for autopkgtest.
   * Add use_the_correct_locale.patch to use C.UTF-8 as locale on testtrash.cpp.
+  * Patch testtrash.cpp to use a more commonly available directory for the
+    test (use_always_present_path_to_test.patch).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 15 Dec 2013 22:19:33 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index 779372b..26d0f99 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ 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
diff --git a/debian/patches/use_always_present_path_to_test.patch b/debian/patches/use_always_present_path_to_test.patch
new file mode 100644
index 0000000..ce1abc2
--- /dev/null
+++ b/debian/patches/use_always_present_path_to_test.patch
@@ -0,0 +1,23 @@
+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: no
+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