[SCM] KDE Base Workspace module packaging branch, wheezy, updated. debian/4.8.4-4-21-g47c459d

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde-workspace.git;a=commitdiff;h=47c459d

The following commit has been merged in the wheezy branch:
commit 47c459d8bb9fe0ef808d888cf36f2d9f2ad5a909
Author: Pino Toscano <pino at debian.org>
Date:   Mon Dec 3 22:11:27 2012 +0100

    Revert "kdm.init: drop hal (#694021)"
    
    It should be evaluated the situation on !linux archs, and currently (freeze time) isn't the right time to do that.
    
    This reverts commit 9afbe5e26fda1b967e7a5ea1be6d98101e51ea18.
    
    Conflicts:
    	debian/changelog
---
 debian/changelog |    1 -
 debian/kdm.init  |    2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0382764..ca4d243 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,7 +27,6 @@ kde-workspace (4:4.8.4-5) UNRELEASED; urgency=low
     the deletion of launchers of preferred applications; patch
     upstream_Fix-deletion-of-preferred-application-launchers.patch.
     (Closes: #686131)
-  * Drop hal from kdm.init. (Closes: #694021)
   * Make kde-workspace-bin ship a /etc/kde4 directory. (Closes: #694253)
   * Make kde-workspace-bin explicitly depend on qdbus, used by startkde.
 
diff --git a/debian/kdm.init b/debian/kdm.init
index 0034b1d..e114dec 100644
--- a/debian/kdm.init
+++ b/debian/kdm.init
@@ -3,7 +3,7 @@
 # Provides:          kdm
 # Required-Start:    $local_fs $remote_fs
 # Required-Stop:     $local_fs $remote_fs
-# Should-Start:      console-screen kbd acpid dbus krb5-kdc
+# Should-Start:      console-screen kbd acpid dbus hal krb5-kdc
 # Should-Stop:       console-screen kbd
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6

-- 
KDE Base Workspace module packaging