[SCM] qbs packaging branch, master, updated. debian/1.4.1+dfsg-8-3-g7a9c6a1

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 7a9c6a1835ac5fadce5ab80ff31b1f5710eeecb8
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Aug 24 17:19:55 2015 +0300

    skip_test.diff (no longer needed)
---
 debian/changelog              |  1 +
 debian/patches/series         |  1 -
 debian/patches/skip_test.diff | 16 ----------------
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e560cbe..1610d3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qbs (1.4.2+dfsg-1) UNRELEASED; urgency=medium
   * Drop patches:
     - fix_assembly_test.diff (applied upstream)
     - revert_tests_speedup.diff (applied upstream)
+    - skip_test.diff (no longer needed)
   * Refresh and rebase other patches.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 24 Aug 2015 17:15:56 +0300
diff --git a/debian/patches/series b/debian/patches/series
index f6e7283..7ee370e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-skip_test.diff
 skip_test_homedirectory.diff
 remove_rpaths.diff
 disable_tests_qtscript.diff
diff --git a/debian/patches/skip_test.diff b/debian/patches/skip_test.diff
deleted file mode 100644
index 8f7907d..0000000
--- a/debian/patches/skip_test.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: skip failing TestBlackbox::dependenciesProperty() test
-Author: Dmitry Shachnev <mitya57 at debian.org>
-Bug: https://bugreports.qt.io/browse/QBS-695
-Forwarded: not-needed
-Last-Update: 2015-03-13
-
---- a/tests/auto/blackbox/tst_blackbox.cpp
-+++ b/tests/auto/blackbox/tst_blackbox.cpp
-@@ -453,6 +453,7 @@
- 
- void TestBlackbox::dependenciesProperty()
- {
-+    QSKIP("does not pass on most architectures");
-     QDir::setCurrent(testDataDir + QLatin1String("/dependenciesProperty"));
-     QCOMPARE(runQbs(), 0);
-     QFile depsFile(relativeProductBuildDir("product1") + QLatin1String("/product1.deps"));

-- 
qbs packaging