[SCM] KDE PIM module packaging branch, master, updated. debian/4.10.5-1

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdepim.git;a=commitdiff;h=50feba7

The following commit has been merged in the master branch:
commit 50feba7a50832f4694adfc465570eb80cec73445
Author: Modestas Vainius <modax at debian.org>
Date:   Sun Jun 10 18:13:42 2012 +0300

    Drop upstream_in-c4_String-c4_String-only-call-memset-if-the-numbe.patch
    
    Merged upstream.
---
 debian/changelog                                   |    2 ++
 debian/patches/series                              |    1 -
 ...g-c4_String-only-call-memset-if-the-numbe.patch |   31 --------------------
 3 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 582aa69..8b0219b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,6 +45,8 @@ kdepim (4:4.8.4-0r0) UNRELEASED; urgency=low
     merged upstream.
   * Drop upstream_Build-with-clang.patch, merged upstream.
   * Drop upstream_Fix-crash-in-Folder-destructor.patch, merged upstream.
+  * Drop upstream_in-c4_String-c4_String-only-call-memset-if-the-numbe.patch,
+    merged upstream.
 
   [ José Manuel Santamaría Lema ]
   * Bump kde-sc-dev-latest build dependency to 4:4.8.4.
diff --git a/debian/patches/series b/debian/patches/series
index c3616a4..4235252 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 debianize_akregator_default.diff
-upstream_in-c4_String-c4_String-only-call-memset-if-the-numbe.patch
diff --git a/debian/patches/upstream_in-c4_String-c4_String-only-call-memset-if-the-numbe.patch b/debian/patches/upstream_in-c4_String-c4_String-only-call-memset-if-the-numbe.patch
deleted file mode 100644
index f3d9206..0000000
--- a/debian/patches/upstream_in-c4_String-c4_String-only-call-memset-if-the-numbe.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 645cefecafc3b40f4cb91675703335bfdc8f8b91 Mon Sep 17 00:00:00 2001
-From: Allen Winter <winter at kde.org>
-Date: Sat, 7 Jan 2012 13:54:24 -0500
-Subject: [PATCH] in c4_String::c4_String(), only call memset() if the number
- of bytes to set is greater than 0.
-
-BUG: 290688
-MERGE: 4.8
-(cherry picked from commit cd7e237dde2d0a81a49d6f5e73636870ff3f7fb1)
----
- .../plugins/mk4storage/metakit/src/string.cpp      |   26 +++++++++++---------
- 1 file changed, 14 insertions(+), 12 deletions(-)
-
-diff --git a/akregator/plugins/mk4storage/metakit/src/string.cpp b/akregator/plugins/mk4storage/metakit/src/string.cpp
-index 81adb33..f727335 100644
---- a/akregator/plugins/mk4storage/metakit/src/string.cpp
-+++ b/akregator/plugins/mk4storage/metakit/src/string.cpp
-@@ -120,7 +120,9 @@ c4_String::c4_String(char ch, int n /* =1 */) {
-   _value = new unsigned char[n + 3];
- 
-   _value[0] = 1; // see Init() member
--  memset(_value + 2, ch, n);
-+  if ( n > 0 ) {
-+    memset(_value + 2, ch, n);
-+  }
-   _value[1] = (unsigned char)(n <= 255 ? n : 255);
-   _value[n + 2] = 0;
- }
--- 
-1.7.10
-

-- 
KDE PIM module packaging