xrdb: use .sh session script

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

diff --git a/meta/packages/xorg-app/xrdb/60xXDefaults b/meta/packages/xorg-app/xrdb/60XDefaults.sh
similarity index 88%
rename from meta/packages/xorg-app/xrdb/60xXDefaults
rename to meta/packages/xorg-app/xrdb/60XDefaults.sh
index d3a284d8daae237e3e8f88f6313035d4108cca0d..08d8beca33ae7534f6cc94b0a0d06751caa11493 100644 (file)
--- a/meta/packages/xorg-app/xrdb/60xXDefaults
+++ b/meta/packages/xorg-app/xrdb/60XDefaults.sh
@@ -1,4 +1,3 @@
-#!/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 6f0373c3be1fbd6a8423c74fe6805b4655afdd3f..906d7d85278bc42199578a0972094da2ec9d2448 100644 (file)
--- 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/
 }