[SCM] qbs packaging branch, master, updated. debian/1.3.3+dfsg-4-4-g7a95986

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 5cafbe964f1e3e9d5d62673e539642be8c0f9fc4
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Mar 8 20:12:15 2015 +0300

    Update patches for the new release.
---
 debian/changelog                     |  1 +
 debian/patches/increase_timeout.diff | 36 ------------------------------------
 debian/patches/series                |  1 -
 debian/patches/skip_test.diff        |  2 +-
 4 files changed, 2 insertions(+), 38 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 332745e..c56954d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qbs (1.3.4+dfsg-1) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * New upstream release.
+  * Drop increase_timeout.diff, applied upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 08 Mar 2015 20:10:53 +0300
 
diff --git a/debian/patches/increase_timeout.diff b/debian/patches/increase_timeout.diff
deleted file mode 100644
index ea545ad..0000000
--- a/debian/patches/increase_timeout.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: increase tests timeout to make them succeed on mips
-Author: Dejan Latinovic <Dejan.Latinovic at imgtec.com>
-Forwarded: not-yet
-Last-Update: 2015-01-09
-
---- a/tests/auto/api/tst_api.cpp
-+++ b/tests/auto/api/tst_api.cpp
-@@ -576,7 +576,7 @@
-     qbs::Project project = setupJob->project();
-     const QScopedPointer<qbs::BuildJob> buildJob(project.buildAllProducts(qbs::BuildOptions()));
-     QTimer::singleShot(1000, buildJob.data(), SLOT(cancel()));
--    QVERIFY(waitForFinished(buildJob.data(), 300000));
-+    QVERIFY(waitForFinished(buildJob.data(), 600000));
- }
- 
- void TestApi::infiniteLoopBuilding_data()
-@@ -595,7 +595,7 @@
-     QScopedPointer<qbs::SetupProjectJob> setupJob(qbs::Project().setupProject(setupParams,
-                                                                               m_logSink, 0));
-     QTimer::singleShot(1000, setupJob.data(), SLOT(cancel()));
--    QVERIFY(waitForFinished(setupJob.data(), 300000));
-+    QVERIFY(waitForFinished(setupJob.data(), 600000));
-     QVERIFY2(setupJob->error().toString().toLower().contains("cancel"),
-              qPrintable(setupJob->error().toString()));
- }
---- a/tests/auto/blackbox/tst_blackbox.cpp
-+++ b/tests/auto/blackbox/tst_blackbox.cpp
-@@ -106,7 +106,7 @@
-     QProcess process;
-     process.setProcessEnvironment(params.environment);
-     process.start(cmdLine);
--    const int waitTime = 5 * 60000;
-+    const int waitTime = 10 * 60000;
-     if (!process.waitForStarted() || !process.waitForFinished(waitTime)) {
-         m_qbsStderr = process.readAllStandardError();
-         if (!params.expectFailure)
diff --git a/debian/patches/series b/debian/patches/series
index ffe61d6..0695402 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 endianness.diff
 skip_test.diff
 remove_rpaths.diff
-increase_timeout.diff
diff --git a/debian/patches/skip_test.diff b/debian/patches/skip_test.diff
index f603ef4..d080874 100644
--- a/debian/patches/skip_test.diff
+++ b/debian/patches/skip_test.diff
@@ -6,7 +6,7 @@ Last-Update: 2014-10-07
 
 --- a/tests/auto/blackbox/tst_blackbox.cpp
 +++ b/tests/auto/blackbox/tst_blackbox.cpp
-@@ -444,6 +444,7 @@
+@@ -453,6 +453,7 @@
  
  void TestBlackbox::dependenciesProperty()
  {

-- 
qbs packaging