[SCM] kgpg packaging branch, master, updated. debian/4.10.5-1

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kgpg.git;a=commitdiff;h=94898b5

The following commit has been merged in the master branch:
commit 94898b5313dd6f580890f091876745f6a705756d
Author: Sune Vuorela <sune at vuorela.dk>
Date:   Sun Apr 7 23:55:21 2013 +0000

    Remove patches taken from upstream.
---
 debian/changelog                                   |    1 +
 debian/patches/series                              |    2 -
 ...x-NULL-deref-when-new-setting-default-key.patch |   35 ----------------
 ...fix-key-comparison-returning-wrong-values.patch |   43 --------------------
 4 files changed, 1 insertion(+), 80 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1a55896..538d544 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ kgpg (4:4.10.2-1) UNRELEASED; urgency=low
   * New upstream release.
   * Bump build-deps.
   * Update uploaders.
+  * Remove patches taken from upstream.
 
  -- Sune Vuorela <sune at debian.org>  Sun, 07 Apr 2013 23:51:41 +0000
 
diff --git a/debian/patches/series b/debian/patches/series
index 33f57e8..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +0,0 @@
-upstream_fix-NULL-deref-when-new-setting-default-key.patch
-upstream_fix-key-comparison-returning-wrong-values.patch
diff --git a/debian/patches/upstream_fix-NULL-deref-when-new-setting-default-key.patch b/debian/patches/upstream_fix-NULL-deref-when-new-setting-default-key.patch
deleted file mode 100644
index 2c869c6..0000000
--- a/debian/patches/upstream_fix-NULL-deref-when-new-setting-default-key.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From a3b0cb755ff08721a3b9e2c25d4aaf655fb40804 Mon Sep 17 00:00:00 2001
-From: Rolf Eike Beer <kde at opensource.sf-tec.de>
-Date: Wed, 6 Jun 2012 17:40:32 +0200
-Subject: [PATCH] fix NULL-deref when new setting default key
-
-Thanks to John Tapsell for spotting the line I have been looking at for weeks without seeing the bug.
-
-CCBUG:298465
-CCMAIL:johnflux at gmail.com
----
- model/kgpgitemmodel.cpp |    8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/model/kgpgitemmodel.cpp b/model/kgpgitemmodel.cpp
-index 92207c6..d369346 100644
---- a/model/kgpgitemmodel.cpp
-+++ b/model/kgpgitemmodel.cpp
-@@ -343,8 +343,12 @@ KGpgItemModel::setDefaultKey(KGpgKeyNode *def)
- 		emit dataChanged(createIndex(odefrow, 0, nd), createIndex(odefrow, lastcol, nd));
- 	}
- 
--	m_default = def->getId();
--	emit dataChanged(createIndex(defrow, 0, def), createIndex(defrow, lastcol, def));
-+	if (def) {
-+		m_default = def->getId();
-+		emit dataChanged(createIndex(defrow, 0, def), createIndex(defrow, lastcol, def));
-+	} else {
-+		m_default.clear();
-+	}
- }
- 
- QModelIndex
--- 
-1.7.10
-
diff --git a/debian/patches/upstream_fix-key-comparison-returning-wrong-values.patch b/debian/patches/upstream_fix-key-comparison-returning-wrong-values.patch
deleted file mode 100644
index 0e1bd83..0000000
--- a/debian/patches/upstream_fix-key-comparison-returning-wrong-values.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 2d252cf08c51866a6acebe705db11b29941691bf Mon Sep 17 00:00:00 2001
-From: Rolf Eike Beer <kde at opensource.sf-tec.de>
-Date: Mon, 11 Jun 2012 19:29:12 +0200
-Subject: [PATCH] fix key comparison returning wrong values
-
-This fixes a regression introduced in 4.8.2 with commit
-2a100ae8d203107d17e438f67f65d26a4949cccc when trying to fix bug 292405.
-
-BUGS:298465,301618
-CCBUG:292405
----
- core/KGpgKeyNode.cpp |   12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/core/KGpgKeyNode.cpp b/core/KGpgKeyNode.cpp
-index 78a12c5..ea04698 100644
---- a/core/KGpgKeyNode.cpp
-+++ b/core/KGpgKeyNode.cpp
-@@ -334,14 +334,16 @@ bool
- KGpgKeyNode::compareId(const QString &other) const
- {
- 	if (other.length() == m_key->fullId().length())
--		return other.compare(m_key->fullId(), Qt::CaseInsensitive);
-+		return (other.compare(m_key->fullId(), Qt::CaseInsensitive) == 0);
- 
- 	if (other.length() == m_key->fingerprint().length())
--		return other.compare(m_key->fingerprint(), Qt::CaseInsensitive);
-+		return (other.compare(m_key->fingerprint(), Qt::CaseInsensitive) == 0);
- 
--	return other.right(m_key->fullId().length()).compare(
--			m_key->fullId().right(other.length()),
--			Qt::CaseInsensitive);
-+	const QString comId = m_key->fullId().isEmpty() ? m_key->fingerprint() : m_key->fullId();
-+
-+	return (other.right(comId.length()).compare(
-+			comId.right(other.length()),
-+			Qt::CaseInsensitive) == 0);
- }
- 
- void
--- 
-1.7.10
-

-- 
kgpg packaging