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

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit cf6071b4b395094c2f5bba6028ffbd0f59bf9781
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Aug 26 16:50:53 2015 +0300

    Revert "Disable one of erroneousFiles tests that fails on most architectues."
    
    Also back to UNRELEASED state.
    
    This reverts commit 3829d49cabb6cc08f63be41858f302bd6085f7c7.
---
 debian/changelog                        |  4 +---
 debian/patches/disable_test_qbs863.diff | 17 -----------------
 debian/patches/series                   |  1 -
 3 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ecfb4a7..714da1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,5 @@
-qbs (1.4.2+dfsg-2) unstable; urgency=medium
+qbs (1.4.2+dfsg-2) UNRELEASED; urgency=medium
 
-  * Disable one of erroneousFiles tests that fails on most architectues
-    (disable_test_qbs863.diff).
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Tue, 25 Aug 2015 16:26:18 +0300
 
diff --git a/debian/patches/disable_test_qbs863.diff b/debian/patches/disable_test_qbs863.diff
deleted file mode 100644
index 9b008f5..0000000
--- a/debian/patches/disable_test_qbs863.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-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 bb7657b..7ee370e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@ skip_test_homedirectory.diff
 remove_rpaths.diff
 disable_tests_qtscript.diff
 kfreebsd.diff
-disable_test_qbs863.diff

-- 
qbs packaging