[SCM] kde-cli-tools packaging branch, master, updated. debian/5.5.4-1-9-gaa576e4

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kde-cli-tools.git;a=commitdiff;h=d9ae77c

The following commit has been merged in the master branch:
commit d9ae77c38d963eb216b6d3fa387fab463059c30e
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date:   Wed Apr 6 23:03:13 2016 +0200

    Refresh patches
---
 debian/patches/disable_failing_tests | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/debian/patches/disable_failing_tests b/debian/patches/disable_failing_tests
index 2fbfd9e..057206e 100644
--- a/debian/patches/disable_failing_tests
+++ b/debian/patches/disable_failing_tests
@@ -1,8 +1,17 @@
-Index: kde-cli-tools/keditfiletype/tests/filetypestest.cpp
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Wed, 6 Apr 2016 23:03:12 +0200
+Subject: disable_failing_tests
+
 ===================================================================
---- kde-cli-tools.orig/keditfiletype/tests/filetypestest.cpp	2015-09-11 13:39:06.274865272 +0200
-+++ kde-cli-tools/keditfiletype/tests/filetypestest.cpp	2015-09-11 13:39:29.885916131 +0200
-@@ -166,8 +166,8 @@
+---
+ keditfiletype/tests/filetypestest.cpp | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/keditfiletype/tests/filetypestest.cpp b/keditfiletype/tests/filetypestest.cpp
+index d02abc7..3d788d5 100644
+--- a/keditfiletype/tests/filetypestest.cpp
++++ b/keditfiletype/tests/filetypestest.cpp
+@@ -166,8 +166,8 @@ private Q_SLOTS:
          // Check what's in QMimeDatabase
          QStringList newPatterns = db.mimeTypeForName("text/plain").globPatterns();
          newPatterns.sort();
@@ -13,7 +22,7 @@ Index: kde-cli-tools/keditfiletype/tests/filetypestest.cpp
  
          // And then removing the custom file by hand should revert to the initial state
          const QString packageFileName = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String("/mime/") + "packages/text-plain.xml" ;
-@@ -187,7 +187,7 @@
+@@ -187,7 +187,7 @@ private Q_SLOTS:
          MimeTypeData data(db.mimeTypeForName(mimeTypeName));
          QStringList appServices = data.appServices();
          //qDebug() << appServices;
@@ -22,7 +31,7 @@ Index: kde-cli-tools/keditfiletype/tests/filetypestest.cpp
          const QString oldPreferredApp = appServices.first();
          QVERIFY(!appServices.contains(fakeApplication)); // already there? hmm can't really test then
          QVERIFY(!data.isDirty());
-@@ -286,12 +286,12 @@
+@@ -286,12 +286,12 @@ private Q_SLOTS:
          MimeTypeWriter::runUpdateMimeDatabase();
          //runKBuildSycoca();
          QMimeType mime = db.mimeTypeForName(mimeTypeName);
@@ -39,7 +48,7 @@ Index: kde-cli-tools/keditfiletype/tests/filetypestest.cpp
  
          m_mimeTypeCreatedSuccessfully = true;
      }
-@@ -307,7 +307,7 @@
+@@ -307,7 +307,7 @@ private Q_SLOTS:
          MimeTypeWriter::runUpdateMimeDatabase();
          //runKBuildSycoca();
          QMimeType mime = db.mimeTypeForName(mimeTypeName);
@@ -48,7 +57,7 @@ Index: kde-cli-tools/keditfiletype/tests/filetypestest.cpp
      }
  
      void testModifyMimeTypeComment() // of a system mimetype. And check that it's re-read correctly.
-@@ -346,7 +346,7 @@
+@@ -346,7 +346,7 @@ private: // helper methods
          const QStringList addedEntries = group.readXdgListEntry(mimeTypeName);
          if (!addedEntries.contains(application)) {
              qWarning() << addedEntries << "does not contain" << application;
@@ -57,7 +66,7 @@ Index: kde-cli-tools/keditfiletype/tests/filetypestest.cpp
          }
      }
  
-@@ -357,7 +357,7 @@
+@@ -357,7 +357,7 @@ private: // helper methods
          const QStringList removedEntries = group.readXdgListEntry(mimeTypeName);
          if (!removedEntries.contains(application)) {
              qWarning() << removedEntries << "does not contain" << application;

-- 
kde-cli-tools packaging