Imported Debian patch 0.2.3-3debian/0.2.3-3

7 files changed, 93 insertions, 137 deletions

diff --git a/debian/changelog b/debian/changelog
index 0674e06..a9a1e5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+consolekit (0.2.3-3) unstable; urgency=low
+
+  * debian/control
+    - The Vcs-* fields are now officially supported, so remove the XS- prefix.
+    - Bump Standards-Version to 3.7.3. No further changes required.
+    - Drop dependency on lsb-base, as we no longer install a SysV init script.
+    - Tighten dependency on dbus (>= 1.1.2). This is required for the D-Bus
+      system activation support.
+  * debian/consolekit.init
+    - Deleted, no longer required.
+  * debian/consolekit.install
+    - Install the D-Bus service file debian/org.freedesktop.ConsoleKit.service
+      into /usr/share/dbus-1/system-services. This allows to start the
+      ConsoleKit service on demand.
+  * debian/consolekit.preinst
+    - Make sure the conffile /etc/init.d/consolekit and its symlinks in
+      /etc/rc?.d are properly removed on package upgrades.
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 11 Dec 2007 23:14:14 +0100
+
 consolekit (0.2.3-2) unstable; urgency=low
 
   * debian/control
diff --git a/debian/consolekit.init b/debian/consolekit.init
deleted file mode 100644
index 71db269..0000000
--- a/debian/consolekit.init
+++ /dev/null
@@ -1,127 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          ConsoleKit
-# Required-Start:    $local_fs dbus
-# Required-Stop:     $local_fs dbus
-# Default-Start:     2 3 4 5
-# Default-Stop:      S 0 1 6
-# Short-Description: ConsoleKit daemon
-# Description:       The ConsoleKit maintains a list of sessions, 
-#                    seats and users
-### END INIT INFO
-
-# Author: Michael Biebl <biebl@debian.org>
-#
-
-DESC="ConsoleKit daemon"
-NAME=console-kit-daemon
-DAEMON=/usr/sbin/$NAME
-DAEMON_ARGS=""
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/consolekit
-
-# Exit if the package is not installed
-[ -x "$DAEMON" ] || exit 0
-
-# Read configuration variable file if it is present
-[ -r /etc/default/consolekit ] && . /etc/default/consolekit
-
-# Load the VERBOSE setting and other rcS variables
-[ -f /etc/default/rcS ] && . /etc/default/rcS
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
-. /lib/lsb/init-functions
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
-	# Return
-	#   0 if daemon has been started
-	#   1 if daemon was already running
-	#   2 if daemon could not be started
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
-		|| return 1
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
-		$DAEMON_ARGS \
-		|| return 2
-	# Add code here, if necessary, that waits for the process to be ready
-	# to handle requests from services started subsequently which depend
-	# on this one.  As a last resort, sleep for some time.
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
-	# Return
-	#   0 if daemon has been stopped
-	#   1 if daemon was already stopped
-	#   2 if daemon could not be stopped
-	#   other if a failure occurred
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --exec $DAEMON
-	RETVAL="$?"
-	[ "$RETVAL" = 2 ] && return 2
-	# Many daemons don't delete their pidfiles when they exit.
-	rm -f $PIDFILE
-	return "$RETVAL"
-}
-
-#
-# Send a SIGUSR1 to console-kit-daemon to switch between debug/non-debug mode.
-#
-do_reload() {
-	start-stop-daemon --stop --signal USR1 --quiet --pidfile $PIDFILE --exec $DAEMON
-	return 0
-}
-
-case "$1" in
-  start)
-	log_daemon_msg "Starting $DESC" "$NAME"
-	do_start
-	case "$?" in
-		0|1) log_end_msg 0 ;;
-		2)   log_end_msg 1 ;;
-	esac
-	;;
-  stop)
-	log_daemon_msg "Stopping $DESC" "$NAME"
-	do_stop
-	case "$?" in
-		0|1) log_end_msg 0 ;;
-		2)   log_end_msg 1 ;;
-	esac
-	;;
-  reload|force-reload)
-	log_daemon_msg "Reloading $DESC" "$NAME"
-	do_reload
-	log_end_msg $?
-	;;
-  restart)
-	log_daemon_msg "Restarting $DESC" "$NAME"
-	do_stop
-	case "$?" in
-	  0|1)
-		do_start
-		case "$?" in
-			0) log_end_msg 0 ;;
-			1) log_end_msg 1 ;; # Old process is still running
-			*) log_end_msg 1 ;; # Failed to start
-		esac
-		;;
-	  *)
-	  	# Failed to stop
-		log_end_msg 1
-		;;
-	esac
-	;;
-  *)
-	echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
-	exit 3
-	;;
-esac
-
-:
diff --git a/debian/consolekit.install b/debian/consolekit.install
index d64105a..eb61be5 100644
--- a/debian/consolekit.install
+++ b/debian/consolekit.install
@@ -5,3 +5,4 @@ debian/tmp/usr/lib/consolekit/ck-get-x11-server-pid
 debian/tmp/usr/lib/consolekit/ck-get-x11-display-device
 debian/tmp/usr/lib/consolekit/ck-collect-session-info
 debian/tmp/usr/sbin/console-kit-daemon
