From fa001bc0b4f7f1dea84b6d8b778eae13286b9a9c Mon Sep 17 00:00:00 2001
From: Ross Burton <ross@openedhand.com>
Date: Fri, 4 Jul 2008 09:15:57 +0000
Subject: xrdb: use .sh session script

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

(limited to 'meta')

diff --git a/meta/packages/xorg-app/xrdb/60XDefaults.sh b/meta/packages/xorg-app/xrdb/60XDefaults.sh
new file mode 100644
index 000000000..08d8beca3
--- /dev/null
+++ b/meta/packages/xorg-app/xrdb/60XDefaults.sh
@@ -0,0 +1,3 @@
+if [ -e $HOME/.Xdefaults ]; then
+    xrdb -merge -nocpp < $HOME/.Xdefaults
+fi
diff --git a/meta/packages/xorg-app/xrdb/60xXDefaults b/meta/packages/xorg-app/xrdb/60xXDefaults
deleted file mode 100644
index d3a284d8d..000000000
--- a/meta/packages/xorg-app/xrdb/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/xorg-app/xrdb_1.0.5.bb b/meta/packages/xorg-app/xrdb_1.0.5.bb
index 6f0373c3b..906d7d852 100644
--- a/meta/packages/xorg-app/xrdb_1.0.5.bb
+++ b/meta/packages/xorg-app/xrdb_1.0.5.bb
@@ -4,11 +4,11 @@ DESCRIPTION = "X server resource database utility"
 LICENSE = "xrdb"
 DEPENDS += "libxmu"
 PE = "1"
-PR = "r1"
+PR = "r2"
 
-SRC_URI += "file://60xXDefaults"
+SRC_URI += "file://60XDefaults.sh"
 
 do_install_append() {
     install -d ${D}${sysconfdir}/X11/Xsession.d/
-    install -m 0755 ${WORKDIR}/60xXDefaults ${D}${sysconfdir}/X11/Xsession.d/
+    install -m 0755 ${WORKDIR}/60XDefaults.sh ${D}${sysconfdir}/X11/Xsession.d/
 }
-- 
cgit v1.2.3