[SCM] kgpg packaging branch, master, updated. debian/16.08.3-1-11-gbe2a6c1

Jonathan Riddell jriddell-guest at moszumanska.debian.org
Wed Apr 12 13:29:34 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kgpg.git;a=commitdiff;h=166e797

The following commit has been merged in the master branch:
commit 166e7970e3af55e78063061ef34b2b8690112838
Author: Raymond Wooninck <tittiatcoke at gmail.com>
Date:   Sun Oct 9 15:13:07 2016 +0200

    Update to the KF5 version
---
 debian/control                                     | 25 ++++++++++++++---
 debian/patches/series                              |  1 -
 ...e-QStringList-instead-of-fwd-declarations.patch | 32 ----------------------
 3 files changed, 21 insertions(+), 37 deletions(-)

diff --git a/debian/control b/debian/control
index dac4cb5..2adc192 100644
--- a/debian/control
+++ b/debian/control
@@ -10,12 +10,29 @@ Uploaders: Fathi Boudra <fabo at debian.org>,
            Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake (>= 2.8.9~),
                debhelper (>= 9),
-               kde-sc-dev-latest (>= 4:4.12),
-               kdelibs5-dev,
-               kdepimlibs5-dev,
+               extra-cmake-modules (>= 5.21.0~),
+               kio-dev (>= 5.23.0),
                libboost-dev,
                libgpgme11-dev,
-               pkg-kde-tools (>= 0.12)
+               libkf5akonadicontact-dev (>= 5.23.0),
+               libkf5archive-dev (>= 5.23.0),
+               libkf5codecs-dev (>= 5.23.0),
+               libkf5contacts-dev (>= 5.23.0),
+               libkf5coreaddons-dev (>= 5.23.0),
+               libkf5crash-dev (>= 5.23.0),
+               libkf5dbusaddons-dev (>= 5.23.0),
+               libkf5doctools-dev (>= 5.23.0),
+               libkf5i18n-dev (>= 5.23.0),
+               libkf5iconthemes-dev (>= 5.23.0),
+               libkf5jobwidgets-dev (>= 5.23.0),
+               libkf5notifications-dev (>= 5.23.0),
+               libkf5service-dev (>= 5.23.0),
+               libkf5textwidgets-dev (>= 5.23.0),
+               libkf5widgetsaddons-dev (>= 5.23.0),
+               libkf5windowsystem-dev (>= 5.23.0),
+               libkf5xmlgui-dev (>= 5.23.0),
+               pkg-kde-tools (>= 0.12),
+               qtbase5-dev (>= 5.4)
 Standards-Version: 3.9.8
 Homepage: http://www.kde.org/
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/kgpg.git
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index d347207..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-upstream_include-QStringList-instead-of-fwd-declarations.patch
diff --git a/debian/patches/upstream_include-QStringList-instead-of-fwd-declarations.patch b/debian/patches/upstream_include-QStringList-instead-of-fwd-declarations.patch
deleted file mode 100644
index 6040b83..0000000
--- a/debian/patches/upstream_include-QStringList-instead-of-fwd-declarations.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 3349d8a48ad1b957859a16643c912c4febec73b0 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino at kde.org>
-Date: Sat, 4 Jun 2016 08:56:46 +0200
-Subject: [PATCH] include <QStringList> instead of fwd declarations
-
-slotAddKey needs the full QStringList definition, a forward declaration
-is not enough
----
- model/kgpgsearchresultmodel.h | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/model/kgpgsearchresultmodel.h b/model/kgpgsearchresultmodel.h
-index d754b12..c1d327e 100644
---- a/model/kgpgsearchresultmodel.h
-+++ b/model/kgpgsearchresultmodel.h
-@@ -20,12 +20,10 @@
- #define KGPGSEARCHRESULTMODEL_H
- 
- #include <QAbstractItemModel>
-+#include <QStringList>
- 
- #include <kgpgcompiler.h>
- 
--class QString;
--class QStringList;
--
- class KGpgSearchResultModelPrivate;
- 
- /**
--- 
-2.8.1
-

-- 
kgpg packaging



More information about the pkg-kde-commits mailing list