+debian/org.freedesktop.ConsoleKit.service usr/share/dbus-1/system-services/
diff --git a/debian/consolekit.preinst b/debian/consolekit.preinst
new file mode 100644
index 0000000..6748388
--- /dev/null
+++ b/debian/consolekit.preinst
@@ -0,0 +1,61 @@
+#!/bin/sh -e
+# This script can be called in the following ways:
+#
+# Before the package is installed:
+#	<new-preinst> install
+#
+# Before removed package is upgraded:
+#	<new-preinst> install <old-version>
+#
+# Before the package is upgraded:
+#	<new-preinst> upgrade <old-version>
+#
+#
+# If postrm fails during upgrade or fails on failed upgrade:
+#	<old-preinst> abort-upgrade <new-version>
+
+
+# remove a no-longer used conffile
+rm_conffile()
+{
+    PKGNAME="$1"
+    CONFFILE="$2"
+
+    if [ -e "$CONFFILE" ]; then
+        md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
+        old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE'{s/ obsolete$//;s/.* //p}\"`"
+        if [ "$md5sum" != "$old_md5sum" ]; then
+            echo "Obsolete conffile $CONFFILE has been modified by you."
+	    echo "Saving as $CONFFILE.dpkg-bak ..."
+            mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
+	else
+            echo "Removing obsolete conffile $CONFFILE ..." 
+	    rm -f "$CONFFILE" 
+	fi
+    fi
+}
+
+
+case "$1" in
+    install)
+    	;;
+
+    upgrade)
+	# Upgrade from previous versions
+	if dpkg --compare-versions "$2" lt "0.2.3-3"; then
+	    rm_conffile consolekit /etc/init.d/consolekit
+	    update-rc.d consolekit remove >/dev/null
+	fi
+	;;
+
+    abort-upgrade)
+	;;
+
+    *)
+	echo "$0 called with unknown argument \`$1'" 1>&2
+	exit 1
+	;;
+esac
+
+#DEBHELPER#
+exit 0
diff --git a/debian/control b/debian/control
index 49b3a9f..be4669c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,15 +4,15 @@ Priority: optional
 Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org>
 Uploaders: Michael Biebl <biebl@debian.org>
 Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libdbus-glib-1-dev (>= 0.30), libglib2.0-dev (>= 2.7.0), libx11-dev (>= 1.0.0), xmlto, libpam0g-dev
-Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/consolekit
-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/consolekit
+Standards-Version: 3.7.3
+Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/consolekit
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/consolekit
 Homepage: http://www.freedesktop.org/wiki/Software/ConsoleKit
 
 Package: consolekit
 Section: admin
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, dbus, lsb-base (>= 3.0-6)
+Depends: ${shlibs:Depends}, ${misc:Depends}, dbus (>= 1.1.2)
 Recommends: libpam-ck-connector
 Description: framework for defining and tracking users, sessions and seats
  ConsoleKit is a system daemon for tracking what users are logged
@@ -32,7 +32,8 @@ Description: ConsoleKit libraries
  into the system and how they interact with the computer (e.g.
  which keyboard and mouse they use).
  .
- This package provides libraries.
+ This package provides a convenience library which simplifies the access to
+ ConsoleKit.
 
 Package: libck-connector-dev
 Section: libdevel
@@ -55,5 +56,5 @@ Description: ConsoleKit PAM module
  which keyboard and mouse they use).
  .
  This package provides a PAM module which can be used for console logins.
- Graphical login managers should talk to the ConsoleKit directly.
+ Graphical login managers should talk to ConsoleKit directly.
 
diff --git a/debian/org.freedesktop.ConsoleKit.service b/debian/org.freedesktop.ConsoleKit.service
new file mode 100644
index 0000000..9f1c724
--- /dev/null
+++ b/debian/org.freedesktop.ConsoleKit.service
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.freedesktop.ConsoleKit
+Exec=/usr/sbin/console-kit-daemon
+User=root
diff --git a/debian/rules b/debian/rules
index a958253..756a9a3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,3 @@ include /usr/share/cdbs/1/rules/utils.mk
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-pam-module \
                              --enable-docbook-docs \
 			     --with-pid-file=/var/run/console-kit-daemon.pid
-
-# Start after dbus / stop before dbus
-DEB_DH_INSTALLINIT_ARGS := -- start 22 2 3 4 5 . stop 18 0 1 6 .
-