From 01c743d742357cd7b592e009e20dc2cfbb0b2b36 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross@openedhand.com>
Date: Tue, 24 Jun 2008 10:54:14 +0000
Subject: xrdb: move the xrdb xsession from xserver-kdrive-common to here

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4723 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/xorg-app/xrdb/60xXDefaults | 4 ++++
 meta/packages/xorg-app/xrdb_1.0.5.bb     | 8 ++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 meta/packages/xorg-app/xrdb/60xXDefaults

(limited to 'meta/packages/xorg-app')

diff --git a/meta/packages/xorg-app/xrdb/60xXDefaults b/meta/packages/xorg-app/xrdb/60xXDefaults
new file mode 100644
index 0000000000..d3a284d8da
--- /dev/null
+++ b/meta/packages/xorg-app/xrdb/60xXDefaults
@@ -0,0 +1,4 @@
+#!/bin/sh
+if [ -e $HOME/.Xdefaults ]; then
+    xrdb -merge -nocpp < $HOME/.Xdefaults
+fi
diff --git a/meta/packages/xorg-app/xrdb_1.0.5.bb b/meta/packages/xorg-app/xrdb_1.0.5.bb
index 177d3ab23b..6f0373c3be 100644
--- a/meta/packages/xorg-app/xrdb_1.0.5.bb
+++ b/meta/packages/xorg-app/xrdb_1.0.5.bb
@@ -4,3 +4,11 @@ DESCRIPTION = "X server resource database utility"
 LICENSE = "xrdb"
 DEPENDS += "libxmu"
 PE = "1"
+PR = "r1"
+
+SRC_URI += "file://60xXDefaults"
+
+do_install_append() {
+    install -d ${D}${sysconfdir}/X11/Xsession.d/
+    install -m 0755 ${WORKDIR}/60xXDefaults ${D}${sysconfdir}/X11/Xsession.d/
+}
-- 
cgit v1.2.3