[SCM] Polkit Qt 1 packaging branch, experimental, updated. debian/0.95.1-1-63-g70a4b59

[Maximiliano Curia]

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

The following commit has been merged in the experimental branch:
commit e4084a827cb817c633e282b6302518f18c71477e
Author: Fathi Boudra <fabo at debian.org>
Date:   Sat Dec 31 14:06:48 2011 +0200

    Drop fix_exit_crash.diff, shipped in 0.103.0 release.
---
 debian/changelog                   |   4 +-
 debian/patches/fix_exit_crash.diff | 103 -------------------------------------
 debian/patches/series              |   1 -
 3 files changed, 1 insertion(+), 107 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 791d31c..e097a3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,12 @@
 polkit-qt-1 (0.103.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
+    - fix annoying crash on shutdown. (Closes: #651815)
 
   [ Felix Geyer ]
   * Modify CFLAGS/CXXFLAGS after including debian-qt-kde.mk so the changes are
     not overwritten.
 
-  [ Scott Kitterman ]
-  * Add fix_exit_crash.diff from upstream (Closes: #651815)
-
   [ Fathi Boudra ]
   * Update debian/compat: bump to 8.
 
diff --git a/debian/patches/fix_exit_crash.diff b/debian/patches/fix_exit_crash.diff
deleted file mode 100644
index 082be35..0000000
--- a/debian/patches/fix_exit_crash.diff
+++ /dev/null
@@ -1,103 +0,0 @@
-commit d3c337da01f3887da031fdb5c2ac784fb3e79210
-Author: Nick Shaforostoff <shafff at ukr.net>
-Date:   Mon Dec 12 01:03:35 2011 +0200
-
-    BUG: 258916
-    
-    use stricter refing in all places of 'identity' keeping.
-    it is interesting that it would be much harder
-    to accidentaly make same mistake if G API was C++ style and not C.
-    
-    i also moved cleanup of successful sessions in time from system shutdown
-    to session completion as polkit docs say it should be
-
-Index: polkit-qt-1-0.99.0/agent/polkitqt1-agent-session.cpp
-===================================================================
---- polkit-qt-1-0.99.0.orig/agent/polkitqt1-agent-session.cpp	2011-12-14 08:24:19.476208706 -0500
-+++ polkit-qt-1-0.99.0/agent/polkitqt1-agent-session.cpp	2011-12-14 08:24:59.664207519 -0500
-@@ -46,7 +46,7 @@
- 
- Session::Private::~Private()
- {
--    g_object_unref(polkitAgentSession);
-+    // polkitAgentSession is freed in Session d'tor
- }
- 
- Session::Session(const PolkitQt1::Identity &identity, const QString &cookie, AsyncResult *result, QObject *parent)
-@@ -74,6 +74,9 @@
- 
- Session::~Session()
- {
-+    if (d->polkitAgentSession)
-+        g_object_unref(d->polkitAgentSession);
-+
-     delete d;
- }
- 
-@@ -101,7 +104,11 @@
- {
-     qDebug() << "COMPLETED";
-     Session *session = (Session *)user_data;
--    Q_EMIT((Session *)user_data)->completed(gained_authorization);
-+    Q_EMIT(session)->completed(gained_authorization);
-+
-+    //free session here as polkit documentation asks
-+    g_object_unref(session->d->polkitAgentSession);
-+    session->d->polkitAgentSession = 0;
- }
- 
- void Session::Private::request(PolkitAgentSession *s, gchar *request, gboolean echo_on, gpointer user_data)
-@@ -139,7 +146,8 @@
- 
- AsyncResult::~AsyncResult()
- {
--    g_object_unref(d->result);
-+    if (d->result)
-+        g_object_unref(d->result);
- }
- 
- void AsyncResult::setCompleted()
-Index: polkit-qt-1-0.99.0/core/polkitqt1-identity.cpp
-===================================================================
---- polkit-qt-1-0.99.0.orig/core/polkitqt1-identity.cpp	2011-12-14 08:24:44.952207954 -0500
-+++ polkit-qt-1-0.99.0/core/polkitqt1-identity.cpp	2011-12-14 08:24:59.664207519 -0500
-@@ -35,11 +35,13 @@
-         : QSharedData(other)
-         , identity(other.identity)
-     {
--        g_object_ref(identity);
-+        if (identity)
-+            g_object_ref(identity);
-     }
-     ~Data()
-     {
--        g_object_unref(identity);
-+        if (identity)
-+            g_object_unref(identity);
-     }
- 
-     PolkitIdentity *identity;
-@@ -56,6 +58,8 @@
- {
-     g_type_init();
-     d->identity = polkitIdentity;
-+    if (d->identity)
-+        g_object_ref(d->identity);
- }
- 
- Identity::Identity(const PolkitQt1::Identity& other)
-@@ -86,7 +90,14 @@
- 
- void Identity::setIdentity(PolkitIdentity *identity)
- {
-+    if (d->identity == identity)
-+        return;
-+    
-+    if (d->identity)
-+        g_object_unref(d->identity);
-     d->identity = identity;
-+    if (d->identity)
-+        g_object_ref(d->identity);
- }
- 
- QString Identity::toString() const
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 99a8f8f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix_exit_crash.diff

-- 
Polkit Qt 1 packaging