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

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit d734a73975d25657df01f99e555d2c548bbeeb6c
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Jan 14 21:27:50 2014 -0300

    Add use_the_correct_locale.patch to use C.UTF-8 as locale on testtrash.cpp.
---
 debian/changelog                            |  1 +
 debian/patches/series                       |  1 +
 debian/patches/use_the_correct_locale.patch | 19 +++++++++++++++++++
 3 files changed, 21 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 65dc943..5314131 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ kde-runtime (4:4.11.5-1) UNRELEASED; urgency=low
   * New upstream release.
   * 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.
 
  -- 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 8ea3a00..779372b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 kde4_information_menu.diff
 disable_usr_lib_install_rpath.diff
 khelp_htdig.diff
+use_the_correct_locale.patch
diff --git a/debian/patches/use_the_correct_locale.patch b/debian/patches/use_the_correct_locale.patch
new file mode 100644
index 0000000..22d61e6
--- /dev/null
+++ b/debian/patches/use_the_correct_locale.patch
@@ -0,0 +1,19 @@
+Description: Use the correct locale.
+ The test was expecting a specific locale. Everything seems to indicate
+ that any UTF-8 enabled locale would work for this testcases, so use
+ C.UTF-8 and avoid to have to depend on all locales.
+Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
+Forwarded: no
+Last-Update: 2014-01-14
+
+--- a/kioslave/trash/tests/testtrash.cpp
++++ b/kioslave/trash/tests/testtrash.cpp
+@@ -58,7 +58,7 @@ int initLocale()
+ {
+ #ifdef UTF8TEST
+     // Assume utf8 system
+-    setenv( "LC_ALL", "en_US.utf-8", 1 );
++    setenv( "LC_ALL", "C.UTF-8", 1 );
+     setenv( "KDE_UTF8_FILENAMES", "true", 1 );
+ #else
+     // Ensure a known QFile::encodeName behavior for trashUtf8FileFromHome

-- 
KDE Base Runtime module packaging