summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2008-07-04 09:09:59 +0000
committerRoss Burton <ross@openedhand.com>2008-07-04 09:09:59 +0000
commit8fab210b2f5b850de9cc5b72aba1b6bfd2a38514 (patch)
treedb2f99ce810a20d5d63671ab6465eea486a4cae0
parent3c181f4353ad530dd19924ad0f2c2626df38271a (diff)
downloadopenembedded-core-8fab210b2f5b850de9cc5b72aba1b6bfd2a38514.tar.gz
openembedded-core-8fab210b2f5b850de9cc5b72aba1b6bfd2a38514.tar.bz2
openembedded-core-8fab210b2f5b850de9cc5b72aba1b6bfd2a38514.tar.xz
openembedded-core-8fab210b2f5b850de9cc5b72aba1b6bfd2a38514.zip
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
-rw-r--r--meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/12keymap.sh (renamed from meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/12keymap)0
-rw-r--r--meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90XWindowManager.sh (renamed from meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90xXWindowManager)1
-rw-r--r--meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb2
3 files changed, 1 insertions, 2 deletions
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
index a9d102c74..a9d102c74 100644
--- 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
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
index 5e55da293..b936dedf3 100644
--- 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 7bd88197d..231e996c6 100644
--- 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}