Remove patches

* Remove patches
  - d/p/01-fallback_no_vt_waitevent.patch (obsolete)
  - d/p/80-gnukfreebsd_support_configure.ac.patch (merged upstream)
  - d/p/debian/patches/99-autoreconf.patch (use dh-autoreconf instead)

6 files changed, 9 insertions, 878 deletions

diff --git a/debian/changelog b/debian/changelog
index ae12fcb..e1a4ced 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ consolekit (0.4.3-1) UNRELEASED; urgency=low
     - The VT_WAITEVENT mechanism proved to be racy and e.g. caused events
       being lost on suspend and resume. So this changes was reverted again.
       (Closes: #600756)
+  * Remove patches
+    - d/p/01-fallback_no_vt_waitevent.patch (obsolete)
+    - d/p/80-gnukfreebsd_support_configure.ac.patch (merged upstream)
+    - d/p/debian/patches/99-autoreconf.patch (use dh-autoreconf instead)
 
  -- Michael Biebl <biebl@debian.org>  Wed, 17 Nov 2010 06:51:57 +0100
 
diff --git a/debian/patches/01-fallback_no_vt_waitevent.patch b/debian/patches/01-fallback_no_vt_waitevent.patch
deleted file mode 100644
index f88eb69..0000000
--- a/debian/patches/01-fallback_no_vt_waitevent.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-commit 24dc214f55e7c7c17d888d0ccf94cd3625767462
-Author: Michael Biebl <biebl@debian.org>
-Date:   Mon Sep 20 00:45:16 2010 +0200
-
-    linux: Check for VT_WAITEVENT ioctl during runtime
-    
-    Since 2782cc8d4950effbc4407455e72bd4750cef6e11 ConsoleKit fails, if it
-    has been compiled on a linux kernel >= 2.6.32 but is run with an older
-    kernel. Check for VT_WAITEVENT ioctl during runtime and fallback to the
-    old behaviour of creating a thread for every possible vt.
-
-diff --git a/src/ck-vt-monitor.c b/src/ck-vt-monitor.c
-index 369c63e..9310341 100644
---- a/src/ck-vt-monitor.c
-+++ b/src/ck-vt-monitor.c
-@@ -27,6 +27,7 @@
- #include <string.h>
- #include <errno.h>
- #include <signal.h>
-+#include <sys/ioctl.h>
- 
- #include <glib.h>
- #include <glib/gi18n.h>
-@@ -311,6 +312,34 @@ schedule_process_queue (CkVtMonitor *vt_monitor)
-         G_UNLOCK (schedule_lock);
- }
- 
-+#ifdef VT_WAITEVENT
-+static gboolean
-+vt_waitevent_supported (int fd)
-+{
-+        static int supported = -1;
-+        int res;
-+
-+        if (supported >= 0)
-+                return supported;
-+
-+        res = ioctl(fd, VT_WAITEVENT, NULL);
-+
-+        if (res == ERROR) {
-+                if (errno == EINVAL) {
-+                        g_debug ("VT_WAITEVENT not supported on this system");
-+                        supported = FALSE;
-+                        return FALSE;
-+                } else if (errno == EFAULT) {
-+                        g_debug ("VT_WAITEVENT supported on this system");
-+                        supported = TRUE;
-+                        return TRUE;
-+                }
-+        }
-+        g_debug ("Unexpected result for VT_WAITEVENT check, returning FALSE");
-+        return FALSE;
-+}
-+#endif
-+
- static void *
- vt_thread_start (ThreadData *data)
- {
-@@ -322,6 +351,9 @@ vt_thread_start (ThreadData *data)
-         num = data->num;
- 
- #ifdef VT_WAITEVENT
-+        if (!vt_waitevent_supported(vt_monitor->priv->vfd))
-+                goto no_waitevent;
-+
-         for (;;) {
-                 res = ck_wait_for_console_switch (vt_monitor->priv->vfd, &num);
-                 if (! res) {
-@@ -340,7 +372,10 @@ vt_thread_start (ThreadData *data)
-                         schedule_process_queue (vt_monitor);
-                 }
-         }
--#else
-+        goto out;
-+#endif
-+
-+no_waitevent:
-         res = ck_wait_for_active_console_num (vt_monitor->priv->vfd, num);
-         if (! res) {
-                 /* FIXME: what do we do if it fails? */
-@@ -357,8 +392,8 @@ vt_thread_start (ThreadData *data)
-                 /* schedule processing of queue */
-                 schedule_process_queue (vt_monitor);
-         }
--#endif
- 
-+out:
-         G_LOCK (hash_lock);
-         if (vt_monitor->priv->vt_thread_hash != NULL) {
-                 g_hash_table_remove (vt_monitor->priv->vt_thread_hash, GUINT_TO_POINTER (num));
-@@ -418,19 +453,24 @@ vt_add_watches (CkVtMonitor *vt_monitor)
-         sigaction (SIGPOLL, &act, NULL);
- 
-         ioctl (vt_monitor->priv->vfd, I_SETSIG, S_MSG);
--#elif defined (VT_WAITEVENT)
-+#else
-+        guint  max_consoles;
-+        int    i;
-+        gint32 current_num;
-         gpointer id;
- 
-+#if defined (VT_WAITEVENT)
-+        if (!vt_waitevent_supported(vt_monitor->priv->vfd))
-+                goto no_waitevent;
-+
-         G_LOCK (hash_lock);
-         id = GINT_TO_POINTER (1);
-         if (g_hash_table_lookup (vt_monitor->priv->vt_thread_hash, id) == NULL)
-                 vt_add_watch_unlocked (vt_monitor, 1);
--        G_UNLOCK (hash_lock);
--#else
--        guint  max_consoles;
--        int    i;
--        gint32 current_num;
-+        goto out;
-+#endif
- 
-+no_waitevent:
-         G_LOCK (hash_lock);
- 
-         current_num = vt_monitor->priv->active_num;
-@@ -442,7 +482,6 @@ vt_add_watches (CkVtMonitor *vt_monitor)
-         }
- 
-         for (i = 1; i < max_consoles; i++) {
--                gpointer id;
- 
-                 /* don't wait on the active vc */
-                 if (i == current_num) {
-@@ -457,6 +496,7 @@ vt_add_watches (CkVtMonitor *vt_monitor)
-                 }
-         }
- 
-+out:
-         G_UNLOCK (hash_lock);
- #endif
- }
diff --git a/debian/patches/03-cleanup_console_tags.patch b/debian/patches/03-cleanup_console_tags.patch
index c796eb3..2ceb955 100644
--- a/debian/patches/03-cleanup_console_tags.patch
+++ b/debian/patches/03-cleanup_console_tags.patch
@@ -2,9 +2,9 @@ Cleanup console tag files on application startup and shutdown.
 
 Index: consolekit/src/main.c
 ===================================================================
