[SCM] qbs packaging branch, master, updated. debian/1.7.0+dfsg-1-6-g0552f51

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 0552f51558a1864ea6ee6ee8d236ff6f336179d9
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Jan 4 21:04:50 2017 +0300

    Use the same SONAME scheme on kfreebsd as on Linux.
---
 debian/changelog                    |  1 +
 debian/patches/kfreebsd_soname.diff | 16 ++++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 18 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c50891a..d508b37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qbs (1.7.0+dfsg-2) UNRELEASED; urgency=medium
   * Update debian/copyright.
   * Fix race condition which breaks parallel builds (fix_race_condition.diff).
   * Do not install the libqbscore.so.1 symlink (closes: #850035).
+  * Use the same SONAME scheme on kfreebsd as on Linux (kfreebsd_soname.diff).
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Fri, 23 Dec 2016 12:49:42 +0300
 
diff --git a/debian/patches/kfreebsd_soname.diff b/debian/patches/kfreebsd_soname.diff
new file mode 100644
index 0000000..bad6d12
--- /dev/null
+++ b/debian/patches/kfreebsd_soname.diff
@@ -0,0 +1,16 @@
+Description: use the same SONAME scheme on kfreebsd as on Linux
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: not-yet
+Last-Update: 2017-01-04
+
+--- a/src/lib/library.pri
++++ b/src/lib/library.pri
+@@ -26,7 +26,7 @@
+ include(../../qbs_version.pri)
+ VERSION = $${QBS_VERSION}
+ 
+-linux {
++!win32 {
+     # Turn off absurd qmake's soname "logic" and directly add the linker flag.
+     QMAKE_LFLAGS_SONAME =
+     QMAKE_LFLAGS = -Wl,-soname=lib$${TARGET}.so.$${QBS_VERSION_MAJ}.$${QBS_VERSION_MIN}
diff --git a/debian/patches/series b/debian/patches/series
index b980c0e..6ccd4ff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ disable_tests_qtscript.diff
 skip_test_concurrent.diff
 fix_ftbfs_gcc6.diff
 fix_race_condition.diff
+kfreebsd_soname.diff

-- 
qbs packaging