[SCM] Polkit KDE 1 packaging branch, master, updated. debian/0.99.0-3-7-g3030649

[Felix Geyer]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-req/polkit-kde-1.git;a=commitdiff;h=3030649

The following commit has been merged in the master branch:
commit 30306495146a0ad8358da9cb3a1ca5f10ded8f85
Author: Felix Geyer <fgeyer at debian.org>
Date:   Mon Jul 22 19:39:45 2013 +0200

    Drop fix_dialog_focus.diff, applied upstream.
---
 debian/changelog                     |    1 +
 debian/patches/fix_dialog_focus.diff |   24 ------------------------
 debian/patches/series                |    1 -
 3 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2837e53..1459810 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ polkit-kde-1 (0.99.1-1) UNRELEASED; urgency=low
 
   [ Felix Geyer ]
   * New upstream release.
+    - Drop fix_dialog_focus.diff, applied upstream.
   * Remove obsolete /etc/xdg/autostart/polkit-kde-authentication-agent-1.desktop
     on upgrade. (Closes: #645440)
   * Bump Standards-Version to 3.9.4, no changes needed.
diff --git a/debian/patches/fix_dialog_focus.diff b/debian/patches/fix_dialog_focus.diff
deleted file mode 100644
index b6c5a62..0000000
--- a/debian/patches/fix_dialog_focus.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-Patch from Kubuntu
-Committed upstream in 0701f84a57156f8f584bb4fe928811a26ceefcf0
-Prevents the auth dialog from popping up in the background where it can't be
-seen
-Index: polkit-kde-agent-1-0.99.0/policykitlistener.cpp
-===================================================================
---- polkit-kde-agent-1-0.99.0.orig/policykitlistener.cpp	2011-01-19 10:24:09.413897000 -0500
-+++ polkit-kde-agent-1-0.99.0/policykitlistener.cpp	2011-01-19 10:24:36.577897000 -0500
-@@ -22,6 +22,7 @@
- #include "AuthDialog.h"
- 
- #include <KDebug>
-+#include <KWindowSystem>
- 
- #include <PolkitQt1/Agent/Listener>
- #include <PolkitQt1/Agent/Session>
-@@ -100,6 +101,7 @@
-     kDebug() << "WinId of the dialog is " << m_dialog.data()->winId() << m_dialog.data()->effectiveWinId();
-     m_dialog.data()->setOptions();
-     m_dialog.data()->show();
-+    KWindowSystem::forceActiveWindow(m_dialog.data()->winId());
-     kDebug() << "WinId of the shown dialog is " << m_dialog.data()->winId() << m_dialog.data()->effectiveWinId();
- 
-     m_numTries = 0;
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 12bcb6a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix_dialog_focus.diff

-- 
Polkit KDE 1 packaging