summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2008-06-24 10:54:43 +0000
committerRoss Burton <ross@openedhand.com>2008-06-24 10:54:43 +0000
commit31006b91f8f1b39b2e7f7a8a7a7955253bf1647a (patch)
tree3d67c8f2f55cf3a8bff09c0061f4445475171300
parent01c743d742357cd7b592e009e20dc2cfbb0b2b36 (diff)
downloadopenembedded-core-31006b91f8f1b39b2e7f7a8a7a7955253bf1647a.tar.gz
openembedded-core-31006b91f8f1b39b2e7f7a8a7a7955253bf1647a.tar.bz2
openembedded-core-31006b91f8f1b39b2e7f7a8a7a7955253bf1647a.zip
xserver-kdrive-common: remove the xrdb session script, the xrdb package has it now
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4724 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/60xXDefaults4
-rw-r--r--meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb2
2 files changed, 1 insertions, 5 deletions
diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/60xXDefaults b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/60xXDefaults
deleted file mode 100644
index d3a284d8da..0000000000
--- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/60xXDefaults
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-if [ -e $HOME/.Xdefaults ]; then
- xrdb -merge -nocpp < $HOME/.Xdefaults
-fi
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 2f7229bdcc..fa579a4a7b 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 = "r27"
+PR = "r28"
SRC_URI = "file://etc"
S = ${WORKDIR}