[SCM] kgpg packaging branch, master, updated. debian/16.04.1-1-3-g1cd2c60

Maximiliano Curia maxy at moszumanska.debian.org
Sun Jun 19 09:08:34 UTC 2016


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

The following commit has been merged in the master branch:
commit 098664f6ef3b619c3bb673f3b410b4f38fa49a27
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date:   Wed Jun 15 01:50:29 2016 +0200

    Refresh patches
---
 debian/patches/series                              |  1 -
 ...e-QStringList-instead-of-fwd-declarations.patch | 32 ----------------------
 2 files changed, 33 deletions(-)

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