---- consolekit.orig/src/main.c	2010-01-12 11:00:33.082306952 +0100
-+++ consolekit/src/main.c	2010-01-12 11:00:34.346283038 +0100
-@@ -149,6 +149,43 @@
+--- consolekit.orig/src/main.c	2010-11-17 07:02:23.030817878 +0100
++++ consolekit/src/main.c	2010-11-17 07:03:17.434814872 +0100
+@@ -148,6 +148,43 @@
          unlink (CONSOLE_KIT_PID_FILE);
  }
  
@@ -48,7 +48,7 @@ Index: consolekit/src/main.c
  /* copied from nautilus */
  static int debug_log_pipes[2];
  
-@@ -229,7 +266,7 @@
+@@ -228,7 +265,7 @@
                  snprintf (pid, sizeof (pid), "%lu\n", (long unsigned) getpid ());
                  written = write (pf, pid, strlen (pid));
                  close (pf);
@@ -57,7 +57,7 @@ Index: consolekit/src/main.c
          } else {
                  g_warning ("Unable to write pid file %s: %s",
                             CONSOLE_KIT_PID_FILE,
-@@ -318,6 +355,8 @@
+@@ -317,6 +354,8 @@
                  goto out;
          }
  
diff --git a/debian/patches/80-gnukfreebsd_support_configure.ac.patch b/debian/patches/80-gnukfreebsd_support_configure.ac.patch
deleted file mode 100644
index b41fe8f..0000000
--- a/debian/patches/80-gnukfreebsd_support_configure.ac.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: ConsoleKit-0.3.0/configure.ac
-===================================================================
---- ConsoleKit-0.3.0.orig/configure.ac	2008-07-31 02:35:53.000000000 +0200
-+++ ConsoleKit-0.3.0/configure.ac	2009-03-10 12:06:52.000000000 +0100
-@@ -176,7 +176,7 @@
- CK_BACKEND=""
- KVM_LIBS=""
- case "$host" in
--        *-*-freebsd*)
-+        *-*-freebsd* | *-*-kfreebsd*-gnu)
-         CK_BACKEND="freebsd"
-         AC_CHECK_LIB(kvm, kvm_openfiles, have_kvm=yes,
-                 AC_MSG_ERROR([Unable to find libkvm which is needed on FreeBSD]))
diff --git a/debian/patches/99-autoreconf.patch b/debian/patches/99-autoreconf.patch
deleted file mode 100644
index 6af8a55..0000000
--- a/debian/patches/99-autoreconf.patch
+++ /dev/null
@@ -1,720 +0,0 @@
-Index: consolekit/aclocal.m4
-===================================================================
---- consolekit.orig/aclocal.m4	2010-09-20 03:08:40.997095837 +0200
-+++ consolekit/aclocal.m4	2010-09-20 03:07:49.397100192 +0200
-@@ -13,8 +13,8 @@
- 
- m4_ifndef([AC_AUTOCONF_VERSION],
-   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
--m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.66],,
--[m4_warning([this file was generated for autoconf 2.66.
-+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
-+[m4_warning([this file was generated for autoconf 2.67.
- You have another version of autoconf.  It may work, but is not guaranteed to.
- If you have problems, you may need to regenerate the build system entirely.
- To do so, use the procedure documented by the package, typically `autoreconf'.])])
-@@ -2922,14 +2922,10 @@
-   # before this can be enabled.
-   hardcode_into_libs=yes
- 
--  # Add ABI-specific directories to the system library path.
--  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
--
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
--
-+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -2941,6 +2937,18 @@
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
-+netbsdelf*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='NetBSD ld.elf_so'
-+  ;;
-+
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-@@ -3541,7 +3549,7 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--netbsd*)
-+netbsd* | netbsdelf*-gnu)
-   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-   else
-@@ -4245,7 +4253,7 @@
- 	    ;;
- 	esac
- 	;;
--      netbsd*)
-+      netbsd* | netbsdelf*-gnu)
- 	;;
-       *qnx* | *nto*)
-         # QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -4685,6 +4693,9 @@
-   cygwin* | mingw* | cegcc*)
-     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-   ;;
-+  linux* | k*bsd*-gnu)
-+    _LT_TAGVAR(link_all_deplibs, $1)=no
-+  ;;
-   *)
-     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-   ;;
-@@ -4749,6 +4760,9 @@
-   openbsd*)
-     with_gnu_ld=no
-     ;;
-+  linux* | k*bsd*-gnu)
-+    _LT_TAGVAR(link_all_deplibs, $1)=no
-+    ;;
-   esac
- 
-   _LT_TAGVAR(ld_shlibs, $1)=yes
-@@ -4970,7 +4984,7 @@
-       fi
-       ;;
- 
--    netbsd*)
-+    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- 	wlarc=
-@@ -5147,6 +5161,7 @@
- 	if test "$aix_use_runtimelinking" = yes; then
- 	  shared_flag="$shared_flag "'${wl}-G'
- 	fi
-+	_LT_TAGVAR(link_all_deplibs, $1)=no
-       else
- 	# not using gcc
- 	if test "$host_cpu" = ia64; then
-@@ -5397,7 +5412,7 @@
-       _LT_TAGVAR(link_all_deplibs, $1)=yes
-       ;;
- 
--    netbsd*)
-+    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-       else
-@@ -8626,7 +8641,7 @@
- Consider adjusting the PKG_CONFIG_PATH environment variable if you
- installed software in a non-standard prefix.
- 
--_PKG_TEXT])
-+_PKG_TEXT])dnl
-         ])
- elif test $pkg_failed = untried; then
-      	AC_MSG_RESULT([no])
-@@ -8637,7 +8652,7 @@
- 
- _PKG_TEXT
- 
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.])
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
-         ])
- else
- 	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-Index: consolekit/configure
-===================================================================
---- consolekit.orig/configure	2010-09-20 03:08:41.721090604 +0200
-+++ consolekit/configure	2010-09-20 03:07:57.305091267 +0200
-@@ -1,6 +1,6 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.66 for ConsoleKit 0.4.2.
-+# Generated by GNU Autoconf 2.67 for ConsoleKit 0.4.2.
- #
- # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=ConsoleKit>.
- #
-@@ -629,6 +629,8 @@
- HAVE_PAM_FALSE
- HAVE_PAM_TRUE
- CK_BACKEND
-+CK_COMPILE_GNU_FALSE
-+CK_COMPILE_GNU_TRUE
- CK_COMPILE_SOLARIS_FALSE
- CK_COMPILE_SOLARIS_TRUE
- CK_COMPILE_FREEBSD_FALSE
-@@ -895,8 +897,9 @@
-   fi
- 
-   case $ac_option in
--  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
--  *)	ac_optarg=yes ;;
-+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-+  *=)   ac_optarg= ;;
-+  *)    ac_optarg=yes ;;
-   esac
- 
-   # Accept the important Cygnus configure options, so we can diagnose typos.
-@@ -1591,7 +1594,7 @@
- if $ac_init_version; then
-   cat <<\_ACEOF
- ConsoleKit configure 0.4.2
--generated by GNU Autoconf 2.66
-+generated by GNU Autoconf 2.67
- 
- Copyright (C) 2010 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
-@@ -1663,7 +1666,7 @@
-     mv -f conftest.er1 conftest.err
-   fi
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; } >/dev/null && {
-+  test $ac_status = 0; } > conftest.i && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then :
-@@ -1726,7 +1729,7 @@
- else
-   ac_header_preproc=no
- fi
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.err conftest.i conftest.$ac_ext
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
- $as_echo "$ac_header_preproc" >&6; }
- 
-@@ -1960,7 +1963,7 @@
- running configure, to aid debugging if configure makes a mistake.
- 
- It was created by ConsoleKit $as_me 0.4.2, which was
--generated by GNU Autoconf 2.66.  Invocation command line was
-+generated by GNU Autoconf 2.67.  Invocation command line was
- 
-   $ $0 $@
- 
-@@ -2218,7 +2221,7 @@
-       || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error $? "failed to load site script $ac_site_file
--See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
-   fi
- done
- 
-@@ -2445,11 +2448,11 @@
- '
- case `pwd` in
-   *[\\\"\#\$\&\'\`$am_lf]*)
--    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
-+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
- esac
- case $srcdir in
-   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
--    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
-+    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
- esac
- 
- # Do `set' in a subshell so we don't clobber the current shell's
-@@ -3217,7 +3220,7 @@
- test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error $? "no acceptable C compiler found in \$PATH
--See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
- 
- # Provide some information about the compiler.
- $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-@@ -3332,7 +3335,7 @@
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error 77 "C compiler cannot create executables
--See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
- else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-@@ -3375,7 +3378,7 @@
-   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error $? "cannot compute suffix of executables: cannot compile and link
--See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
- fi
- rm -f conftest conftest$ac_cv_exeext
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-@@ -3434,7 +3437,7 @@
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error $? "cannot run C compiled programs.
- If you meant to cross compile, use \`--host'.
--See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
-     fi
-   fi
- fi
-@@ -3486,7 +3489,7 @@
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error $? "cannot compute suffix of object files: cannot compile
--See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
- fi
- rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
-@@ -3876,7 +3879,7 @@
-   # Broken: fails on valid input.
- continue
- fi
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.err conftest.i conftest.$ac_ext
- 
-   # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
-@@ -3892,11 +3895,11 @@
- ac_preproc_ok=:
- break
- fi
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.err conftest.i conftest.$ac_ext
- 
- done
- # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.i conftest.err conftest.$ac_ext
- if $ac_preproc_ok; then :
-   break
- fi
-@@ -3935,7 +3938,7 @@
-   # Broken: fails on valid input.
- continue
- fi
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.err conftest.i conftest.$ac_ext
- 
-   # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
-@@ -3951,18 +3954,18 @@
- ac_preproc_ok=:
- break
- fi
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.err conftest.i conftest.$ac_ext
- 
- done
- # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.i conftest.err conftest.$ac_ext
- if $ac_preproc_ok; then :
- 
- else
-   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
--See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
- fi
- 
- ac_ext=c
-@@ -4651,7 +4654,7 @@
- test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error $? "no acceptable C compiler found in \$PATH
--See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
- 
- # Provide some information about the compiler.
- $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-@@ -5207,7 +5210,7 @@
- $as_echo "$ac_cv_build" >&6; }
- case $ac_cv_build in
- *-*-*) ;;
--*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
-+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
- esac
- build=$ac_cv_build
- ac_save_IFS=$IFS; IFS='-'
-@@ -5240,7 +5243,7 @@
- $as_echo "$ac_cv_host" >&6; }
- case $ac_cv_host in
- *-*-*) ;;
--*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
-+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
- esac
- host=$ac_cv_host
- ac_save_IFS=$IFS; IFS='-'
-@@ -6278,7 +6281,7 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--netbsd*)
-+netbsd* | netbsdelf*-gnu)
-   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-   else
-@@ -8894,6 +8897,9 @@
-   openbsd*)
-     with_gnu_ld=no
-     ;;
-+  linux* | k*bsd*-gnu)
-+    link_all_deplibs=no
-+    ;;
-   esac
- 
-   ld_shlibs=yes
-@@ -9115,7 +9121,7 @@
-       fi
-       ;;
- 
--    netbsd*)
-+    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- 	wlarc=
-@@ -9292,6 +9298,7 @@
- 	if test "$aix_use_runtimelinking" = yes; then
- 	  shared_flag="$shared_flag "'${wl}-G'
- 	fi
-+	link_all_deplibs=no
-       else
- 	# not using gcc
- 	if test "$host_cpu" = ia64; then
-@@ -9666,7 +9673,7 @@
-       link_all_deplibs=yes
-       ;;
- 
--    netbsd*)
-+    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-       else
-@@ -10628,14 +10635,10 @@
-   # before this can be enabled.
-   hardcode_into_libs=yes
- 
--  # Add ABI-specific directories to the system library path.
--  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
--
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
--
-+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -10647,6 +10650,18 @@
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
-+netbsdelf*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='NetBSD ld.elf_so'
-+  ;;
-+
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-@@ -12760,7 +12775,6 @@
- Alternatively, you may set the environment variables CONSOLE_KIT_CFLAGS
- and CONSOLE_KIT_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details." "$LINENO" 5
--
- elif test $pkg_failed = untried; then
-      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-@@ -12775,8 +12789,7 @@
- See the pkg-config man page for more details.
- 
- To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details" "$LINENO" 5; }
--
-+See \`config.log' for more details" "$LINENO" 5 ; }
- else
- 	CONSOLE_KIT_CFLAGS=$pkg_cv_CONSOLE_KIT_CFLAGS
- 	CONSOLE_KIT_LIBS=$pkg_cv_CONSOLE_KIT_LIBS
-@@ -12945,7 +12958,6 @@
- Alternatively, you may set the environment variables LIBDBUS_CFLAGS
- and LIBDBUS_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details." "$LINENO" 5
--
- elif test $pkg_failed = untried; then
-      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-@@ -12960,8 +12972,7 @@
- See the pkg-config man page for more details.
- 
- To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details" "$LINENO" 5; }
--
-+See \`config.log' for more details" "$LINENO" 5 ; }
- else
- 	LIBDBUS_CFLAGS=$pkg_cv_LIBDBUS_CFLAGS
- 	LIBDBUS_LIBS=$pkg_cv_LIBDBUS_LIBS
-@@ -13054,7 +13065,6 @@
- Alternatively, you may set the environment variables TOOLS_CFLAGS
- and TOOLS_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details." "$LINENO" 5
--
- elif test $pkg_failed = untried; then
-      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-@@ -13069,8 +13079,7 @@
- See the pkg-config man page for more details.
- 
- To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details" "$LINENO" 5; }
--
-+See \`config.log' for more details" "$LINENO" 5 ; }
- else
- 	TOOLS_CFLAGS=$pkg_cv_TOOLS_CFLAGS
- 	TOOLS_LIBS=$pkg_cv_TOOLS_LIBS
-@@ -13155,7 +13164,6 @@
- Alternatively, you may set the environment variables HISTORY_CFLAGS
- and HISTORY_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details." "$LINENO" 5
--
- elif test $pkg_failed = untried; then
-      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-@@ -13170,8 +13178,7 @@
- See the pkg-config man page for more details.
- 
- To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details" "$LINENO" 5; }
--
-+See \`config.log' for more details" "$LINENO" 5 ; }
- else
- 	HISTORY_CFLAGS=$pkg_cv_HISTORY_CFLAGS
- 	HISTORY_LIBS=$pkg_cv_HISTORY_LIBS
-@@ -13502,7 +13509,7 @@
- CK_BACKEND=""
- KVM_LIBS=""
- case "$host" in
--        *-*-freebsd*)
-+        *-*-freebsd* | *-*-kfreebsd*-gnu)
-         CK_BACKEND="freebsd"
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kvm_openfiles in -lkvm" >&5
- $as_echo_n "checking for kvm_openfiles in -lkvm... " >&6; }
-@@ -13556,6 +13563,9 @@
-         *-*-solaris*)
-         CK_BACKEND="solaris"
-         ;;
-+        *-*-gnu*)
-+        CK_BACKEND="gnu"
-+        ;;
- 	*)
- 	as_fn_error $? "No sysdeps back-end implemented for host $host" "$LINENO" 5
- 	;;
-@@ -13587,6 +13597,14 @@
-   CK_COMPILE_SOLARIS_FALSE=
- fi
- 
-+ if test x$CK_BACKEND = xgnu; then
-+  CK_COMPILE_GNU_TRUE=
-+  CK_COMPILE_GNU_FALSE='#'
-+else
-+  CK_COMPILE_GNU_TRUE='#'
-+  CK_COMPILE_GNU_FALSE=
-+fi
-+
- 
- 
- 
-@@ -14177,6 +14195,10 @@
-   as_fn_error $? "conditional \"CK_COMPILE_SOLARIS\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
-+if test -z "${CK_COMPILE_GNU_TRUE}" && test -z "${CK_COMPILE_GNU_FALSE}"; then
-+  as_fn_error $? "conditional \"CK_COMPILE_GNU\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
- if test -z "${HAVE_PAM_TRUE}" && test -z "${HAVE_PAM_FALSE}"; then
-   as_fn_error $? "conditional \"HAVE_PAM\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
-@@ -14606,7 +14628,7 @@
- # values after options handling.
- ac_log="
- This file was extended by ConsoleKit $as_me 0.4.2, which was
--generated by GNU Autoconf 2.66.  Invocation command line was
-+generated by GNU Autoconf 2.67.  Invocation command line was
- 
-   CONFIG_FILES    = $CONFIG_FILES
-   CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -14672,7 +14694,7 @@
- ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
- ac_cs_version="\\
- ConsoleKit config.status 0.4.2
--configured by $0, generated by GNU Autoconf 2.66,
-+configured by $0, generated by GNU Autoconf 2.67,
-   with options \\"\$ac_cs_config\\"
- 
- Copyright (C) 2010 Free Software Foundation, Inc.
-@@ -14693,11 +14715,16 @@
- while test $# != 0
- do
-   case $1 in
--  --*=*)
-+  --*=?*)
-     ac_option=`expr "X$1" : 'X\([^=]*\)='`
-     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-     ac_shift=:
-     ;;
-+  --*=)
-+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-+    ac_optarg=
-+    ac_shift=:
-+    ;;
-   *)
-     ac_option=$1
-     ac_optarg=$2
-@@ -14719,6 +14746,7 @@
-     $ac_shift
-     case $ac_optarg in
-     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    '') as_fn_error $? "missing file argument" ;;
-     esac
-     as_fn_append CONFIG_FILES " '$ac_optarg'"
-     ac_need_defaults=false;;
-@@ -15073,7 +15101,7 @@
-     "pam-ck-connector/Makefile") CONFIG_FILES="$CONFIG_FILES pam-ck-connector/Makefile" ;;
-     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
- 
--  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
-+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
-   esac
- done
- 
-@@ -15389,7 +15417,7 @@
-   esac
-   case $ac_mode$ac_tag in
-   :[FHL]*:*);;
--  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
-+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
-   :[FH]-) ac_tag=-:-;;
-   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-   esac
-@@ -15417,7 +15445,7 @@
- 	   [\\/$]*) false;;
- 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
- 	   esac ||
--	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
-+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
-       esac
-       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-       as_fn_append ac_file_inputs " '$ac_f'"
-@@ -15444,7 +15472,7 @@
- 
-     case $ac_tag in
-     *:-:* | *:-) cat >"$tmp/stdin" \
--      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
-+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
-     esac
-     ;;
-   esac
-Index: consolekit/src/Makefile.in
-===================================================================
---- consolekit.orig/src/Makefile.in	2010-09-20 03:08:41.129094222 +0200
-+++ consolekit/src/Makefile.in	2010-09-20 03:08:01.029091854 +0200
-@@ -48,6 +48,10 @@
- @CK_COMPILE_FREEBSD_TRUE@	ck-sysdeps-freebsd.c	\
- @CK_COMPILE_FREEBSD_TRUE@	$(NULL)
- 
-+@CK_COMPILE_GNU_TRUE@am__append_4 = \
-+@CK_COMPILE_GNU_TRUE@	ck-sysdeps-gnu.c	\
-+@CK_COMPILE_GNU_TRUE@	$(NULL)
-+
- sbin_PROGRAMS = console-kit-daemon$(EXEEXT) $(am__EXEEXT_1)
- noinst_PROGRAMS = test-event-logger$(EXEEXT) \
- 	test-tty-idle-monitor$(EXEEXT) test-vt-monitor$(EXEEXT) \
-@@ -75,15 +79,19 @@
- @CK_COMPILE_FREEBSD_TRUE@libck_la_DEPENDENCIES =  \
- @CK_COMPILE_FREEBSD_TRUE@	$(am__DEPENDENCIES_1)
- am__libck_la_SOURCES_DIST = ck-sysdeps.h ck-sysdeps-unix.c \
--	ck-sysdeps-linux.c ck-sysdeps-solaris.c ck-sysdeps-freebsd.c
-+	ck-sysdeps-linux.c ck-sysdeps-solaris.c ck-sysdeps-freebsd.c \
-+	ck-sysdeps-gnu.c
- @CK_COMPILE_LINUX_TRUE@am__objects_2 = ck-sysdeps-linux.lo \
- @CK_COMPILE_LINUX_TRUE@	$(am__objects_1)
- @CK_COMPILE_SOLARIS_TRUE@am__objects_3 = ck-sysdeps-solaris.lo \
- @CK_COMPILE_SOLARIS_TRUE@	$(am__objects_1)
- @CK_COMPILE_FREEBSD_TRUE@am__objects_4 = ck-sysdeps-freebsd.lo \
- @CK_COMPILE_FREEBSD_TRUE@	$(am__objects_1)
-+@CK_COMPILE_GNU_TRUE@am__objects_5 = ck-sysdeps-gnu.lo \
-+@CK_COMPILE_GNU_TRUE@	$(am__objects_1)
- am_libck_la_OBJECTS = ck-sysdeps-unix.lo $(am__objects_1) \
--	$(am__objects_2) $(am__objects_3) $(am__objects_4)
-+	$(am__objects_2) $(am__objects_3) $(am__objects_4) \
-+	$(am__objects_5)
- libck_la_OBJECTS = $(am_libck_la_OBJECTS)
- am__EXEEXT_1 =
- am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(dbusifdir)"
-@@ -97,16 +105,16 @@
- 	ck-manager-glue.h ck-seat-glue.h ck-session-glue.h \
- 	ck-marshal.c ck-marshal.h ck-file-monitor-dummy.c \
- 	ck-file-monitor-inotify.c
--am__objects_5 = ck-marshal.$(OBJEXT) $(am__objects_1)
--@ENABLE_INOTIFY_FALSE@am__objects_6 = ck-file-monitor-dummy.$(OBJEXT)
--@ENABLE_INOTIFY_TRUE@am__objects_6 =  \
-+am__objects_6 = ck-marshal.$(OBJEXT) $(am__objects_1)
-+@ENABLE_INOTIFY_FALSE@am__objects_7 = ck-file-monitor-dummy.$(OBJEXT)
-+@ENABLE_INOTIFY_TRUE@am__objects_7 =  \
- @ENABLE_INOTIFY_TRUE@	ck-file-monitor-inotify.$(OBJEXT)
- am_console_kit_daemon_OBJECTS = main.$(OBJEXT) ck-manager.$(OBJEXT) \
- 	ck-vt-monitor.$(OBJEXT) ck-tty-idle-monitor.$(OBJEXT) \
- 	ck-job.$(OBJEXT) ck-seat.$(OBJEXT) ck-session-leader.$(OBJEXT) \
- 	ck-session.$(OBJEXT) ck-log.$(OBJEXT) \
- 	ck-run-programs.$(OBJEXT) ck-event-logger.$(OBJEXT) \
--	$(am__objects_5) $(am__objects_1) $(am__objects_6)
-+	$(am__objects_6) $(am__objects_1) $(am__objects_7)
- console_kit_daemon_OBJECTS = $(am_console_kit_daemon_OBJECTS)
- console_kit_daemon_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libck.la \
-@@ -122,7 +130,7 @@
- 	ck-file-monitor-dummy.c ck-file-monitor-inotify.c \
- 	test-tty-idle-monitor.c
- am_test_tty_idle_monitor_OBJECTS = ck-tty-idle-monitor.$(OBJEXT) \
--	$(am__objects_6) test-tty-idle-monitor.$(OBJEXT) \
-+	$(am__objects_7) test-tty-idle-monitor.$(OBJEXT) \
- 	$(am__objects_1)
- test_tty_idle_monitor_OBJECTS = $(am_test_tty_idle_monitor_OBJECTS)
- test_tty_idle_monitor_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-@@ -428,13 +436,16 @@
- 	$(NULL)
- 
- libck_la_SOURCES = ck-sysdeps.h ck-sysdeps-unix.c $(NULL) \
--	$(am__append_1) $(am__append_2) $(am__append_3)
-+	$(am__append_1) $(am__append_2) $(am__append_3) \
-+	$(am__append_4)
- @CK_COMPILE_FREEBSD_TRUE@libck_la_LIBADD = $(KVM_LIBS)
-+@CK_COMPILE_GNU_TRUE@libck_la_LIBADD = -lps
- @CK_COMPILE_SOLARIS_TRUE@libck_la_LIBADD = -lscf
- EXTRA_libck_la_SOURCES = \
- 	ck-sysdeps-linux.c		\
- 	ck-sysdeps-solaris.c		\
- 	ck-sysdeps-freebsd.c		\
-+	ck-sysdeps-gnu.c		\
- 	$(NULL)
- 
- BUILT_SOURCES = \
-@@ -658,6 +669,7 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-session-leader.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-session.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-sysdeps-freebsd.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-sysdeps-gnu.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-sysdeps-linux.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-sysdeps-solaris.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-sysdeps-unix.Plo@am__quote@
diff --git a/debian/patches/series b/debian/patches/series
index 787feab..1591648 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,3 @@
 # Debian patches for consolekit
-01-fallback_no_vt_waitevent.patch
 03-cleanup_console_tags.patch
-80-gnukfreebsd_support_configure.ac.patch
 82-hurd_support.patch
-99-autoreconf.patch