xserver-kdrive-common: change 12keymap and 90XWindowManager to .sh

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4815 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/12keymap b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/12keymap.sh
similarity index 100%
rename from meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/12keymap
rename to meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/12keymap.sh

diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90xXWindowManager b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90XWindowManager.sh
similarity index 94%
rename from meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90xXWindowManager
rename to meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90XWindowManager.sh
index 5e55da29371ab04baa74ccfe0ffec366cb0f0f25..b936dedf3b7daf9d80da7a0a42652c72a340187d 100644 (file)
--- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90xXWindowManager
+++ b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90XWindowManager.sh
@@ -1,4 +1,3 @@
-#!/bin/sh
 if [ -x $HOME/.Xsession ]; then
     exec $HOME/.Xsession
 elif [ -x /usr/bin/x-session-manager ]; then

diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
index 7bd88197d28b410471947ecdc441aeaefc4cf638..231e996c684fa00ab4c0091279ed80f4fb3a3af0 100644 (file)
--- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
+++ b/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit formfactor"
-PR = "r30"
+PR = "r31"
 
 SRC_URI = "file://etc"
 S = ${WORKDIR}