diff -Nru hal-trinity-0.5.14/debian/changelog hal-trinity-0.5.14/debian/changelog
--- hal-trinity-0.5.14/debian/changelog	2011-03-19 18:51:54.000000000 -0500
+++ hal-trinity-0.5.14/debian/changelog	2011-07-01 13:35:45.000000000 -0500
@@ -1,4 +1,4 @@
-hal-trinity (0.5.14-0ubuntu1) maverick; urgency=low
+hal-trinity (0.5.14-0ubuntu2) maverick; urgency=low
 
   * Initial upload of startup files
 
@@ -154,7 +154,7 @@
     - Add 01_at_console.patch: Allow access to hal functions to local console
       users, in particular the ones which were allowed unauthorized access in
       policykit. Do not allow access to mounting internal storage devices;
-      Kubuntu does not use it, and GNOME does not use hal at all.
+      Debian does not use it, and GNOME does not use hal at all.
     - debian/hal.manpages: Drop PK specific manpages which aren't built any
       more.
     - debian/hal.install: Drop installation of PolicyKit files.
diff -Nru hal-trinity-0.5.14/debian/hal-kde3.default hal-trinity-0.5.14/debian/hal-kde3.default
--- hal-trinity-0.5.14/debian/hal-kde3.default	2011-03-19 18:51:54.000000000 -0500
+++ hal-trinity-0.5.14/debian/hal-kde3.default	1969-12-31 18:00:00.000000000 -0600
@@ -1 +0,0 @@
-DAEMON_OPTS=
diff -Nru hal-trinity-0.5.14/debian/hal-kde3.init hal-trinity-0.5.14/debian/hal-kde3.init
--- hal-trinity-0.5.14/debian/hal-kde3.init	2011-03-19 18:51:54.000000000 -0500
+++ hal-trinity-0.5.14/debian/hal-kde3.init	1969-12-31 18:00:00.000000000 -0600
@@ -1,99 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          hal
-# Required-Start:    $remote_fs dbus
-# Required-Stop:     $remote_fs dbus
-# Should-Start:	     $syslog acpid
-# Should-Stop:       $syslog acpid
-# Default-Start:     2 3 4 5
-# Default-Stop:      1
-# Short-Description: Hardware abstraction layer
-# Description:       The HAL daemon collects and maintains information about
-#                    your hardware.
-### END INIT INFO
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/sbin/hald
-PIDDIR=/var/run/hald
-PIDFILE=$PIDDIR/hald.pid
-NAME=hald
-DAEMONUSER=haldaemon
-DESC="Hardware abstraction layer"
-
-. /lib/lsb/init-functions
-
-test -x $DAEMON || exit 0
-
-# Include hal defaults if available
-if [ -f /etc/default/hal ] ; then
-	. /etc/default/hal
-fi
-
-set -e
-
-do_start() {
-	if [ ! -d $PIDDIR ]; then
-		mkdir -p $PIDDIR
-		chmod 770 $PIDDIR
-		chown $DAEMONUSER:$DAEMONUSER $PIDDIR
-	fi
-	start-stop-daemon --start --oknodo --pidfile $PIDFILE \
-		--exec $DAEMON -- $DAEMON_OPTS
-}
-
-do_stop() {
-	start-stop-daemon --stop --retry 5 --oknodo --quiet --pidfile $PIDFILE \
-		--exec $DAEMON
-}
-
-check_prerequisites() {
-	UNAME=`uname`
-	if [ ! -d /proc/sys/fs/inotify ] && [ $UNAME = "Linux" ]; then
-		log_failure_msg "Can't start $DESC - enable inotify support in your kernel"
-		exit 0
-	fi
-	if [ ! -e /var/run/dbus/system_bus_socket ]; then
-		log_failure_msg "Can't start $DESC - please ensure dbus is running"
-		exit 0
-	fi
-	
-	if [ ! -d /sys/devices ] && [ $UNAME = "Linux" ]; then
-		log_failure_msg "Can't start $DESC - sysfs not mounted on /sys"
-		exit 0
-	fi
-	
-	if [ "$(stat -c %d/%i /)" != "$(stat -Lc %d/%i /proc/1/root 2>/dev/null)" ] && [ $UNAME != "GNU" ]; then
-		log_failure_msg "Can't start $DESC - detected chrooted session"
-		exit 0
-	fi
-}
-
-case "$1" in
-  start)
-	check_prerequisites
-	log_daemon_msg "Starting $DESC" "$NAME"
-	do_start
-	log_end_msg $?
-	;;
-  stop)
-	log_daemon_msg "Stopping $DESC" "$NAME"
-	do_stop
-	log_end_msg $?
-	;;
-  restart|force-reload)
-	check_prerequisites
-	log_daemon_msg "Restarting $DESC" "$NAME"
-	do_stop
-	do_start
-	log_end_msg $?
-	;;
-  status)
-	status_of_proc -p $PIDFILE $DAEMON $NAME && exit 0 || exit $?
-	;;
-  *)
-	log_success_msg "Usage: $0 {start|stop|restart|force-reload|status}" >&2
-	exit 1
-	;;
-esac
-
-exit 0
diff -Nru hal-trinity-0.5.14/debian/hal-kde3.upstart hal-trinity-0.5.14/debian/hal-kde3.upstart
--- hal-trinity-0.5.14/debian/hal-kde3.upstart	2011-03-19 18:51:54.000000000 -0500
+++ hal-trinity-0.5.14/debian/hal-kde3.upstart	1969-12-31 18:00:00.000000000 -0600
@@ -1,18 +0,0 @@
-# hal - hardware abstraction layer
-#
-# The HAL daemon collects and maintains information about your hardware
-# and provides an abstraction layer for applications to access that
-# information and utilise the hardware.
-
-description	"hardware abstraction layer"
-
-start on (filesystem
-	  and started dbus
-	  and started udev)
-stop on (stopping dbus
-	 or stopping udev)
-
-expect fork
-respawn
-
-exec hald --daemon=yes
diff -Nru hal-trinity-0.5.14/debian/hal-trinity.default hal-trinity-0.5.14/debian/hal-trinity.default
--- hal-trinity-0.5.14/debian/hal-trinity.default	1969-12-31 18:00:00.000000000 -0600
+++ hal-trinity-0.5.14/debian/hal-trinity.default	2011-07-01 13:35:45.000000000 -0500
@@ -0,0 +1 @@
+DAEMON_OPTS=
diff -Nru hal-trinity-0.5.14/debian/hal-trinity.init hal-trinity-0.5.14/debian/hal-trinity.init
--- hal-trinity-0.5.14/debian/hal-trinity.init	1969-12-31 18:00:00.000000000 -0600
+++ hal-trinity-0.5.14/debian/hal-trinity.init	2011-07-01 13:35:45.000000000 -0500
@@ -0,0 +1,99 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          hal
+# Required-Start:    $remote_fs dbus
+# Required-Stop:     $remote_fs dbus
+# Should-Start:	     $syslog acpid
+# Should-Stop:       $syslog acpid
+# Default-Start:     2 3 4 5
+# Default-Stop:      1
+# Short-Description: Hardware abstraction layer
+# Description:       The HAL daemon collects and maintains information about
+#                    your hardware.
+### END INIT INFO
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/sbin/hald
+PIDDIR=/var/run/hald
+PIDFILE=$PIDDIR/hald.pid
+NAME=hald
+DAEMONUSER=haldaemon
+DESC="Hardware abstraction layer"
+
+. /lib/lsb/init-functions
+
+test -x $DAEMON || exit 0
+
+# Include hal defaults if available
+if [ -f /etc/default/hal ] ; then
+	. /etc/default/hal
+fi
+
+set -e
+
+do_start() {
+	if [ ! -d $PIDDIR ]; then
+		mkdir -p $PIDDIR
+		chmod 770 $PIDDIR
+		chown $DAEMONUSER:$DAEMONUSER $PIDDIR
+	fi
+	start-stop-daemon --start --oknodo --pidfile $PIDFILE \
+		--exec $DAEMON -- $DAEMON_OPTS
+}
+
+do_stop() {
+	start-stop-daemon --stop --retry 5 --oknodo --quiet --pidfile $PIDFILE \
+		--exec $DAEMON
+}
+
+check_prerequisites() {
+	UNAME=`uname`
+	if [ ! -d /proc/sys/fs/inotify ] && [ $UNAME = "Linux" ]; then
+		log_failure_msg "Can't start $DESC - enable inotify support in your kernel"
+		exit 0
+	fi
+	if [ ! -e /var/run/dbus/system_bus_socket ]; then
+		log_failure_msg "Can't start $DESC - please ensure dbus is running"
+		exit 0
+	fi
+	
+	if [ ! -d /sys/devices ] && [ $UNAME = "Linux" ]; then
+		log_failure_msg "Can't start $DESC - sysfs not mounted on /sys"
+		exit 0
+	fi
+	
+	if [ "$(stat -c %d/%i /)" != "$(stat -Lc %d/%i /proc/1/root 2>/dev/null)" ] && [ $UNAME != "GNU" ]; then
+		log_failure_msg "Can't start $DESC - detected chrooted session"
+		exit 0
+	fi
+}
+
+case "$1" in
+  start)
+	check_prerequisites
+	log_daemon_msg "Starting $DESC" "$NAME"
+	do_start
+	log_end_msg $?
+	;;
+  stop)
+	log_daemon_msg "Stopping $DESC" "$NAME"
+	do_stop
+	log_end_msg $?
+	;;
+  restart|force-reload)
+	check_prerequisites
+	log_daemon_msg "Restarting $DESC" "$NAME"
+	do_stop
+	do_start
+	log_end_msg $?
+	;;
+  status)
+	status_of_proc -p $PIDFILE $DAEMON $NAME && exit 0 || exit $?
+	;;
+  *)
+	log_success_msg "Usage: $0 {start|stop|restart|force-reload|status}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
diff -Nru hal-trinity-0.5.14/debian/hal-trinity.upstart hal-trinity-0.5.14/debian/hal-trinity.upstart
--- hal-trinity-0.5.14/debian/hal-trinity.upstart	1969-12-31 18:00:00.000000000 -0600
+++ hal-trinity-0.5.14/debian/hal-trinity.upstart	2011-07-01 13:35:45.000000000 -0500
@@ -0,0 +1,18 @@
+# hal - hardware abstraction layer
+#
+# The HAL daemon collects and maintains information about your hardware
+# and provides an abstraction layer for applications to access that
+# information and utilise the hardware.
+
+description	"hardware abstraction layer"
+
+start on (filesystem
+	  and started dbus
+	  and started udev)
+stop on (stopping dbus
+	 or stopping udev)
+
+expect fork
+respawn
+
+exec hald --daemon=yes