[SCM] qbs packaging branch, experimental, updated. debian/1.4.1+dfsg-2-2-g62ee0cc

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 62ee0cca4cb3123183aadaad1173a832f57c1be8
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Jul 9 14:57:40 2015 +0300

    Backport upstream fix for assembly test.
---
 debian/changelog                      |  3 +++
 debian/patches/fix_assembly_test.diff | 20 ++++++++++++++++++++
 debian/patches/series                 |  1 +
 3 files changed, 24 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 40bdc28..a7cfa00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qbs (1.4.1+dfsg-3) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Backport upstream change to run testAssembly only on architectures
+    where it is supported (fix_assembly_test.diff).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 09 Jul 2015 14:45:25 +0300
 
diff --git a/debian/patches/fix_assembly_test.diff b/debian/patches/fix_assembly_test.diff
new file mode 100644
index 0000000..181b344
--- /dev/null
+++ b/debian/patches/fix_assembly_test.diff
@@ -0,0 +1,20 @@
+Description: fix testAssembly blackbox test on all non-Intel architectures
+Origin: upstream, http://code.qt.io/cgit/qt-labs/qbs.git/commit/?id=ee02724725c27e81
+Last-Update: 2015-07-09
+
+--- a/tests/auto/blackbox/testdata/assembly/assembly.qbs
++++ b/tests/auto/blackbox/testdata/assembly/assembly.qbs
+@@ -20,8 +20,11 @@
+         condition: qbs.toolchain.contains("gcc")
+     }
+     StaticLibrary {
+-        name : "testd"
+-        files : [ "testd_" + qbs.architecture + ".asm" ]
++        name: "testd"
++        Group {
++            condition: product.condition
++            files: ["testd_" + qbs.architecture + ".asm"]
++        }
+         Depends { name: "cpp" }
+         condition: qbs.toolchain.contains("msvc")
+                    && (qbs.architecture === "x86" || qbs.architecture === "x86_64")
diff --git a/debian/patches/series b/debian/patches/series
index 54254b7..7a5219e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 skip_test.diff
 remove_rpaths.diff
 revert_tests_speedup.diff
+fix_assembly_test.diff

-- 
qbs packaging