[SCM] KDE Development Platform Libraries module packaging branch, kde4.8, updated. debian/4.7.4-5-20-gc02e7d2

[Modestas Vainius]

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

The following commit has been merged in the kde4.8 branch:
commit c02e7d2df01aa929c5df98e6d2e0bef2cd22b94c
Author: Modestas Vainius <modax at debian.org>
Date:   Sun May 13 01:36:12 2012 +0300

    Drop upstream_Add-missing-include.patch, stolen from upstream.
---
 debian/changelog                                  |    3 ++
 debian/patches/series                             |    1 -
 debian/patches/upstream_Add-missing-include.patch |   28 ---------------------
 3 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1228180..3bc0689 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,9 @@ kde4libs (4:4.8.3-0r0) UNRELEASED; urgency=low
   [ Pino Toscano ]
   * libsolid4: suggest media-player-info on Linux archs.
 
+  [ Modestas Vainius ]
+  * Drop upstream_Add-missing-include.patch, stolen from upstream.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 08 Mar 2012 17:23:21 +0100
 
 kde4libs (4:4.7.4-5) unstable; urgency=low
diff --git a/debian/patches/series b/debian/patches/series
index 3ab1f1d..0395be1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -21,4 +21,3 @@ findpythonlibrary_layout_deb_on_debian.diff
 ktar_header_checksum_fix.diff
 ktar_longlink_length_in_bytes.diff
 glibc_filesystem.diff
-upstream_Add-missing-include.patch
diff --git a/debian/patches/upstream_Add-missing-include.patch b/debian/patches/upstream_Add-missing-include.patch
deleted file mode 100644
index 1b714dc..0000000
--- a/debian/patches/upstream_Add-missing-include.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 01b0c1a8051f372e400d213ac125311c398e4b17 Mon Sep 17 00:00:00 2001
-From: Raphael Kubo da Costa <rakuco at FreeBSD.org>
-Date: Fri, 30 Dec 2011 23:27:31 -0200
-Subject: [PATCH] Add missing include.
-
-RefPtr::release() needs PassRefPtr.h for adoptRef(). The include is also
-present in WebKit's wtf.
-
-This should fix another build failure with clang.
----
- kjs/wtf/RefPtr.h |    1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/kjs/wtf/RefPtr.h b/kjs/wtf/RefPtr.h
-index c16397e..493ab05 100644
---- a/kjs/wtf/RefPtr.h
-+++ b/kjs/wtf/RefPtr.h
-@@ -24,6 +24,7 @@
- 
- #include <algorithm>
- #include "AlwaysInline.h"
-+#include "PassRefPtr.h"
- 
- namespace WTF {
- 
--- 
-1.7.10
-

-- 
KDE Development Platform Libraries module packaging