[SCM] qbs packaging branch, master, updated. debian/1.5.2+dfsg-1-4-gaee7347

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit aee7347a9b5ac358937aafba4624f35c1f90bac8
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Sep 3 14:51:59 2016 +0300

    Refresh other patches.
---
 debian/changelog                         | 1 +
 debian/patches/fix_ftbfs_gcc6.diff       | 8 +++-----
 debian/patches/remove_rpaths.diff        | 2 +-
 debian/patches/skip_test_concurrent.diff | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d936f34..a6d1e00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qbs (1.6.0+dfsg-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Set $HOME to a temporary location when running tests.
   * Drop skip_test_homedirectory.diff, no longer needed.
+  * Refresh other patches.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Sat, 03 Sep 2016 14:43:46 +0300
 
diff --git a/debian/patches/fix_ftbfs_gcc6.diff b/debian/patches/fix_ftbfs_gcc6.diff
index 678eded..1eb1243 100644
--- a/debian/patches/fix_ftbfs_gcc6.diff
+++ b/debian/patches/fix_ftbfs_gcc6.diff
@@ -6,11 +6,9 @@ Author: Adam Majer <adamm at zombino.com>
 Forwarded: not-needed
 Last-Update: 2016-07-31
 
-Index: qbs/src/lib/corelib/use_installed_corelib.pri
-===================================================================
---- qbs.orig/src/lib/corelib/use_installed_corelib.pri
-+++ qbs/src/lib/corelib/use_installed_corelib.pri
-@@ -29,7 +29,7 @@ win32 {
+--- a/src/lib/corelib/use_installed_corelib.pri
++++ b/src/lib/corelib/use_installed_corelib.pri
+@@ -27,7 +27,7 @@
      LIBS += $$QBSCORELIB
  }
  
diff --git a/debian/patches/remove_rpaths.diff b/debian/patches/remove_rpaths.diff
index 357d3d8..e192d0e 100644
--- a/debian/patches/remove_rpaths.diff
+++ b/debian/patches/remove_rpaths.diff
@@ -5,7 +5,7 @@ Last-Update: 2015-03-13
 
 --- a/src/lib/corelib/use_installed_corelib.pri
 +++ b/src/lib/corelib/use_installed_corelib.pri
-@@ -4,11 +4,9 @@
+@@ -2,11 +2,9 @@
  
  QBSLIBDIR=$${PWD}/../../lib
  unix {
diff --git a/debian/patches/skip_test_concurrent.diff b/debian/patches/skip_test_concurrent.diff
index fc3edf3..ff06922 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
-@@ -1125,6 +1125,7 @@
+@@ -1177,6 +1177,7 @@
  
  void TestBlackbox::concurrentExecutor()
  {

-- 
qbs packaging