xserver-kdrive-common, xtscal: move the X session script from former to latter

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

3 files changed, 9 insertions, 3 deletions

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 fa579a4a7..813123fc2 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 = "r28"
+PR = "r29"
 
 SRC_URI = "file://etc"
 S = ${WORKDIR}
diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/30xTs_Calibrate b/meta/packages/xtscal/xtscal/30xTs_Calibrate
index ee5578454..ee5578454 100644
--- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/30xTs_Calibrate
+++ b/meta/packages/xtscal/xtscal/30xTs_Calibrate
diff --git a/meta/packages/xtscal/xtscal_0.6.3.bb b/meta/packages/xtscal/xtscal_0.6.3.bb
index c2ecb5952..f518d68f3 100644
--- a/meta/packages/xtscal/xtscal_0.6.3.bb
+++ b/meta/packages/xtscal/xtscal_0.6.3.bb
@@ -4,10 +4,16 @@ SECTION = "x11/base"
 
 DEPENDS = "virtual/libx11 libxft libxcalibrate"
 
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2 \
            file://change-cross.patch;patch=1 \
-	   file://cleanup.patch;patch=1"
+	   file://cleanup.patch;patch=1 \
+           file://30xTs_Calibrate"
 
 inherit autotools
+
+do_install_append() {
+    install -d ${D}${sysconfdir}/X11/Xsession.d/
+    install -m 0755 ${WORKDIR}/30xTs_Calibrate ${D}${sysconfdir}/X11/Xsession.d/
+}