[SCM] kde-cli-tools packaging branch, master, updated. debian/5.5.4-1-14-gc7e167e
Maximiliano Curia
maxy at moszumanska.debian.org
Fri May 27 23:35:24 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kde-cli-tools.git;a=commitdiff;h=7836b55
The following commit has been merged in the master branch:
commit 7836b558674cbd484f5d8ea3ab651d94af44b16b
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date: Tue Apr 19 20:05:14 2016 +0200
Refresh patches
---
debian/patches/disable_failing_tests | 77 ------------------------------------
debian/patches/series | 1 -
2 files changed, 78 deletions(-)
diff --git a/debian/patches/disable_failing_tests b/debian/patches/disable_failing_tests
deleted file mode 100644
index 057206e..0000000
--- a/debian/patches/disable_failing_tests
+++ /dev/null
@@ -1,77 +0,0 @@
-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
-
-===================================================================
----
- 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();
-- QCOMPARE(newPatterns, patterns);
-- QVERIFY(!data.isDirty());
-+ // QCOMPARE(newPatterns, patterns);
-+ // QVERIFY(!data.isDirty());
-
- // 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 @@ private Q_SLOTS:
- MimeTypeData data(db.mimeTypeForName(mimeTypeName));
- QStringList appServices = data.appServices();
- //qDebug() << appServices;
-- QVERIFY(!appServices.isEmpty());
-+ // QVERIFY(!appServices.isEmpty());
- const QString oldPreferredApp = appServices.first();
- QVERIFY(!appServices.contains(fakeApplication)); // already there? hmm can't really test then
- QVERIFY(!data.isDirty());
-@@ -286,12 +286,12 @@ private Q_SLOTS:
- MimeTypeWriter::runUpdateMimeDatabase();
- //runKBuildSycoca();
- QMimeType mime = db.mimeTypeForName(mimeTypeName);
-- QVERIFY(mime.isValid());
-- QCOMPARE(mime.comment(), QString("Fake MimeType"));
-- QCOMPARE(mime.globPatterns(), patterns); // must sort them if more than one
-+ // QVERIFY(mime.isValid());
-+ // QCOMPARE(mime.comment(), QString("Fake MimeType"));
-+ // QCOMPARE(mime.globPatterns(), patterns); // must sort them if more than one
-
- // Testcase for the shaman.xml bug
-- QCOMPARE(db.mimeTypeForFile("/whatever/foo.pkg.tar.gz").name(), QString("fake/unit-test-fake-mimetype"));
-+ // QCOMPARE(db.mimeTypeForFile("/whatever/foo.pkg.tar.gz").name(), QString("fake/unit-test-fake-mimetype"));
-
- m_mimeTypeCreatedSuccessfully = true;
- }
-@@ -307,7 +307,7 @@ private Q_SLOTS:
- MimeTypeWriter::runUpdateMimeDatabase();
- //runKBuildSycoca();
- QMimeType mime = db.mimeTypeForName(mimeTypeName);
-- QVERIFY(mime.isValid());
-+ // QVERIFY(mime.isValid());
- }
-
- void testModifyMimeTypeComment() // of a system mimetype. And check that it's re-read correctly.
-@@ -346,7 +346,7 @@ private: // helper methods
- const QStringList addedEntries = group.readXdgListEntry(mimeTypeName);
- if (!addedEntries.contains(application)) {
- qWarning() << addedEntries << "does not contain" << application;
-- QVERIFY(addedEntries.contains(application));
-+ // QVERIFY(addedEntries.contains(application));
- }
- }
-
-@@ -357,7 +357,7 @@ private: // helper methods
- const QStringList removedEntries = group.readXdgListEntry(mimeTypeName);
- if (!removedEntries.contains(application)) {
- qWarning() << removedEntries << "does not contain" << application;
-- QVERIFY(removedEntries.contains(application));
-+ // QVERIFY(removedEntries.contains(application));
- }
- }
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index f4ef402..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-disable_failing_tests
--
kde-cli-tools packaging
More information about the pkg-kde-commits
mailing list