Merge lp:~crimsun/kdebase-workspace/remove_hal_dep_from_kdm_upstart into lp:~kubuntu-packagers/kubuntu-packaging/kde-workspace

[Daniel T Chen]

247. By Daniel T Chen <crimsun@errno> 8 minutes ago
* debian/kdm.upstart:
  - hal is gone, so remove its dependency (LP: #505627)

=== modified file 'debian/changelog'
--- debian/changelog	2010-01-09 17:18:39 +0000
+++ debian/changelog	2010-01-10 20:55:21 +0000
@@ -1,8 +1,13 @@
 kdebase-workspace (4:4.3.90-0ubuntu2) UNRLEASED; urgency=low
 
+  [ Scott Kitterman ]
   * debian/kdm.upstart:
     - Make sure dbus is started before kdm (fix from gdm upstart script)
 
+  [ Daniel T Chen ]
+  * debian/kdm.upstart:
+    - hal is gone, so remove its dependency (LP: #505627)
+
  -- Scott Kitterman <[e-mail]>  Wed, 06 Jan 2010 20:06:25 -0500
 
 kdebase-workspace (4:4.3.90-0ubuntu1) lucid; urgency=low

=== modified file 'debian/kdm.upstart'
--- debian/kdm.upstart	2010-01-09 17:18:39 +0000
+++ debian/kdm.upstart	2010-01-10 20:55:21 +0000
@@ -8,7 +8,6 @@
 
 start on (filesystem
 	  and started dbus
-	  and started hal
 	  and tty-device-added KERNEL=tty7
 	  and (graphics-device-added or stopped udevtrigger))
 stop on runlevel [016]