[SCM] kio packaging branch, master, updated. 552adf213029efd058f860cd200b3194cfd59258

Maximiliano Curia maxy at moszumanska.debian.org
Mon Mar 23 09:20:27 UTC 2015


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

The following commit has been merged in the master branch:
commit 4c15df8fe4bfe4cc17e729802fd7c4cb8864eab6
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sat Mar 21 10:11:54 2015 +0100

    New patch: wait_for_a_bit_longer
---
 debian/changelog                     |  1 +
 debian/patches/series                |  1 +
 debian/patches/wait_for_a_bit_longer | 13 +++++++++++++
 3 files changed, 15 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 383f916..045800f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ kio (5.8.0-1~) UNRELEASED; urgency=medium
 
   * New upstream release (5.8.0).
   * Update symbols files.
+  * New patch: wait_for_a_bit_longer
 
  -- Maximiliano Curia <maxy at debian.org>  Sat, 14 Mar 2015 10:25:38 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index 92b49a2..582dfbc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 return_on_ACCESS_DENIED
 report_error_removing_dirs
+wait_for_a_bit_longer
diff --git a/debian/patches/wait_for_a_bit_longer b/debian/patches/wait_for_a_bit_longer
new file mode 100644
index 0000000..f29a73b
--- /dev/null
+++ b/debian/patches/wait_for_a_bit_longer
@@ -0,0 +1,13 @@
+Index: kio/autotests/kdirlistertest.cpp
+===================================================================
+--- kio.orig/autotests/kdirlistertest.cpp	2015-03-21 09:18:41.971555395 +0100
++++ kio/autotests/kdirlistertest.cpp	2015-03-21 10:10:55.278685823 +0100
+@@ -1113,7 +1113,7 @@
+     QVERIFY(QDir().rmdir(path + "abc"));
+ 
+     // This should trigger an update.
+-    QVERIFY(spyCompleted.wait(1000));
++    QVERIFY(spyCompleted.wait(2000));
+     QVERIFY(m_dirLister.isFinished());
+     QCOMPARE(m_items.count(), 0);
+     QCOMPARE(m_dirLister.spyItemsDeleted.count(), 1);

-- 
kio packaging



More information about the pkg-kde-commits mailing list