[SCM] qttools packaging branch, master, updated. debian/5.9.2-5-5-gd4cc8a9
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Wed Jan 17 11:31:07 UTC 2018
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qttools.git;a=commitdiff;h=d4cc8a9
The following commit has been merged in the master branch:
commit d4cc8a9557f955d5f1831a5deed254709d91ed32
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Wed Jan 17 14:30:46 2018 +0300
Enable qtwebkit support also on sh4, it is being fixed.
See #887462 for details.
---
debian/changelog | 2 +-
debian/control | 2 +-
debian/rules | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6de4401..81d5324 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
qttools-opensource-src (5.9.2-6) UNRELEASED; urgency=medium
[ Dmitry Shachnev ]
- * Update no_qwebview_archs: remove alpha, and add sparc64.
+ * Update no_qwebview_archs: remove alpha and sh4, and add sparc64.
* Bump copyright years for The Qt Company in debian/copyright.
* Regenerate the internal assistant.qch during build (closes: #885484).
diff --git a/debian/control b/debian/control
index c55eea9..fdc24d0 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Uploaders: Sune Vuorela <debian at pusling.com>,
Build-Depends: debhelper (>= 10.9.2~),
libqt5opengl5-dev (>= 5.9.2+dfsg~),
libqt5sql5-sqlite (>= 5.9.2+dfsg~),
- libqt5webkit5-dev (>= 5.9.2~) [!m68k !sh4 !sparc64],
+ libqt5webkit5-dev (>= 5.9.2~) [!m68k !sparc64],
pkg-kde-tools,
qtbase5-private-dev (>= 5.9.2+dfsg-3~),
qtdeclarative5-private-dev (>= 5.9.2~),
diff --git a/debian/rules b/debian/rules
index 941ae23..8722967 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
export QT_SELECT := qt5
# Archs that do not build depend on QtWebkit do not ship qwebview.
-no_qwebview_archs := m68k sh4 sparc64
+no_qwebview_archs := m68k sparc64
%:
dh $@ --with pkgkde_symbolshelper
--
qttools packaging
More information about the pkg-kde-commits
mailing list