[SCM] qbs packaging branch, experimental, updated. debian/1.4.1+dfsg-1-3-g8dceb41

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qbs.git;a=commitdiff;h=8dceb41

The following commit has been merged in the experimental branch:
commit 8dceb415b284526f1869ed7a2657d9a46f3acb97
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Jul 8 13:59:34 2015 +0300

    Revert upstream commit that may have caused tests to fail.
---
 debian/changelog                         |  1 +
 debian/patches/revert_tests_speedup.diff | 29 +++++++++++++++++++++++++++++
 debian/patches/series                    |  1 +
 3 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index bc4ada9..539b088 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qbs (1.4.1+dfsg-2) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * Version all symbols from 1.4 snapshots as 1.4.0.
+  * Revert upstream commit that may have caused tests to fail.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 08 Jul 2015 13:47:37 +0300
 
diff --git a/debian/patches/revert_tests_speedup.diff b/debian/patches/revert_tests_speedup.diff
new file mode 100644
index 0000000..6be05e3
--- /dev/null
+++ b/debian/patches/revert_tests_speedup.diff
@@ -0,0 +1,29 @@
+Description: revert upstream commit that made tests less stable
+ This one: http://code.qt.io/cgit/qt-labs/qbs.git/commit/?id=b7d70d48508e4645.
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: no
+Last-Update: 2015-07-08
+
+--- a/tests/auto/shared.h
++++ b/tests/auto/shared.h
+@@ -91,17 +91,10 @@
+ inline void waitForNewTimestamp()
+ {
+     // Waits for the time that corresponds to the host file system's time stamp granularity.
+-    if (qbs::Internal::HostOsInfo::isWindowsHost()) {
++    if (qbs::Internal::HostOsInfo::isWindowsHost())
+         QTest::qWait(1);        // NTFS has 100 ns precision. Let's ignore exFAT.
+-    } else {
+-        time_t oldTime;
+-        time_t newTime = std::time(0);
+-        do {
+-            oldTime = newTime;
+-            QTest::qWait(50);
+-            newTime = std::time(0);
+-        } while (oldTime == newTime);
+-    }
++    else
++        QTest::qWait(1000);
+ }
+ 
+ inline void touch(const QString &fn)
diff --git a/debian/patches/series b/debian/patches/series
index 08a6b95..54254b7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 skip_test.diff
 remove_rpaths.diff
+revert_tests_speedup.diff

-- 
qbs packaging