From f4a7ebb6e2ecbf10f4d23bd465524aa457cc0d0d Mon Sep 17 00:00:00 2001 From: Jinkun Jang Date: Sat, 16 Mar 2013 01:03:29 +0900 Subject: [PATCH] merge with master --- common/startx | 2 +- common/xinitrc | 16 ++++++---------- packaging/xorg-server-configs-mfld-blackbay.changes | 3 +++ 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/common/startx b/common/startx index c7d1c21..308059f 100755 --- a/common/startx +++ b/common/startx @@ -2,7 +2,7 @@ DISPLAY=":0" XORG_CONF=" -config /etc/X11/xorg.conf -configdir /etc/X11/xorg.conf.d " -OTHER_OPTIONS=" -ac -noreset -r +accessx 0 vt07 -nocursor -sharevts" +OTHER_OPTIONS=" -ac -noreset -r +accessx 0 vt07 -nocursor -sharevts +dpmsphone " udevadm trigger --subsystem-match=input & diff --git a/common/xinitrc b/common/xinitrc index 21a2d8c..499eb9c 100755 --- a/common/xinitrc +++ b/common/xinitrc @@ -11,6 +11,11 @@ fi /usr/bin/scim -d & +# Link .e +if [ ! -d ${HOME}/.e ]; then + ln -s /opt/home/root/.e ${HOME}/.e +fi + # set dpi if [ -x /usr/bin/xrdb ]; then if [ -e ~/.Xresources ]; then @@ -20,13 +25,4 @@ if [ -x /usr/bin/xrdb ]; then fi fi [ -x /usr/bin/rotate.sh ] && /usr/bin/rotate.sh - -# Copy .e directory if not exist -export HOME=/opt/home/app - -if [ ! -d ${HOME}/.e ]; then - cp -rf /opt/home/root/.e ${HOME}/.e - chown -R app:app ${HOME}/.e -fi - -su -c "HOME=/opt/home/app /usr/bin/enlightenment_start -profile samsung -i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it &" -l app +/usr/bin/enlightenment_start -profile samsung -i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it & diff --git a/packaging/xorg-server-configs-mfld-blackbay.changes b/packaging/xorg-server-configs-mfld-blackbay.changes index 333ed08..6357175 100644 --- a/packaging/xorg-server-configs-mfld-blackbay.changes +++ b/packaging/xorg-server-configs-mfld-blackbay.changes @@ -1,3 +1,6 @@ +* Mon Feb 25 2013 Ilkka Aulomaa submit/tizen_2.0/20121221.184847@1ac811f +- Fix for TDIS-4183. Take dpmsphone option in usage for PR3. + * Wed Oct 24 2012 Chengwei Yang - 0.0.1 - start system-server here raised a issue TZSP-3442 -- 2.7.4