[SCM] kchmviewer packaging branch, master, updated. e1f50b212d61d353837421ff5fbdf8b64c74d030
Lisandro Damián Nicanor Pérez
lisandro at moszumanska.debian.org
Mon Sep 21 23:27:54 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kchmviewer.git;a=commitdiff;h=b519432
The following commit has been merged in the master branch:
commit b519432343115ecef33a68c68f9600cdafd6e861
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Mon Sep 21 20:21:51 2015 -0300
Switch to the Qt5 version.
This allows us to drop Qt4's webkit and also Plasma/KDE 4.
We can add KF5 support as soon as it happens upstream.
---
debian/changelog | 2 ++
debian/control | 10 +++++-----
debian/rules | 3 ++-
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7c91c39..ec25ae3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ kchmviewer (7.3-1) UNRELEASED; urgency=medium
[ Lisandro Damián Nicanor Pérez Meyer ]
* Add myself to Uploaders.
* New upstream release.
+ - Switch to the Qt5 version in order to drop Qt4's webkit (Closes: #784476)
+ and KDE4 support. We can add KF5 support as soon as it happen upstream.
-- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Mon, 21 Sep 2015 19:47:54 -0300
diff --git a/debian/control b/debian/control
index 510ab24..aa33eec 100644
--- a/debian/control
+++ b/debian/control
@@ -5,12 +5,12 @@ Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
Uploaders: Fathi Boudra <fabo at debian.org>,
Jose Luis Tallon <jltallon at adv-solutions.net>,
Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
-Build-Depends: cmake,
- debhelper (>= 9),
- kdelibs5-dev,
+Build-Depends: debhelper (>= 9),
libchm-dev,
- libqtwebkit-dev,
- pkg-kde-tools (>= 0.6.4)
+ libqt5webkit5-dev,
+ libzip-dev,
+ pkg-kde-tools (>= 0.6.4),
+ qtbase5-dev
Standards-Version: 3.9.5
Homepage: http://www.kchmviewer.net/
Vcs-Svn: svn://anonscm.debian.org/pkg-kde/kde-extras/kchmviewer/trunk/
diff --git a/debian/rules b/debian/rules
index 1e3821d..cf8a19f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,7 @@
#export DH_VERBOSE=1
export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
+export QT_SELECT := qt5
%:
- dh $@ --parallel --with kde
+ dh $@ --parallel
--
kchmviewer packaging
More information about the pkg-kde-commits
mailing list