[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.12.4-1-10-g26eac5c

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit eb941b4ce69a1e8e82c4da62577450b0c5215620
Author: Maximiliano Curia <maxy at debian.org>
Date:   Thu May 15 09:16:02 2014 +0200

    Remove patch: kstringhandlertest_fix.diff, applied upstream.
---
 debian/changelog                           |  1 +
 debian/patches/kstringhandlertest_fix.diff | 16 ----------------
 debian/patches/series                      |  1 -
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c596e1c..93d6324 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ kde4libs (4:4.13.1-1) UNRELEASED; urgency=medium
 
   [ Maximiliano Curia ]
   * New upstream release.
+  * Remove patch: kstringhandlertest_fix.diff, applied upstream.
 
  -- Maximiliano Curia <maxy at debian.org>  Wed, 14 May 2014 19:42:21 +0200
 
diff --git a/debian/patches/kstringhandlertest_fix.diff b/debian/patches/kstringhandlertest_fix.diff
deleted file mode 100644
index 33adfe2..0000000
--- a/debian/patches/kstringhandlertest_fix.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: kde4libs/kdecore/tests/kstringhandlertest.cpp
-===================================================================
---- kde4libs.orig/kdecore/tests/kstringhandlertest.cpp	2014-01-13 11:27:40.578481463 -0300
-+++ kde4libs/kdecore/tests/kstringhandlertest.cpp	2014-01-13 12:05:21.949496740 -0300
-@@ -55,7 +55,10 @@
-     QCOMPARE(KStringHandler::naturalCompare("b", "a", Qt::CaseSensitive), +1);
-     QCOMPARE(KStringHandler::naturalCompare("a", "a", Qt::CaseSensitive), 0);
- 
--    QCOMPARE(KStringHandler::naturalCompare("A", "a", Qt::CaseSensitive), QString::localeAwareCompare("A", "a"));
-+    // Plataform dependant result, it can be any number
-+    int cmp_A_a = QString::localeAwareCompare("A", "a");
-+    QCOMPARE(KStringHandler::naturalCompare("A", "a", Qt::CaseSensitive),
-+            cmp_A_a < 0 ? -1 : cmp_A_a > 0 ? +1 : 0);
-     QCOMPARE(KStringHandler::naturalCompare("A", "a", Qt::CaseInsensitive), 0);
-     QCOMPARE(KStringHandler::naturalCompare("a", "A", Qt::CaseInsensitive), 0);
-     QCOMPARE(KStringHandler::naturalCompare("aAa", "AaA", Qt::CaseInsensitive), 0);
diff --git a/debian/patches/series b/debian/patches/series
index 3d384b7..f61e155 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -25,6 +25,5 @@ kfreebsd_acl.diff
 cmake_compatibility.diff
 kde4libs_interpret_qvarianttype_as_qmetatypetype.diff
 debian_standardsdirtest.diff
-kstringhandlertest_fix.diff
 disable_bogus_test.diff
 disable_bogus_tests

-- 
KDE Development Platform Libraries module packaging