[SCM] qbs packaging branch, master, updated. debian/1.4.2+dfsg-1-3-g4d5bfbd

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 3829d49cabb6cc08f63be41858f302bd6085f7c7
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Aug 25 16:23:19 2015 +0300

    Disable one of erroneousFiles tests that fails on most architectues.
---
 debian/changelog                        |  3 +++
 debian/patches/disable_test_qbs863.diff | 17 +++++++++++++++++
 debian/patches/series                   |  1 +
 3 files changed, 21 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2287c70..1c1953f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qbs (1.4.2+dfsg-2) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Disable one of erroneousFiles tests that fails on most architectues
+    (disable_test_qbs863.diff).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 25 Aug 2015 16:19:29 +0300
 
diff --git a/debian/patches/disable_test_qbs863.diff b/debian/patches/disable_test_qbs863.diff
new file mode 100644
index 0000000..9b008f5
--- /dev/null
+++ b/debian/patches/disable_test_qbs863.diff
@@ -0,0 +1,17 @@
+Description: disable a test that fails on most architectures
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Bug: https://bugreports.qt.io/browse/QBS-863
+Forwarded: no
+Last-Update: 2015-08-25
+
+--- a/src/lib/corelib/language/tst_language.cpp
++++ b/src/lib/corelib/language/tst_language.cpp
+@@ -492,8 +492,6 @@
+                "but this is qbs version " QBS_VERSION ".";
+     QTest::newRow("wrongQbsVersionFormat")
+             << "The value '.*' of Project.minimumQbsVersion is not a valid version string.";
+-    QTest::newRow("properties-item-with-invalid-condition")
+-            << "TypeError: Result of expression 'cpp.nonexistingproperty'";
+     QTest::newRow("misused-inherited-property") << "Binding to non-item property";
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 7ee370e..bb7657b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ skip_test_homedirectory.diff
 remove_rpaths.diff
 disable_tests_qtscript.diff
 kfreebsd.diff
+disable_test_qbs863.diff

-- 
qbs packaging