[SCM] KDE PIM Libraries module packaging branch, kde4.8, updated. debian/4.7.4-3-23-g07dbb7f

[Modestas Vainius]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdepimlibs.git;a=commitdiff;h=07dbb7f

The following commit has been merged in the kde4.8 branch:
commit 07dbb7f042bc91962cd9b53bd298c08ae5f11ea2
Author: Modestas Vainius <modax at debian.org>
Date:   Sun May 13 02:06:18 2012 +0300

    Drop upstream_Disambiguations-necessary-for-building-with-clang.patch
    
    It was backported from upstream.
---
 debian/changelog                                   |    4 ++
 debian/patches/series                              |    1 -
 ...uations-necessary-for-building-with-clang.patch |   39 --------------------
 3 files changed, 4 insertions(+), 40 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 77e09d7..6ac2ded 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,10 @@ kdepimlibs (4:4.8.2-0r0) UNRELEASED; urgency=low
   * Update symbols files.
   * Add symbols files for libakonadi-notes4 and libkalarmcal2.
 
+  [ Modestas Vainius ]
+  * Drop upstream_Disambiguations-necessary-for-building-with-clang.patch, was
+    backported from upstream.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 08 Mar 2012 21:16:23 +0100
 
 kdepimlibs (4:4.7.4-3) unstable; urgency=low
diff --git a/debian/patches/series b/debian/patches/series
index 707f5f4..333e353 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 03_hide_akonadi_progressbar.diff
-upstream_Disambiguations-necessary-for-building-with-clang.patch
diff --git a/debian/patches/upstream_Disambiguations-necessary-for-building-with-clang.patch b/debian/patches/upstream_Disambiguations-necessary-for-building-with-clang.patch
deleted file mode 100644
index 3de980f..0000000
--- a/debian/patches/upstream_Disambiguations-necessary-for-building-with-clang.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From b886894bd1afc515947c24883169d0a5107a86d5 Mon Sep 17 00:00:00 2001
-From: Till Adam <till at kdab.com>
-Date: Fri, 9 Sep 2011 20:29:39 +0200
-Subject: [PATCH] Disambiguations necessary for building with clang.
-
----
- kcal/listbase.h         |    2 +-
- kmime/kautodeletehash.h |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/kcal/listbase.h b/kcal/listbase.h
-index c246cc0..80acc23 100644
---- a/kcal/listbase.h
-+++ b/kcal/listbase.h
-@@ -115,7 +115,7 @@ class ListBase : public QList<T *>
-     */
-     bool removeRef( T *t )
-     {
--      if ( !contains( t ) ) {
-+      if ( !this->contains( t ) ) {
-         return false;
-       } else {
-         if ( mAutoDelete ) {
-diff --git a/kmime/kautodeletehash.h b/kmime/kautodeletehash.h
-index 2e24c3a..67cb1dd 100644
---- a/kmime/kautodeletehash.h
-+++ b/kmime/kautodeletehash.h
-@@ -64,7 +64,7 @@ public:
-    */
-   ~KAutoDeleteHash() { while ( ! QHash<Key, T *>::isEmpty() ) {
-                          T *value = *QHash<Key, T *>::begin();
--                         erase( QHash<Key, T *>::begin() );
-+                         this->erase( QHash<Key, T *>::begin() );
-                          delete value;
-                        }
-                      }
--- 
-1.7.10
-

-- 
KDE PIM Libraries module packaging