2 files changed, 16 insertions, 46 deletions
diff --git a/debian/changelog b/debian/changelog
index 4c608d4..043f650 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+indicator-session (0.2.4-0ubuntu1) lucid; urgency=low
+
+  * Upstream release 0.2.4
+    * When we can't shutdown with gnome-session fallback to using
+      ConsoleKit.
+    * Detect when GPM isn't available and don't error out.
+    * Change suspend and hibernate detection property names for
+      adjustment to upower.
+
+  [Ken VanDine]
+  * debian/patches/fix-session-menu-without-gdm.patch
+    - dropped patch, merged upstream
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 25 Feb 2010 11:57:41 -0600
+
 indicator-session (0.2.3-0ubuntu2) lucid; urgency=low
 
   * debian/patches/fix-session-menu-without-gdm.patch
@@ -341,3 +356,4 @@ indicator-sus (0.1~ppa1) intrepid; urgency=low
   * Initial release
 
  -- Ted Gould <ted@ubuntu.com>  Thu, 04 Dec 2008 23:51:41 -0800
+
diff --git a/debian/patches/fix-session-menu-without-gdm.patch b/debian/patches/fix-session-menu-without-gdm.patch
deleted file mode 100644
index 7b4b197..0000000
--- a/debian/patches/fix-session-menu-without-gdm.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-=== modified file 'src/users-service-dbus.c'
---- src/users-service-dbus.c	2010-02-09 23:24:23 +0000
-+++ src/users-service-dbus.c	2010-02-19 12:22:47 +0000
-@@ -1,3 +1,4 @@
-+/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 2 -*- */
- /*
-  * Copyright 2009 Canonical Ltd.
-  *
-@@ -183,7 +184,8 @@
-   create_ck_proxy (self);
-   create_seat_proxy (self);
- 
--  users_loaded (priv->gdm_proxy, self);
-+  if (priv->gdm_proxy)
-+    users_loaded (priv->gdm_proxy, self);
- }
- 
- static void
-@@ -214,7 +216,7 @@
-     {
-       if (error != NULL)
-         {
--          g_error ("Unable to get DisplayManager proxy on system bus: %s", error->message);
-+          g_warning ("Unable to get DisplayManager proxy on system bus: %s", error->message);
-           g_error_free (error);
-         }
- 
-@@ -679,6 +681,8 @@
-   GError                  *error = NULL;
-   gint                     count;
- 
-+  g_return_if_fail (proxy != NULL);
-+
-   service = (UsersServiceDbus *)user_data;
-   priv = USERS_SERVICE_DBUS_GET_PRIVATE (service);
- 
-@@ -859,6 +863,8 @@
- start_new_user_session (UsersServiceDbus *self,
-                         UserData         *user)
- {
-+  g_return_val_if_fail (IS_USERS_SERVICE_DBUS (self), FALSE);
-+
-   UsersServiceDbusPrivate *priv = USERS_SERVICE_DBUS_GET_PRIVATE (self);
-   GError   *error = NULL;
-   char     *ssid;
-