[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=f0f670f

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

    Drop upstream_Build-with-clang.patch, merged upstream.
---
 debian/changelog                               |    1 +
 debian/patches/series                          |    1 -
 debian/patches/upstream_Build-with-clang.patch |   25 ------------------------
 3 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 39d5f6f..8a81741 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,6 +43,7 @@ kdepim (4:4.8.4-0r0) UNRELEASED; urgency=low
   * Drop debian_set_library_version.diff patch, not needed anymore.
   * Drop upstream_Bug-271580-Fix-crash-displaying-New-Alarm-dialog-fro.patch,
     merged upstream.
+  * Drop upstream_Build-with-clang.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 956c5bf..59cc76c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 debianize_akregator_default.diff
-upstream_Build-with-clang.patch
 upstream_Fix-crash-in-Folder-destructor.patch
 upstream_in-c4_String-c4_String-only-call-memset-if-the-numbe.patch
diff --git a/debian/patches/upstream_Build-with-clang.patch b/debian/patches/upstream_Build-with-clang.patch
deleted file mode 100644
index 9c80502..0000000
--- a/debian/patches/upstream_Build-with-clang.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4aa4059b40aed27ae76201baa48f419d1ba09576 Mon Sep 17 00:00:00 2001
-From: Till Adam <till at kdab.com>
-Date: Tue, 6 Sep 2011 09:35:06 +0200
-Subject: [PATCH] Build with clang.
-
----
- libkleo/backends/qgpgme/threadedjobmixin.h |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libkleo/backends/qgpgme/threadedjobmixin.h b/libkleo/backends/qgpgme/threadedjobmixin.h
-index 6d915e7..a1f85cc 100644
---- a/libkleo/backends/qgpgme/threadedjobmixin.h
-+++ b/libkleo/backends/qgpgme/threadedjobmixin.h
-@@ -143,7 +143,7 @@ namespace _detail {
- 
-     void lateInitialization() {
-       assert( m_ctx );
--      connect( &m_thread, SIGNAL(finished()), this, SLOT(slotFinished()) );
-+      QObject::connect( &m_thread, SIGNAL(finished()), this, SLOT(slotFinished()) );
-       m_ctx->setProgressProvider( this );
-     }
- 
--- 
-1.7.10
-

-- 
KDE PIM module packaging