Remove patches which have been merged upstream.

  - debian/patches/01-dont_daemonize_when_activated.patch
  - debian/patches/02-dont_take_bus_name_until_ready.patch
  - debian/patches/04-dont_fail_with_invalid_seats_file.patch

5 files changed, 4 insertions, 108 deletions

diff --git a/debian/changelog b/debian/changelog
index f347667..a38f8ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ consolekit (0.4.2-1) UNRELEASED; urgency=low
     - Bump Standards-Version to 3.9.1.
     - Use architecture wildcard kfreebsd-any for the libkvm-dev Build-Depends.
     - Bump Build-Depends on libglib2.0-dev to (>= 2.14.0) for GRegex.
+  * Remove patches which have been merged upstream.
+    - debian/patches/01-dont_daemonize_when_activated.patch
+    - debian/patches/02-dont_take_bus_name_until_ready.patch
+    - debian/patches/04-dont_fail_with_invalid_seats_file.patch
 
  -- Michael Biebl <biebl@debian.org>  Mon, 20 Sep 2010 02:35:46 +0200
 
diff --git a/debian/patches/01-dont_daemonize_when_activated.patch b/debian/patches/01-dont_daemonize_when_activated.patch
deleted file mode 100644
index e1d63a8..0000000
--- a/debian/patches/01-dont_daemonize_when_activated.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From fc2870a65f6b3ed3b71bcac69c5faf3a9c759c64 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Mon, 21 Dec 2009 11:13:23 -0500
-Subject: [PATCH 1/2] Don't daemonize when activated
-
-It confuses some versions of D-Bus and isn't needed
-(or wanted it).
-
-http://bugs.freedesktop.org/show_bug.cgi?id=25642
----
- data/org.freedesktop.ConsoleKit.service.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/data/org.freedesktop.ConsoleKit.service.in b/data/org.freedesktop.ConsoleKit.service.in
-index ec2128c..d716a36 100644
---- a/data/org.freedesktop.ConsoleKit.service.in
-+++ b/data/org.freedesktop.ConsoleKit.service.in
-@@ -1,4 +1,4 @@
- [D-BUS Service]
- Name=org.freedesktop.ConsoleKit
--Exec=@sbindir@/console-kit-daemon
-+Exec=@sbindir@/console-kit-daemon --no-daemon
- User=root
--- 
-1.6.6
-
diff --git a/debian/patches/02-dont_take_bus_name_until_ready.patch b/debian/patches/02-dont_take_bus_name_until_ready.patch
deleted file mode 100644
index d071393..0000000
--- a/debian/patches/02-dont_take_bus_name_until_ready.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 2418840248f07025ad0edc96ed17e03ce5e47f3e Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Mon, 21 Dec 2009 11:14:54 -0500
-Subject: [PATCH 2/2] Don't take bus name until ready
-
-Previously, we would take a bus name right away, but
-not register the manager object until later.  This
-causes a race when being activated by a method call
-on the manager object, where ConsoleKit gets started
-but the method call fails.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=25744
----
- src/main.c |   16 ++++++++--------
- 1 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/src/main.c b/src/main.c
-index 809c6d6..b8f698f 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -294,11 +294,19 @@ main (int    argc,
- 
-         setup_debug_log (debug);
- 
-+        g_debug ("initializing console-kit-daemon %s", VERSION);
-+
-         connection = get_system_bus ();
-         if (connection == NULL) {
-                 goto out;
-         }
- 
-+        manager = ck_manager_new ();
-+
-+        if (manager == NULL) {
-+                goto out;
-+        }
-+
-         bus_proxy = get_bus_proxy (connection);
-         if (bus_proxy == NULL) {
-                 g_warning ("Could not construct bus_proxy object; bailing out");
-@@ -310,16 +318,8 @@ main (int    argc,
-                 goto out;
-         }
- 
--        g_debug ("initializing console-kit-daemon %s", VERSION);
--
-         create_pid_file ();
- 
--        manager = ck_manager_new ();
--
--        if (manager == NULL) {
--                goto out;
--        }
--
-         loop = g_main_loop_new (NULL, FALSE);
- 
-         g_signal_connect (bus_proxy,
--- 
-1.6.6
-
diff --git a/debian/patches/04-dont_fail_with_invalid_seats_file.patch b/debian/patches/04-dont_fail_with_invalid_seats_file.patch
deleted file mode 100644
index 369eb4f..0000000
--- a/debian/patches/04-dont_fail_with_invalid_seats_file.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Don't segfault if the seats file is invalid.
-
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=561106
-
-Index: consolekit/src/ck-manager.c
-===================================================================
---- consolekit.orig/src/ck-manager.c	2009-11-10 00:11:15.667744928 +0100
-+++ consolekit/src/ck-manager.c	2010-01-12 13:38:58.750284485 +0100
-@@ -2434,6 +2434,10 @@
- 
-         seat = ck_seat_new_from_file (sid, filename);
- 
-+        if (seat == NULL) {
-+                return;
-+        }
-+
-         connect_seat_signals (manager, seat);
-         if (!ck_seat_register (seat)) {
-                 /* returns false if connection to bus fails */
diff --git a/debian/patches/series b/debian/patches/series
index 081f7f2..b2c2b9a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,5 @@
 # Debian patches for consolekit
-01-dont_daemonize_when_activated.patch
-02-dont_take_bus_name_until_ready.patch
 03-cleanup_console_tags.patch
-04-dont_fail_with_invalid_seats_file.patch
 80-gnukfreebsd_support_configure.ac.patch
 82-hurd_support.patch
 99-autoreconf.patch