[arch-commits] Commit in kdebase-workspace/trunk (3 files)

[Andrea Scarpino]

    Date: Wednesday, October 17, 2012 @ 12:10:11
  Author: andrea
Revision: 169060

Cleanup

Modified:
  kdebase-workspace/trunk/PKGBUILD
  kdebase-workspace/trunk/kdebase-workspace.install
Deleted:
  kdebase-workspace/trunk/use-systemctl.patch

---------------------------+
 PKGBUILD                  |    2 +-
 kdebase-workspace.install |    5 -----
 use-systemctl.patch       |   13 -------------
 3 files changed, 1 insertion(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-10-17 16:10:07 UTC (rev 169059)
+++ PKGBUILD	2012-10-17 16:10:11 UTC (rev 169060)
@@ -5,7 +5,7 @@
 pkgname=kdebase-workspace
 _pkgname=kde-workspace
 pkgver=4.9.2
-pkgrel=6
+pkgrel=5
 pkgdesc="Provides the interface and basic tools for the KDE workspace"
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kde-workspace'

Modified: kdebase-workspace.install
===================================================================
--- kdebase-workspace.install	2012-10-17 16:10:07 UTC (rev 169059)
+++ kdebase-workspace.install	2012-10-17 16:10:11 UTC (rev 169060)
@@ -12,11 +12,6 @@
 	chown -R 135:135 var/lib/kdm &>/dev/null
 	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
     update-desktop-database -q
-
-    if [[ $(vercmp $2 4.9.2-6) -le 0 ]]; then
-        echo ":: KDM now uses systemctl to shutdown/reboot the system."
-        echo "   Please replace your kdmrc with the kdmrc.pacnew or install systemd-sysvcompat."
-    fi
 }
 
 post_remove() {

Deleted: use-systemctl.patch
===================================================================
--- use-systemctl.patch	2012-10-17 16:10:07 UTC (rev 169059)
+++ use-systemctl.patch	2012-10-17 16:10:11 UTC (rev 169060)
@@ -1,13 +0,0 @@
---- kde-workspace-4.9.2/kdm/config.def~	2012-10-17 13:58:07.236399517 +0000
-+++ kde-workspace-4.9.2/kdm/config.def	2012-10-17 14:01:35.181535177 +0000
-@@ -38,8 +38,8 @@
- # define HALT_CMD	"/usr/sbin/shutdown -h now"
- # define REBOOT_CMD	"/usr/sbin/shutdown -r now"
- #elif defined(__linux__)
--# define HALT_CMD	"/sbin/shutdown -h -P now"
--# define REBOOT_CMD	"/sbin/shutdown -r now"
-+# define HALT_CMD	"/usr/bin/systemctl poweroff"
-+# define REBOOT_CMD	"/usr/bin/systemctl reboot"
- #elif defined(BSD)
- # define HALT_CMD	"/sbin/shutdown -p now"
- # define REBOOT_CMD	"/sbin/shutdown -r now"