[Pkg-utopia-commits] r3004 - in /packages/lenny/consolekit/debian/patches: 08-fix-double-close.patch 11-unref-dbus-proxy.patch

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sun Mar 29 19:21:00 2009
New Revision: 3004

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3004
Log:
refresh patches to apply cleanly

Modified:
    packages/lenny/consolekit/debian/patches/08-fix-double-close.patch
    packages/lenny/consolekit/debian/patches/11-unref-dbus-proxy.patch

Modified: packages/lenny/consolekit/debian/patches/08-fix-double-close.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/lenny/consolekit/debian/patches/08-fix-double-close.patch?rev=3004&op=diff
==============================================================================
--- packages/lenny/consolekit/debian/patches/08-fix-double-close.patch (original)
+++ packages/lenny/consolekit/debian/patches/08-fix-double-close.patch Sun Mar 29 19:21:00 2009
@@ -2,9 +2,11 @@
 # Ubuntu: https://bugs.launchpad.net/bugs/263245
 # Upstream: https://bugs.freedesktop.org/show_bug.cgi?id=17866
 # Upstream: http://gitweb.freedesktop.org/?p=ConsoleKit.git;a=commitdiff;h=a58a4bff451dcf8a6019aed1b2fb276e9836b0f4
---- a/src/ck-event-logger.c
-+++ b/src/ck-event-logger.c
-@@ -180,8 +180,10 @@ retry:
+Index: consolekit-0.2.10/src/ck-event-logger.c
+===================================================================
+--- consolekit-0.2.10.orig/src/ck-event-logger.c	2008-02-26 00:58:03.000000000 +0100
++++ consolekit-0.2.10/src/ck-event-logger.c	2009-03-29 21:20:17.000000000 +0200
+@@ -180,8 +180,10 @@
  static void
  reopen_file_stream (CkEventLogger *event_logger)
  {
@@ -17,7 +19,7 @@
  
          /* FIXME: retries */
          open_log_file (event_logger);
-@@ -420,8 +422,8 @@ ck_event_logger_finalize (GObject *objec
+@@ -398,8 +400,8 @@
                  g_async_queue_unref (event_logger->priv->event_queue);
          }
  
@@ -28,4 +30,3 @@
          }
  
          g_free (event_logger->priv->log_filename);
-

Modified: packages/lenny/consolekit/debian/patches/11-unref-dbus-proxy.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/lenny/consolekit/debian/patches/11-unref-dbus-proxy.patch?rev=3004&op=diff
==============================================================================
--- packages/lenny/consolekit/debian/patches/11-unref-dbus-proxy.patch (original)
+++ packages/lenny/consolekit/debian/patches/11-unref-dbus-proxy.patch Sun Mar 29 19:21:00 2009
@@ -1,11 +1,11 @@
 # Unref the dbus proxy when finalizing the session object, so that they are not leaked
 # Ubuntu: https://launchpad.net/bugs/284229
 # Upstream: https://bugs.freedesktop.org/show_bug.cgi?id=18330
-Index: consolekit-0.3/src/ck-session.c
+Index: consolekit-0.2.10/src/ck-session.c
 ===================================================================
---- consolekit-0.3.orig/src/ck-session.c	2008-11-23 16:51:26.000000000 +0000
-+++ consolekit-0.3/src/ck-session.c	2008-11-23 16:51:41.000000000 +0000
-@@ -1100,6 +1100,8 @@
+--- consolekit-0.2.10.orig/src/ck-session.c	2008-02-12 21:28:57.000000000 +0100
++++ consolekit-0.2.10/src/ck-session.c	2009-03-29 21:20:26.000000000 +0200
+@@ -1058,6 +1058,8 @@
  
          session_remove_activity_watch (session);