[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=5097e83

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

    Drop upstream_Bug-271580-Fix-crash-displaying-New-Alarm-dialog-fro.patch.
    
    Merged upstream.
---
 debian/changelog                                   |    2 +
 debian/patches/series                              |    1 -
 ...Fix-crash-displaying-New-Alarm-dialog-fro.patch |   50 --------------------
 3 files changed, 2 insertions(+), 51 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 209f8ee..39d5f6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,6 +41,8 @@ kdepim (4:4.8.4-0r0) UNRELEASED; urgency=low
   * Drop ${perl:Depends} from kdepim-groupware Depends.
   * Add ${perl:Depends} to libkpgp4 Depends.
   * Drop debian_set_library_version.diff patch, not needed anymore.
+  * Drop upstream_Bug-271580-Fix-crash-displaying-New-Alarm-dialog-fro.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 70ba408..956c5bf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 debianize_akregator_default.diff
-upstream_Bug-271580-Fix-crash-displaying-New-Alarm-dialog-fro.patch
 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_Bug-271580-Fix-crash-displaying-New-Alarm-dialog-fro.patch b/debian/patches/upstream_Bug-271580-Fix-crash-displaying-New-Alarm-dialog-fro.patch
deleted file mode 100644
index e29c9d9..0000000
--- a/debian/patches/upstream_Bug-271580-Fix-crash-displaying-New-Alarm-dialog-fro.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 4b504e760e0c994e676b55bfaca731d74841f1f4 Mon Sep 17 00:00:00 2001
-From: David Jarvie <djarvie at kde.org>
-Date: Tue, 26 Apr 2011 23:29:19 +0100
-Subject: [PATCH] Bug 271580: Fix crash displaying New Alarm dialog from
- system tray
-
-Fixes a crash on some systems when the New Alarm dialog is displayed
-from the system tray icon menu.
----
- kalarm/Changelog        |    4 +++-
- kalarm/lib/spinbox2.cpp |    9 +++++----
- 2 files changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/kalarm/lib/spinbox2.cpp b/kalarm/lib/spinbox2.cpp
-index cc10882..f1e8ab9 100644
---- a/kalarm/lib/spinbox2.cpp
-+++ b/kalarm/lib/spinbox2.cpp
-@@ -1,7 +1,7 @@
- /*
-  *  spinbox2.cpp  -  spin box with extra pair of spin buttons (for Qt 3)
-  *  Program:  kalarm
-- *  Copyright © 2001-2009 by David Jarvie <djarvie at kde.org>
-+ *  Copyright © 2001-2009,2011 by David Jarvie <djarvie at kde.org>
-  *
-  *  This program is free software; you can redistribute it and/or modify
-  *  it under the terms of the GNU General Public License as published by
-@@ -28,7 +28,7 @@
- #include <QMouseEvent>
- #include <QStyleOptionSpinBox>
- #include <QGraphicsPixmapItem>
--#include <QPaintEngine>
-+#include <QPainter>
- #include <QTimer>
- #include <QFrame>
- #include <QBrush>
-@@ -588,8 +588,9 @@ void SpinMirror::setFrame()
- 		p = grabWidget(mMainSpinbox, QRect(x, 0, 1, height()));
- 		// Blot out edit field stuff from the middle of the slice
- 		QPixmap dot = grabWidget(mMainSpinbox, QRect(x, editOffsetY, 1, 1));
--		QPaintEngine* pe = p.paintEngine();
--		pe->drawTiledPixmap(QRectF(0, editOffsetY, 1, height() - 2*editOffsetY), dot, QPointF(0, 0));
-+		QPainter painter(&p);
-+		painter.drawTiledPixmap(0, editOffsetY, 1, height() - 2*editOffsetY, dot, 0, 0);
-+		painter.end();
- 		// Horizontally fill the mirror widget with the vertical slice
- 		p = p.scaled(size());
- 		// Grab the left hand border of the main spinbox, and draw it into the mirror widget.
--- 
-1.7.10
-

-- 
KDE PIM module packaging