[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.11.3-2-14-gf4910ac

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 4fa292d8fe504b9f4b8fb23f6b0e599f909ae9fa
Author: Maximiliano Curia <maxy at debian.org>
Date:   Mon Jan 13 11:43:58 2014 -0300

    New patch: debian_standardsdirtest.diff
---
 debian/changelog                            |  1 +
 debian/patches/debian_standardsdirtest.diff | 42 +++++++++++++++++++++++++++++
 debian/patches/series                       |  1 +
 3 files changed, 44 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e270190..c2427bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ kde4libs (4:4.11.5-1) UNRELEASED; urgency=low
   * New patch: kde4libs_interpret_qvarianttype_as_qmetatypetype.diff
   * Enable build failures on missing symbols.
   * Add autopkgtest.
+  * New patch: debian_standardsdirtest.diff
 
  -- Maximiliano Curia <maxy at debian.org>  Thu, 09 Jan 2014 12:14:52 -0300
 
diff --git a/debian/patches/debian_standardsdirtest.diff b/debian/patches/debian_standardsdirtest.diff
new file mode 100644
index 0000000..e380bfb
--- /dev/null
+++ b/debian/patches/debian_standardsdirtest.diff
@@ -0,0 +1,42 @@
+Index: kde4libs/kdecore/tests/kstandarddirstest.cpp
+===================================================================
+--- kde4libs.orig/kdecore/tests/kstandarddirstest.cpp	2014-01-13 17:03:44.022636603 -0300
++++ kde4libs/kdecore/tests/kstandarddirstest.cpp	2014-01-13 17:06:33.482281170 -0300
+@@ -105,7 +105,7 @@
+ 
+     const QString data = KGlobal::dirs()->findResource( "data", "cmake/modules/FindSoprano.cmake" );
+     QVERIFY( !data.isEmpty() );
+-    QVERIFY( data.endsWith( QLatin1String("share/apps/cmake/modules/FindSoprano.cmake") ) );
++    QVERIFY( data.endsWith( QLatin1String("share/kde4/apps/cmake/modules/FindSoprano.cmake") ) );
+     QVERIFY( !QDir::isRelativePath(data) );
+ }
+ 
+@@ -140,23 +140,23 @@
+     QVERIFY( !configFiles.isEmpty() );
+     QVERIFY( configFiles.count() > 5 ); // I have 9 here
+     QVERIFY( oneEndsWith( configFiles, "share/config/kdebugrc" ) );
+-    QVERIFY( !oneEndsWith( configFiles, "share/config/colors/Web.colors" ) ); // recursive was false
++    QVERIFY( !oneEndsWith( configFiles, "share/kde4/config/colors/Web.colors" ) ); // recursive was false
+ 
+     const QStringList configFilesRecursive = KGlobal::dirs()->findAllResources( "config", QString(),
+                                                                                 KStandardDirs::Recursive );
+     QVERIFY( !configFilesRecursive.isEmpty() );
+     QVERIFY( configFilesRecursive.count() > 5 ); // I have 15 here
+     QVERIFY( oneEndsWith( configFilesRecursive, "share/config/kdebugrc" ) );
+-    QVERIFY( oneEndsWith( configFilesRecursive, "share/config/ui/ui_standards.rc" ) );
+-    QVERIFY( oneEndsWith( configFilesRecursive, "share/config/colors/Web.colors" ) ); // proves that recursive worked
++    QVERIFY( oneEndsWith( configFilesRecursive, "share/kde4/config/ui/ui_standards.rc" ) );
++    QVERIFY( oneEndsWith( configFilesRecursive, "share/kde4/config/colors/Web.colors" ) ); // proves that recursive worked
+ 
+     const QStringList configFilesRecursiveWithFilter = KGlobal::dirs()->findAllResources( "config", "*rc",
+                                                                                           KStandardDirs::Recursive );
+     QVERIFY( !configFilesRecursiveWithFilter.isEmpty() );
+     QVERIFY( configFilesRecursiveWithFilter.count() >= 4 );
+     QVERIFY( oneEndsWith( configFilesRecursiveWithFilter, "share/config/kdebugrc" ) );
+-    QVERIFY( oneEndsWith( configFilesRecursiveWithFilter, "share/config/ui/ui_standards.rc" ) );
+-    QVERIFY( !oneEndsWith( configFilesRecursiveWithFilter, "share/config/colors/Web.colors" ) ); // didn't match the filter
++    QVERIFY( oneEndsWith( configFilesRecursiveWithFilter, "share/kde4/config/ui/ui_standards.rc" ) );
++    QVERIFY( !oneEndsWith( configFilesRecursiveWithFilter, "share/kde4/config/colors/Web.colors" ) ); // didn't match the filter
+ 
+     QStringList fileNames;
+     const QStringList configFilesWithFilter = KGlobal::dirs()->findAllResources("config", "*rc", KStandardDirs::NoDuplicates, fileNames);
diff --git a/debian/patches/series b/debian/patches/series
index 6518891..cfb671b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -24,3 +24,4 @@ kfreebsd_getmntent.diff
 kfreebsd_acl.diff
 cmake_compatibility.diff
 kde4libs_interpret_qvarianttype_as_qmetatypetype.diff
+debian_standardsdirtest.diff

-- 
KDE Development Platform Libraries module packaging