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

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit f7c2c192b51731961f2655007f2fd3793fed5c96
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Dec 20 17:34:01 2016 +0300

    Revert upstream SONAME break without actual ABI break (for Stretch).
---
 debian/changelog                         |  1 +
 debian/patches/revert_soname_change.diff | 21 +++++++++++++++++++++
 debian/patches/series                    |  1 +
 3 files changed, 23 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7c62ceb..a8169dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qbs (1.7.0+dfsg-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Refresh and rebase the patches for the new release.
   * Add three new files to debian/qbs-common.install.
+  * Revert upstream SONAME break without actual ABI break (for Stretch).
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Tue, 20 Dec 2016 15:33:48 +0300
 
diff --git a/debian/patches/revert_soname_change.diff b/debian/patches/revert_soname_change.diff
new file mode 100644
index 0000000..c2a92e2
--- /dev/null
+++ b/debian/patches/revert_soname_change.diff
@@ -0,0 +1,21 @@
+Description: revert upstream change to SONAME for Stretch
+ There is no ABI break in 1.7, so changing it is not needed.
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: not-needed
+Last-Update: 2016-12-20
+
+--- a/src/lib/library.pri
++++ b/src/lib/library.pri
+@@ -26,12 +26,6 @@
+ include(../../qbs_version.pri)
+ VERSION = $${QBS_VERSION}
+ 
+-linux {
+-    # 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}
+-}
+-
+ win32 {
+     dlltarget.path = $${QBS_INSTALL_PREFIX}/bin
+     INSTALLS += dlltarget
diff --git a/debian/patches/series b/debian/patches/series
index a0e8336..7ced878 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ remove_rpaths.diff
 disable_tests_qtscript.diff
 skip_test_concurrent.diff
 fix_ftbfs_gcc6.diff
+revert_soname_change.diff

-- 
qbs packaging