[SCM] kcoreaddons packaging branch, kubuntu_vivid_archive, updated. 427419908165c7cf982fe1cd5ed49a21659b6c49

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kcoreaddons.git;a=commitdiff;h=4274199

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 427419908165c7cf982fe1cd5ed49a21659b6c49
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Fri Nov 28 13:16:31 2014 +0100

    Remove unused patch disable-failing-test.diff
---
 debian/changelog                         |  1 +
 debian/patches/disable-failing-test.diff | 13 -------------
 debian/patches/series                    |  0
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3a80ce6..fe34054 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 kcoreaddons (5.4.0-0ubuntu2) UNRELEASED; urgency=medium
 
   * Remove unused FAM build-dep, we use inotify
+  * Remove unused patch disable-failing-test.diff
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 28 Nov 2014 13:10:03 +0100
 
diff --git a/debian/patches/disable-failing-test.diff b/debian/patches/disable-failing-test.diff
deleted file mode 100644
index 57f0f9a..0000000
--- a/debian/patches/disable-failing-test.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: kcoreaddons-4.95.0/autotests/kdirwatch_unittest.cpp
-===================================================================
---- kcoreaddons-4.95.0.orig/autotests/kdirwatch_unittest.cpp	2014-01-03 12:00:33.000000000 +0000
-+++ kcoreaddons-4.95.0/autotests/kdirwatch_unittest.cpp	2014-01-21 17:22:27.426351917 +0000
-@@ -482,7 +482,7 @@
- 
-     if (watch.internalMethod() == KDirWatch::INotify) {
-         QVERIFY(waitForOneSignal(watch, SIGNAL(deleted(QString)), file1));
--        QVERIFY(waitForOneSignal(watch, SIGNAL(created(QString)), file1));
-+	//    QVERIFY(waitForOneSignal(watch, SIGNAL(created(QString)), file1));
-     } else {
-         QVERIFY(waitForOneSignal(watch, SIGNAL(dirty(QString)), file1));
-     }
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e69de29..0000000

-- 
kcoreaddons packaging