[SCM] qbs packaging branch, master, updated. debian/1.4.1+dfsg-5-9-g6fd4a92

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 6fd4a92360ed535438eb10ff034fa37bb07b4d7d
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Jul 18 21:12:24 2015 +0300

    Skip homeDirectory test because buildds do not have home directory.
---
 debian/changelog                            |  3 +++
 debian/patches/series                       |  1 +
 debian/patches/skip_test_homedirectory.diff | 15 +++++++++++++++
 3 files changed, 19 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index dd8ff02..865a7dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qbs (1.4.1+dfsg-7) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Skip homeDirectory test because buildds do not have home directory
+    (skip_test_homedirectory.diff).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 18 Jul 2015 21:10:02 +0300
 
diff --git a/debian/patches/series b/debian/patches/series
index ad3f971..9e4ef7a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 skip_test.diff
+skip_test_homedirectory.diff
 remove_rpaths.diff
 revert_tests_speedup.diff
 fix_assembly_test.diff
diff --git a/debian/patches/skip_test_homedirectory.diff b/debian/patches/skip_test_homedirectory.diff
new file mode 100644
index 0000000..a0d263e
--- /dev/null
+++ b/debian/patches/skip_test_homedirectory.diff
@@ -0,0 +1,15 @@
+Description: skip homeDirectory test for Debian build
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: not-needed
+Last-Update: 2015-07-18
+
+--- a/src/lib/corelib/language/tst_language.cpp
++++ b/src/lib/corelib/language/tst_language.cpp
+@@ -653,6 +653,7 @@
+ 
+ void TestLanguage::homeDirectory()
+ {
++    QSKIP("buildds do not have home directory");
+     try {
+         defaultParameters.setProjectFilePath(testProject("homeDirectory.qbs"));
+         ResolvedProjectPtr project = loader->loadProject(defaultParameters);

-- 
qbs packaging