[SCM] qbs packaging branch, master, updated. debian/1.4.5+dfsg-2-3-g5d7e5c6

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 5d7e5c62f2a385b7187c88890ceca1f7cf8ba221
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu May 12 20:03:30 2016 +0300

    Update to 1.5.0 release.
---
 debian/changelog                            | 4 +++-
 debian/patches/skip_test_concurrent.diff    | 2 +-
 debian/patches/skip_test_homedirectory.diff | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 92d6545..f482d15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
-qbs (1.4.5+dfsg-3) UNRELEASED; urgency=medium
+qbs (1.5.0+dfsg-1) UNRELEASED; urgency=medium
 
+  * New upstream release.
   * Set LC_ALL=C.UTF-8 when running tests, as according to upstream the
     testsuite assumes English locale.
+  * Refresh patches against the new release.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Thu, 07 Apr 2016 23:31:37 +0200
 
diff --git a/debian/patches/skip_test_concurrent.diff b/debian/patches/skip_test_concurrent.diff
index ebd8771..327b2fd 100644
--- a/debian/patches/skip_test_concurrent.diff
+++ b/debian/patches/skip_test_concurrent.diff
@@ -5,7 +5,7 @@ Last-Update: 2016-03-20
 
 --- a/tests/auto/blackbox/tst_blackbox.cpp
 +++ b/tests/auto/blackbox/tst_blackbox.cpp
-@@ -656,6 +656,7 @@
+@@ -1124,6 +1124,7 @@
  
  void TestBlackbox::concurrentExecutor()
  {
diff --git a/debian/patches/skip_test_homedirectory.diff b/debian/patches/skip_test_homedirectory.diff
index 747bd04..4b5bd09 100644
--- a/debian/patches/skip_test_homedirectory.diff
+++ b/debian/patches/skip_test_homedirectory.diff
@@ -5,7 +5,7 @@ Last-Update: 2015-07-18
 
 --- a/src/lib/corelib/language/tst_language.cpp
 +++ b/src/lib/corelib/language/tst_language.cpp
-@@ -739,6 +739,7 @@
+@@ -768,6 +768,7 @@
  
  void TestLanguage::homeDirectory()
  {

-- 
qbs packaging