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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit b3537057a99c0fe397e22caf6da593a24c68fe8f
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Apr 29 17:35:22 2014 +0200

    Update disable_flacky_tests patch
---
 debian/patches/disable_flacky_tests | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/patches/disable_flacky_tests b/debian/patches/disable_flacky_tests
index 1ea768c..94f45bc 100644
--- a/debian/patches/disable_flacky_tests
+++ b/debian/patches/disable_flacky_tests
@@ -1,7 +1,7 @@
 Index: kde-runtime/kurifilter-plugins/tests/kurifiltertest.cpp
 ===================================================================
 --- kde-runtime.orig/kurifilter-plugins/tests/kurifiltertest.cpp	2014-02-21 07:47:45.694599672 +0100
-+++ kde-runtime/kurifilter-plugins/tests/kurifiltertest.cpp	2014-04-14 15:07:57.258031095 +0200
++++ kde-runtime/kurifilter-plugins/tests/kurifiltertest.cpp	2014-04-29 17:33:48.503161340 +0200
 @@ -299,8 +299,8 @@
      // The default search engine is set to 'Google'
      //this may fail if your DNS knows domains KDE or FTP
@@ -13,11 +13,13 @@ Index: kde-runtime/kurifilter-plugins/tests/kurifiltertest.cpp
  }
  
  void KUriFilterTest::executables()
-@@ -309,7 +309,7 @@
+@@ -308,8 +308,8 @@
+     // Executable tests - No IKWS in minicli
      filter( "cp", "cp", KUriFilterData::Executable, minicliFilters );
      filter( "ktraderclient", "ktraderclient", KUriFilterData::Executable, minicliFilters );
-     filter( "KDE", "KDE", NO_FILTERING, minicliFilters );
+-    filter( "KDE", "KDE", NO_FILTERING, minicliFilters );
 -    filter( "I/dont/exist", "I/dont/exist", NO_FILTERING, minicliFilters );      //krazy:exclude=spelling
++    // filter( "KDE", "KDE", NO_FILTERING, minicliFilters );
 +    // filter( "I/dont/exist", "I/dont/exist", NO_FILTERING, minicliFilters );      //krazy:exclude=spelling
      filter( "/I/dont/exist", 0, KUriFilterData::Error, minicliFilters );         //krazy:exclude=spelling
      filter( "/I/dont/exist#a", 0, KUriFilterData::Error, minicliFilters );       //krazy:exclude=spelling

-- 
KDE Base Runtime module packaging