[SCM] qttools packaging branch, master, updated. debian/5.6.1-2-2-g02eff27

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Sun Oct 16 22:04:28 UTC 2016


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

The following commit has been merged in the master branch:
commit 02eff271aec85648fd48f8284f455c9c6521dbbd
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sun Oct 16 19:03:56 2016 -0300

    Do not build with webkit support on m68k and sh4.
---
 debian/changelog | 2 ++
 debian/control   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 5db281f..f0618a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qttools-opensource-src (5.6.1-3) UNRELEASED; urgency=medium
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Do not build with webkit support on m68k and sh4 (Closes: #840693).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 16 Oct 2016 19:01:01 -0300
 
diff --git a/debian/control b/debian/control
index ba2f3d0..4605bea 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 9),
                libdouble-conversion-dev,
                libqt5opengl5-dev (>= 5.6.1+dfsg~),
                libqt5sql5-sqlite (>= 5.6.1+dfsg~),
-               libqt5webkit5-dev (>= 5.6.1+dfsg~),
+               libqt5webkit5-dev (>= 5.6.1+dfsg~) [!m68k !sh4],
                pkg-kde-tools,
                qtbase5-private-dev (>= 5.6.1+dfsg~),
                qtdeclarative5-private-dev (>= 5.6.1~),

-- 
qttools packaging



More information about the pkg-kde-commits mailing list