[SCM] qttools packaging branch, experimental, updated. debian/5.6.1-2-8-g2a2c6c7

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit ba5994d17f915880e4ebc5fd243941be8c65b45e
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Jul 8 13:26:50 2016 +0300

    Drop lrelease-zlib.patch.
    
    We do not link with libQt5Bootstrap.a, and the build succeeds without it.
---
 debian/changelog                   |  2 ++
 debian/patches/lrelease-zlib.patch | 15 ---------------
 debian/patches/series              |  1 -
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4c5f56f..abf9daa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ qttools-opensource-src (5.7.0-1) UNRELEASED; urgency=medium
   * Bump Qt build-dependencies to 5.7.0.
   * Install upstream manpages for lrelease and lupdate.
   * Update debian/copyright.
+  * Drop lrelease-zlib.patch. We do not link with libQt5Bootstrap.a, and the
+    build succeeds without it.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 08 Jul 2016 11:27:42 +0300
 
diff --git a/debian/patches/lrelease-zlib.patch b/debian/patches/lrelease-zlib.patch
deleted file mode 100644
index 4cfabdd..0000000
--- a/debian/patches/lrelease-zlib.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-# Originally from:
-# https://build.pub.meego.com/package/files?package=qttools&project=home%3Abostik%3AQt5a1
-# Added -Wl,--no-as-needed for Debian/Ubuntu
-diff --git a/src/linguist/lrelease/lrelease.pro b/src/linguist/lrelease/lrelease.pro
-index 792bc99..413e322 100644
---- a/src/linguist/lrelease/lrelease.pro
-+++ b/src/linguist/lrelease/lrelease.pro
-@@ -12,3 +12,7 @@ qmake.value = $$shell_path($$QMAKE_QMAKE)
- QT_TOOL_ENV += qmake
- 
- load(qt_tool)
-+
-+# When linking with libQt5Boostrap.a we need zlib too
-+LIBS += -Wl,--no-as-needed
-+LIBS += -lz
diff --git a/debian/patches/series b/debian/patches/series
index c853ff8..8ae9e74 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-lrelease-zlib.patch
 hurd-path_max.diff

-- 
qttools packaging