[SCM] qbs packaging branch, master, updated. debian/1.3.1+dfsg-1-11-g467e14c

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 467e14c3a7948c8b0ebe63384e5b4609cdc88e28
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Oct 7 10:38:26 2014 +0400

    Add a patch to clean up before running dependenciesProperty test (should make it passing).
---
 debian/changelog                    |  2 ++
 debian/patches/remove_builddir.diff | 10 ++++++++++
 debian/patches/series               |  1 +
 3 files changed, 13 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f47d2ad..bc1e164 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ qbs (1.3.1+dfsg-2) UNRELEASED; urgency=medium
   * Add 4 new symbols introduced by the previous change.
   * Add a patch to correctly detect endianness of all supported
     by Debian architectures.
+  * Add a patch to clean up before running dependenciesProperty
+    test (should make it passing).
   * Add lib/ to LD_LIBRARY_PATH when running tests (should fix
     build failures on kfreebsd and hurd).
 
diff --git a/debian/patches/remove_builddir.diff b/debian/patches/remove_builddir.diff
new file mode 100644
index 0000000..2f69f2e
--- /dev/null
+++ b/debian/patches/remove_builddir.diff
@@ -0,0 +1,10 @@
+--- a/tests/auto/blackbox/tst_blackbox.cpp
++++ b/tests/auto/blackbox/tst_blackbox.cpp
+@@ -423,6 +423,7 @@
+ void TestBlackbox::dependenciesProperty()
+ {
+     QDir::setCurrent(testDataDir + QLatin1String("/dependenciesProperty"));
++    rmDirR(buildDir);
+     QCOMPARE(runQbs(), 0);
+     QFile depsFile(productBuildDir("product1") + QLatin1String("/product1.deps"));
+     QVERIFY(depsFile.open(QFile::ReadOnly));
diff --git a/debian/patches/series b/debian/patches/series
index 4101251..fb0067b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 endianness.diff
+remove_builddir.diff

-- 
qbs packaging