diff options
| author |   Jonathan Callen <abcd@gentoo.org> | 2011-12-12 01:15:12 +0000 |
|---|---|---|
| committer | Jonathan Callen <abcd@gentoo.org> | 2011-12-12 01:15:12 +0000 |
| commit | 4592dcffbb5ee968efcd8f20e5407d725e0f2b84 (patch) | |
| tree | baf82184da2eeb6403eb2a309ef6841c468b6237 /kde-base | |
| parent | rm old files (diff) | |
| download | gentoo-2-4592dcffbb5ee968efcd8f20e5407d725e0f2b84.tar.gz gentoo-2-4592dcffbb5ee968efcd8f20e5407d725e0f2b84.tar.bz2 gentoo-2-4592dcffbb5ee968efcd8f20e5407d725e0f2b84.zip | |
rm old files
(Portage version: 2.2.0_alpha80/cvs/Linux x86_64)
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/kdm/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/kdm/files/4.6.2_fix_halt_p1.patch | 27 | ||||
| -rw-r--r-- | kde-base/kdm/files/4.6.2_fix_halt_p2.patch | 25 |
3 files changed, 5 insertions, 53 deletions
diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog index a257d6f66ec1..2ffb91854230 100644 --- a/kde-base/kdm/ChangeLog +++ b/kde-base/kdm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdm # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.272 2011/12/11 18:52:39 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.273 2011/12/12 01:15:12 abcd Exp $ + + 12 Dec 2011; Jonathan Callen <abcd@gentoo.org> -files/4.6.2_fix_halt_p1.patch, + -files/4.6.2_fix_halt_p2.patch: + rm old files *kdm-4.7.4 (11 Dec 2011) diff --git a/kde-base/kdm/files/4.6.2_fix_halt_p1.patch b/kde-base/kdm/files/4.6.2_fix_halt_p1.patch deleted file mode 100644 index 8441ccda39d1..000000000000 --- a/kde-base/kdm/files/4.6.2_fix_halt_p1.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Oswald Buddenhagen <ossi@kde.org> -Date: Fri, 08 Apr 2011 17:02:01 +0000 -Subject: linux shutdown wants -P instead of -p -X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=4b7ec7c9966df0c705bc0c9b9bff1010475347b6 ---- -linux shutdown wants -P instead of -p - -BUG: 270228 -FIXED-IN: 4.6.3 ---- - - ---- a/kdm/config.def -+++ b/kdm/config.def -@@ -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 -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 --git a/kde-base/kdm/files/4.6.2_fix_halt_p2.patch b/kde-base/kdm/files/4.6.2_fix_halt_p2.patch deleted file mode 100644 index 44afbf763631..000000000000 --- a/kde-base/kdm/files/4.6.2_fix_halt_p2.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Oswald Buddenhagen <ossi@kde.org> -Date: Fri, 08 Apr 2011 18:58:29 +0000 -Subject: actually, it wants -h -P, because -P is just a modifier -X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=28b79d8d04cce4d0a0899cadcc8fe6fd69d38e01 ---- -actually, it wants -h -P, because -P is just a modifier - -FAIL ... - -BUG: 270228 (take 2) ---- - - ---- a/kdm/config.def -+++ b/kdm/config.def -@@ -38,7 +38,7 @@ - # define HALT_CMD "/usr/sbin/shutdown -h now" - # define REBOOT_CMD "/usr/sbin/shutdown -r now" - #elif defined(__linux__) --# define HALT_CMD "/sbin/shutdown -P now" -+# 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" - |