diff -Nru kdebase-workspace-4.6.2a/debian/changelog kdebase-workspace-4.6.2a/debian/changelog --- kdebase-workspace-4.6.2a/debian/changelog 2011-04-08 16:35:06.000000000 +0200 +++ kdebase-workspace-4.6.2a/debian/changelog 2011-04-09 22:46:29.000000000 +0200 @@ -1,3 +1,10 @@ +kdebase-workspace (4:4.6.2a-0ubuntu4) natty; urgency=low + + * Add kubuntu_121_kdm_halt_cmd.diff imported from upstream + upstream, bugs.kde.org/270228, LP:755570 + + -- Romain Perier Sat, 09 Apr 2011 22:44:36 +0200 + kdebase-workspace (4:4.6.2a-0ubuntu3) natty; urgency=low * Add kubuntu_120_ksysguard_sensors.diff recommended by ksysguard diff -Nru kdebase-workspace-4.6.2a/debian/patches/kubuntu_121_kdm_halt_cmd.diff kdebase-workspace-4.6.2a/debian/patches/kubuntu_121_kdm_halt_cmd.diff --- kdebase-workspace-4.6.2a/debian/patches/kubuntu_121_kdm_halt_cmd.diff 1970-01-01 01:00:00.000000000 +0100 +++ kdebase-workspace-4.6.2a/debian/patches/kubuntu_121_kdm_halt_cmd.diff 2011-04-09 22:43:47.000000000 +0200 @@ -0,0 +1,22 @@ +Author: Oswald Buddenhagen +KDE:270228 +LP:755570 + +linux shutdown wants -P instead of -p (also -P requires -h) + +Index: kdebase-workspace-4.6.2a/kdm/config.def +=================================================================== +--- kdebase-workspace-4.6.2a.orig/kdm/config.def 2011-04-09 22:23:17.000000000 +0200 ++++ kdebase-workspace-4.6.2a/kdm/config.def 2011-04-09 22:43:39.658426717 +0200 +@@ -37,7 +37,10 @@ + #ifdef _AIX + # define HALT_CMD "/usr/sbin/shutdown -h now" + # define REBOOT_CMD "/usr/sbin/shutdown -r now" +-#elif defined(BSD) || defined(__linux__) ++#elif defined(__linux__) ++# define HALT_CMD "/sbin/shutdown -h -P now" ++# define REBOOT_CMD "/sbin/shutdown -r now" ++#elif defined(BSD) + # define HALT_CMD "/sbin/shutdown -p now" + # define REBOOT_CMD "/sbin/shutdown -r now" + #elif defined(__SVR4) diff -Nru kdebase-workspace-4.6.2a/debian/patches/series kdebase-workspace-4.6.2a/debian/patches/series --- kdebase-workspace-4.6.2a/debian/patches/series 2011-04-08 16:35:05.000000000 +0200 +++ kdebase-workspace-4.6.2a/debian/patches/series 2011-04-09 22:43:18.000000000 +0200 @@ -29,3 +29,4 @@ kubuntu_118_upstart_session_events.diff kubuntu_119_remove_empty_librarypath_key.diff kubuntu_120_ksysguard_sensors.diff +kubuntu_121_kdm_halt_cmd.diff