tizen 2.3.1 release tizen_2.3.1 submit/tizen_2.3.1/20150915.072457 tizen_2.3.1_release
authorjk7744.park <jk7744.park@samsung.com>
Tue, 8 Sep 2015 12:33:06 +0000 (21:33 +0900)
committerjk7744.park <jk7744.park@samsung.com>
Tue, 8 Sep 2015 12:33:06 +0000 (21:33 +0900)
65 files changed:
LICENSE.MIT [new file with mode: 0644]
Makefile.am
NOTICE [new file with mode: 0644]
arm-common/Xmodmap
arm-common/Xorg.arch-options [moved from i386-emulfb/xorg.conf.d/dummy with 100% similarity]
arm-common/Xorg.sh [deleted file]
arm-common/arch-preinit.d/arm-pvr [new file with mode: 0755]
arm-common/scripts/setcpu [deleted file]
arm-common/scripts/setpoll [deleted file]
arm-common/startx.in [deleted file]
arm-common/winsys_log_dump.sh [new file with mode: 0755]
arm-common/xinitrc [deleted file]
arm-common/xserver [deleted file]
arm-common/xsetrc
common/Xorg.sh [moved from i386-common/Xorg.sh with 100% similarity]
common/scripts/setcpu [moved from i386-common/scripts/setcpu with 100% similarity]
common/scripts/setpoll [moved from i386-common/scripts/setpoll with 100% similarity]
common/startx [new file with mode: 0755]
common/xinitrc [new file with mode: 0755]
common/xorg.conf [moved from arm-common/xorg.conf with 100% similarity, mode: 0644]
common/xresources [moved from arm-common/xresources with 89% similarity]
common/xserver [moved from i386-common/xserver with 100% similarity]
conf-arm-emulfb-mobile/display.conf [new file with mode: 0644]
conf-arm-emulfb-mobile/input.conf [moved from arm-emulfb/xorg.conf.d.default/input.conf with 74% similarity, mode: 0644]
conf-arm-emulfb-mobile/module.conf [new file with mode: 0644]
conf-arm-emulfb-wearable/display.conf [moved from arm-emulfb/xorg.conf.d.default/display.conf with 100% similarity, mode: 0644]
conf-arm-emulfb-wearable/input.conf [new file with mode: 0644]
conf-arm-emulfb-wearable/module.conf [new file with mode: 0644]
conf-i386-emulfb-mobile/display.conf [new file with mode: 0644]
conf-i386-emulfb-mobile/input.conf [new file with mode: 0644]
conf-i386-emulfb-mobile/module.conf [new file with mode: 0644]
conf-i386-emulfb-wearable/display.conf [new file with mode: 0644]
conf-i386-emulfb-wearable/input.conf [new file with mode: 0644]
conf-i386-emulfb-wearable/input.conf.wc1 [new file with mode: 0644]
conf-i386-emulfb-wearable/module.conf [new file with mode: 0644]
configure.ac
debian/changelog [deleted file]
debian/compat [deleted file]
debian/control [deleted file]
debian/copyright [deleted file]
debian/dirs [deleted file]
debian/docs [deleted file]
debian/rules [deleted file]
debian/rules.org [deleted file]
debian/xserver-xorg-misc-emulfb.install.in [deleted file]
debian/xserver-xorg-misc-s5pc110.install.in [deleted file]
debian/xserver-xorg-misc-s5pc110.postinst.in [deleted file]
debian/xserver-xorg-misc-s5pc210.install.in [deleted file]
debian/xserver-xorg-misc-s5pc210.postinst.in [deleted file]
debian/xserver-xorg-misc.install.in.org [deleted file]
i386-common/Xmodmap
i386-common/Xorg.arch-options [new file with mode: 0644]
i386-common/arch-preinit.d/i386-enumerate-input [new file with mode: 0755]
i386-common/startx [new file with mode: 0755]
i386-common/startx.in [deleted file]
i386-common/xinitrc
i386-common/xorg.conf [deleted file]
i386-common/xorg.service [new file with mode: 0644]
i386-common/xresources
i386-common/xresources.service [new file with mode: 0644]
i386-common/xsetrc
packaging/xorg-x11-misc.spec
xorg-x11-misc-arm-common.manifest [new file with mode: 0644]
xorg-x11-misc-emulfb.manifest [new file with mode: 0644]
xorg-x11-misc-i386-common.manifest [new file with mode: 0644]

diff --git a/LICENSE.MIT b/LICENSE.MIT
new file mode 100644 (file)
index 0000000..1c81bdc
--- /dev/null
@@ -0,0 +1,20 @@
+Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved 
+
+Permission to use, copy, modify, distribute, and sell this software
+and its documentation for any purpose is hereby granted without
+fee, provided that the above copyright notice appear in all copies
+and that both that copyright notice and this permission notice
+appear in supporting documentation, and that the name of Red Hat
+not be used in advertising or publicity pertaining to distribution
+of the software without specific, written prior permission.  Red
+Hat makes no representations about the suitability of this software
+for any purpose.  It is provided "as is" without express or implied
+warranty.
+
+THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
index f68c6d9..03c91aa 100644 (file)
@@ -1,3 +1,23 @@
+#  Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved 
+# 
+#  Permission to use, copy, modify, distribute, and sell this software and its
+#  documentation for any purpose is hereby granted without fee, provided that
+#  the above copyright notice appear in all copies and that both that
+#  copyright notice and this permission notice appear in supporting
+#  documentation, and that the name of Red Hat not be used in
+#  advertising or publicity pertaining to distribution of the software without
+#  specific, written prior permission.  Red Hat makes no
+#  representations about the suitability of this software for any purpose.  It
+#  is provided "as is" without express or implied warranty.
+# 
+#  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+#  EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+#  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+#  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+#  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+#  PERFORMANCE OF THIS SOFTWARE.
+
 bin_SCRIPTS = $(top_srcdir)/@ARCH@-common/startx       \
            $(top_srcdir)/@ARCH@-common/scripts/setcpu  \
            $(top_srcdir)/@ARCH@-common/scripts/setpoll
diff --git a/NOTICE b/NOTICE
new file mode 100644 (file)
index 0000000..c10a9c5
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,3 @@
+Copyright (c) 2011 Samsung Electronics Co., Ltd. All rights reserved.
+Except as noted, this software is licensed under MIT License.
+Please, see the LICENSE.MIT file for MIT License terms and conditions.
index 8d3facb..be42e4b 100644 (file)
@@ -8,10 +8,18 @@ keycode 225 = XF86Search
 keycode 124 = XF86PowerOff
 keycode 179 = XF86WebCam
 keycode 220 = XF86Pictures
+keycode 208 = XF86AudioPlay
+keycode 209 = XF86AudioPause
+keycode 174 = XF86AudioStop
+keycode 171 = XF86AudioNext
+keycode 173 = XF86AudioPrev
+keycode 176 = XF86AudioRewind
+keycode 216 = XF86AudioForward
+keycode 234 = XF86AudioMedia
 keycode 153 = 
 keycode 239 = 
 keycode 136 = 
 keycode 140 =
 keycode 182 =
-keycode 215 =
 keycode 172 =
+keycode 215 =
diff --git a/arm-common/Xorg.sh b/arm-common/Xorg.sh
deleted file mode 100755 (executable)
index 79a0def..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-export HOME=/root
-export DISPLAY=:0
diff --git a/arm-common/arch-preinit.d/arm-pvr b/arm-common/arch-preinit.d/arm-pvr
new file mode 100755 (executable)
index 0000000..7975cac
--- /dev/null
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+if [ -x /usr/bin/pvrsrvinit ]; then
+    pvrsrvinit start
+fi
diff --git a/arm-common/scripts/setcpu b/arm-common/scripts/setcpu
deleted file mode 100755 (executable)
index 99787dc..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = "" ]; then
-       echo "Usage> /usr/bin/setcpu <performance | ondemand>"
-       exit 1
-fi
-
-if [ "$1" = "perf" ]; then
-       echo "Setting CPU @ Performance Mode"
-       echo "performance" > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
-else
-       if [ "$1" = "performance" ]; then
-               echo "Setting CPU @ Performance Mode"
-               echo "performance" > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
-       else
-               if [ "$1" = "ondemand" ]; then
-                       echo "Setting CPU @ Ondemand Mode"
-                       echo "ondemand" > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
-               else
-                       echo "Usage> /usr/bin/setcpu <performance | ondemand>"
-                       exit 1
-               fi
-       fi
-fi
diff --git a/arm-common/scripts/setpoll b/arm-common/scripts/setpoll
deleted file mode 100755 (executable)
index 6011698..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = "" ]; then
-       echo "Usage> /usr/bin/setpoll < 0 or 1 >"
-       exit 1
-fi
-
-xinput set-prop "Pointer1" --type=int --format=8 "Evdev Use Poll" $1
diff --git a/arm-common/startx.in b/arm-common/startx.in
deleted file mode 100755 (executable)
index 2ba93f2..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-DISPLAY=":0"
-LOGDIR="/opt/var/log"
-XORG_CONF=" -config @DATADIR@/etc/X11/xorg.conf -configdir @DATADIR@/etc/X11/xorg.conf.d "
-OTHER_OPTIONS=" -logfile ${LOGDIR}/Xorg.0.log -ac -noreset +accessx 0 "
-
-#backup previous Xorg.0.log file
-if [ -e ${LOGDIR}/Xorg.0.log ]; then
-       mv ${LOGDIR}/Xorg.0.log ${LOGDIR}/prev.Xorg.0.log
-fi
-
-#backup previous Xorg.0.log.old file
-if [ -e ${LOGDIR}/Xorg.0.log.old ]; then
-       mv ${LOGDIR}/Xorg.0.log.old ${LOGDIR}/prev.Xorg.0.log.old
-fi
-
-if [ ! -e /opt/etc/X11/xorg.conf.d ]; then
-       ln -s /opt/etc/X11/xorg.conf.d.default /opt/etc/X11/xorg.conf.d
-fi
-
-if [ -e ~/.xinitrc ]; then
-       XINITRC=~/.xinitrc
-else
-       XINITRC=@PREFIX@/etc/X11/xinitrc
-fi
-
-XSERVER_OPTIONS=" ${DISPLAY} ${OTHER_OPTIONS} ${XORG_CONF} "
-
-if [ "$1" = "--gdb" ]; then
-       if [ -x /usr/bin/pvrsrvinit ]; then
-               pvrsrvinit start
-       fi
-       gdb --args Xorg ${XSERVER_OPTIONS}
-else
-       if [ "$1" = "--only" ]; then
-               if [ -x /usr/bin/pvrsrvinit ]; then
-                       pvrsrvinit start
-               fi
-
-               Xorg ${XSERVER_OPTIONS} &
-       else
-               xinit ${XINITRC} -- @PREFIX@/bin/Xorg ${XSERVER_OPTIONS} &
-       fi
-fi
-
diff --git a/arm-common/winsys_log_dump.sh b/arm-common/winsys_log_dump.sh
new file mode 100755 (executable)
index 0000000..cd808d2
--- /dev/null
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+#--------------------------------------
+#   winsys
+#--------------------------------------
+export DISPLAY=:0.0
+WINSYS_DEBUG=$1/winsys
+E17_HOME=/home/app
+mkdir -p ${WINSYS_DEBUG}
+xinfo -p 2> ${WINSYS_DEBUG}/ping.log
+xinfo -xwd_topvwins ${WINSYS_DEBUG}
+cp -af /opt/var/log/keygrab_status.txt ${WINSYS_DEBUG}
+screenshot bmp ${WINSYS_DEBUG}/slp_screenshot.bmp
+xinfo -topvwins 2> ${WINSYS_DEBUG}/xinfo_topvwins.txt
+xdbg clist > ${WINSYS_DEBUG}/xdbg_clist.log 2>&1
+xdbg drmevent_pending > ${WINSYS_DEBUG}/drmevent_pending.log 2>&1
+xberc drmmode_dump > ${WINSYS_DEBUG}/drmmode_dump.log
+find /var/log/ -name "*Xorg*" -exec cp {} ${WINSYS_DEBUG}/ \;
+xprop -root -f _E_LOG 8s -set _E_LOG ${E17_HOME}/e.log
+cat ${E17_HOME}/e.log > ${WINSYS_DEBUG}/e.log
+border_win_info -p ALL -f ${E17_HOME}/e_illume2.log
+cat ${E17_HOME}/e_illume2.log > ${WINSYS_DEBUG}/e_illume2.log
+e_comp_util -l DUMP_INFO -f ${E17_HOME}/e_comp.log
+cat ${E17_HOME}/e_comp.log > ${WINSYS_DEBUG}/e_comp.log
+cat ${E17_HOME}/e_comp.log_move > ${WINSYS_DEBUG}/e_comp.log_move
+rm ${E17_HOME}/e.log
+rm ${E17_HOME}/e_comp.log
+rm ${E17_HOME}/e_comp.log_move
+rm ${E17_HOME}/e_illume2.log
diff --git a/arm-common/xinitrc b/arm-common/xinitrc
deleted file mode 100755 (executable)
index 0a676ec..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-/usr/bin/scim -d &
-
-# Link .e
-if [ ! -d ${HOME}/.e ]; then
-       ln -s /opt/home/root/.e ${HOME}/.e
-fi
-
-# Remapping the keycodes to our key-symbols
-if [ -x /usr/bin/xmodmap ]; then
-       if [ -e ~/.Xmodmap ]; then
-               xmodmap ~/.Xmodmap
-       else
-               xmodmap /opt/etc/X11/Xmodmap
-       fi
-fi
-
-# set dpi
-if [ -x /usr/bin/xrdb ]; then
-       if [ -e ~/.Xresources ]; then
-               /usr/bin/xrdb -load -nocpp ~/.Xresources
-       else
-               /usr/bin/xrdb -load -nocpp /opt/etc/X11/Xresources
-       fi
-fi
-
-/usr/bin/enlightenment_start -profile samsung -i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it &
-/usr/etc/X11/xsetrc &
diff --git a/arm-common/xserver b/arm-common/xserver
deleted file mode 100755 (executable)
index 40f2667..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-
-set -e
-
-export DISPLAY=:0
-export PATH=/bin:/usr/bin/:/sbin:/usr/sbin
-
-case "$1" in
-  start)
-    is_running=`ps ax | awk '{ print \$5 }' | grep Xorg` || true
-    if [ "${is_running}" = "" ]; then                          
-        echo "Starting Xorg server..."
-        /usr/bin/startx
-    else
-        echo "Xorg server is running already..."
-    fi
-  ;;
-
-  restart|reload|force-reload)
-    is_running=`ps ax | awk '{ print \$5 }' | grep Xorg` || true                
-    if [ "${is_running}" != "" ]; then                                           
-        $0 stop || true
-        sleep 3
-    fi
-    $0 start || true
-  ;;
-
-  stop)
-    is_running=`ps ax | awk '{ print \$5 }' | grep Xorg` || true
-    if [ "${is_running}" != "" ]; then                        
-        echo "Stopping Xorg server..."
-        killall -9 Xorg
-    else
-        echo "Xorg server is not running..."
-    fi
-  ;;
-
-  status)
-    is_running=`ps ax | awk '{ print \$5 }' | grep Xorg` || true
-    if [ "${is_running}" = "" ]; then
-        echo "Xorg server is not running..."
-    else
-        echo "Xorg server is running..."
-    fi
-  ;;
-
-  *)
-    echo "Usage: /etc/init.d/xserver {start|stop|status|restart|reload|force-reload}"
-    exit 1
-    ;;
-esac
-
-exit 0
index c35840d..e614117 100755 (executable)
@@ -1,17 +1 @@
-xset -r 123
-xset -r 122
-xset -r 231
-xset -r 177
-xset -r 147
-xset -r 166
-xset -r 225
-xset -r 124
-xset -r 179
-xset -r 220
-xset -r 153
-xset -r 239
-xset -r 136
-xset -r 140
-xset -r 182
-xset -r 215
-xset -r 172
+xset -r 123 -r 122 -r 231 -r 177 -r 147 -r 166 -r 225 -r 124 -r 179 -r 220 -r 208 -r 209 -r 174 -r 171 -r 173 -r 176 -r 216 -r 234 &
similarity index 100%
rename from i386-common/Xorg.sh
rename to common/Xorg.sh
diff --git a/common/startx b/common/startx
new file mode 100755 (executable)
index 0000000..d8e579d
--- /dev/null
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+[ -r /etc/X11/Xorg.arch-options ] && . /etc/X11/Xorg.arch-options
+
+DISPLAY=":0"
+LOGDIR="/var/log"
+XORG_CONF=" -config /etc/X11/xorg.conf -configdir /etc/X11/xorg.conf.d "
+OTHER_OPTIONS=" -logfile /var/log/Xorg.0.log -ac -noreset +accessx 0 +dpmsphone $XORG_ARCH_OPTS"
+
+# Xorg automatically preserves logs in $LOGDIR/Xorg.DPY.log.(old)
+
+
+for scriptlet in $(find /etc/X11/arch-preinit.d ! -type d); do
+    test -x "$scriptlet" && . "$scriptlet"
+done
+
+if [ -e ~/.xinitrc ]; then
+       XINITRC=~/.xinitrc
+else
+       XINITRC=/etc/X11/xinitrc
+fi
+
+XSERVER_OPTIONS=" ${DISPLAY} ${OTHER_OPTIONS} ${XORG_CONF} "
+
+if [ "$1" = "--gdb" ]; then
+       gdb --args Xorg ${XSERVER_OPTIONS}
+else
+       if [ "$1" = "--only" ]; then
+
+               Xorg ${XSERVER_OPTIONS} &
+       else
+               xinit ${XINITRC} -- /usr/bin/Xorg ${XSERVER_OPTIONS} &
+       fi
+fi
+
diff --git a/common/xinitrc b/common/xinitrc
new file mode 100755 (executable)
index 0000000..b3beafa
--- /dev/null
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+/usr/bin/scim -d &
+
+# Link .e
+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
+
+E17_USER=`id -u app`
+E17_GROUP=`id -g app`
+
+HOME=/opt/home/app USER=app /usr/bin/enlightenment_start -profile samsung -i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it -user ${E17_USER} -group ${E17_GROUP} &
+#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
+
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from arm-common/xorg.conf
rename to common/xorg.conf
similarity index 89%
rename from arm-common/xresources
rename to common/xresources
index 9e4b2c1..0f61295 100755 (executable)
@@ -9,7 +9,7 @@ case "$1" in
       if [ -e ~/.Xresources ]; then
                /usr/bin/xrdb -load -nocpp ~/.Xresources
       else
-        /usr/bin/xrdb -load -nocpp /opt/etc/X11/Xresources
+        /usr/bin/xrdb -load -nocpp /etc/X11/Xresources
       fi
       touch /tmp/hibernation/xresources_ready
     fi
similarity index 100%
rename from i386-common/xserver
rename to common/xserver
diff --git a/conf-arm-emulfb-mobile/display.conf b/conf-arm-emulfb-mobile/display.conf
new file mode 100644 (file)
index 0000000..4b56980
--- /dev/null
@@ -0,0 +1,26 @@
+Section "ServerLayout"
+        Identifier              "Test Layout"
+        Screen          0       "Screen0" 0 0
+       InputDevice             "Gesture"
+EndSection
+
+Section "Screen"
+        Identifier              "Screen0"
+        Device                  "emulfb"
+        Monitor                 "Monitor0"
+#        SubSection              "Display"
+#                Modes           "320x480"
+#        EndSubSection
+EndSection
+
+Section "Monitor"
+        Identifier              "Monitor0"
+        Option                  "DPMS"  "true"
+#       DisplaySize             46 76
+EndSection
+
+Section "Device"
+        Identifier              "emulfb"
+        Driver                  "emulfb"
+#        Option                  "fbdev"         "/dev/fb3"
+EndSection
old mode 100755 (executable)
new mode 100644 (file)
similarity index 74%
rename from arm-emulfb/xorg.conf.d.default/input.conf
rename to conf-arm-emulfb-mobile/input.conf
index 6e9171a..dfbbbc6
@@ -9,18 +9,18 @@ Section "InputClass"
         MatchIsTouchScreen "on"
         MatchDevicePath "/dev/input/event*"
         Driver "evdevmultitouch"
-        Option "MultiTouch"     "3"
+        Option "MultiTouch"     "10"
 EndSection
 
 Section "InputClass"
-        Identifier "evdev pointer catchall"  
+        Identifier "evdev pointer catchall"
         MatchIsPointer "on"
         MatchDevicePath "/dev/input/event*"
         Driver "evdev"
-EndSection  
+EndSection
 
-Section "InputClass"                           
-        Identifier "evdev keyboard catchall"              
+Section "InputClass"
+        Identifier "evdev keyboard catchall"
         MatchIsKeyboard "on"
         MatchDevicePath "/dev/input/event*"
         Driver "evdev"
@@ -30,5 +30,4 @@ Section "InputDevice"
         Identifier "Gesture"
         Driver  "gesture"
         Option  "Device"        "/dev/null"
-        Option  "Activate"      "1"
 EndSection
diff --git a/conf-arm-emulfb-mobile/module.conf b/conf-arm-emulfb-mobile/module.conf
new file mode 100644 (file)
index 0000000..05b566c
--- /dev/null
@@ -0,0 +1,5 @@
+Section "Module"
+    SubSection  "xdbg"
+        Option  "log_path"   "/var/log/Xorg.0.log2"
+    EndSubSection
+EndSection
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from arm-emulfb/xorg.conf.d.default/display.conf
rename to conf-arm-emulfb-wearable/display.conf
diff --git a/conf-arm-emulfb-wearable/input.conf b/conf-arm-emulfb-wearable/input.conf
new file mode 100644 (file)
index 0000000..7c4f59b
--- /dev/null
@@ -0,0 +1,33 @@
+Section "ServerFlags"
+        Option "AllowEmptyInput" "true"
+        Option "AutoAddDevices" "true"
+        Option "AutoEnableDevices" "true"
+EndSection
+
+Section "InputClass"
+        Identifier "evdev touchscreen catchall"
+        MatchIsTouchScreen "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "evdevmultitouch"
+        Option "MultiTouch" "2"
+EndSection
+
+Section "InputClass"
+        Identifier "evdev pointer catchall"
+        MatchIsPointer "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "evdev"
+EndSection
+
+Section "InputClass"
+        Identifier "evdev keyboard catchall"
+        MatchIsKeyboard "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "evdev"
+EndSection
+
+Section "InputDevice"
+        Identifier "Gesture"
+        Driver  "gesture"
+        Option  "Device"        "/dev/null"
+EndSection
diff --git a/conf-arm-emulfb-wearable/module.conf b/conf-arm-emulfb-wearable/module.conf
new file mode 100644 (file)
index 0000000..05b566c
--- /dev/null
@@ -0,0 +1,5 @@
+Section "Module"
+    SubSection  "xdbg"
+        Option  "log_path"   "/var/log/Xorg.0.log2"
+    EndSubSection
+EndSection
diff --git a/conf-i386-emulfb-mobile/display.conf b/conf-i386-emulfb-mobile/display.conf
new file mode 100644 (file)
index 0000000..3173c3e
--- /dev/null
@@ -0,0 +1,24 @@
+Section "ServerLayout"
+       Identifier              "Test Layout"
+       Screen          0       "Screen0" 0 0
+EndSection
+
+Section "Screen"
+       Identifier              "Screen0"
+       Device                  "emulfb"
+       Monitor                 "Monitor0"
+       #       SubSection              "Display"
+       #               Modes           "480x800"
+       #       EndSubSection
+EndSection
+
+Section "Monitor"
+       Identifier              "Monitor0"
+       Option                  "DPMS"  "true"
+EndSection
+
+Section "Device"
+       Identifier              "emulfb"
+       Driver                  "vigs"
+       Option                  "fbdev"         "/dev/fb0"
+EndSection
diff --git a/conf-i386-emulfb-mobile/input.conf b/conf-i386-emulfb-mobile/input.conf
new file mode 100644 (file)
index 0000000..0975681
--- /dev/null
@@ -0,0 +1,28 @@
+Section "InputClass"
+       Identifier "evdev pointer catchall"
+       MatchIsPointer "on"
+       MatchDevicePath "/dev/input/event*"
+       Driver "evdev"
+EndSection
+
+Section "InputClass"
+       Identifier "evdev pointer catchall"
+       MatchIsTablet   "on"
+       MatchDevicePath "/dev/input/event*"
+       Driver "evdev"
+EndSection
+
+Section "InputClass"
+        Identifier "evdev touchscreen catchall"
+        MatchIsTouchScreen "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "evdevmultitouch"
+       Option "MultiTouch"     "6"
+EndSection
+
+Section "InputClass"
+       Identifier "evdev keyboard catchall"
+       MatchIsKeyboard "on"
+       MatchDevicePath "/dev/input/event*"
+       Driver "evdev"
+EndSection
diff --git a/conf-i386-emulfb-mobile/module.conf b/conf-i386-emulfb-mobile/module.conf
new file mode 100644 (file)
index 0000000..05b566c
--- /dev/null
@@ -0,0 +1,5 @@
+Section "Module"
+    SubSection  "xdbg"
+        Option  "log_path"   "/var/log/Xorg.0.log2"
+    EndSubSection
+EndSection
diff --git a/conf-i386-emulfb-wearable/display.conf b/conf-i386-emulfb-wearable/display.conf
new file mode 100644 (file)
index 0000000..6235548
--- /dev/null
@@ -0,0 +1,25 @@
+Section "ServerLayout"
+       Identifier              "Test Layout"
+       Screen          0       "Screen0" 0 0
+       InputDevice             "Gesture"
+EndSection
+
+Section "Screen"
+       Identifier              "Screen0"
+       Device                  "emulfb"
+       Monitor                 "Monitor0"
+       #       SubSection              "Display"
+       #               Modes           "480x800"
+       #       EndSubSection
+EndSection
+
+Section "Monitor"
+       Identifier              "Monitor0"
+       Option                  "DPMS"  "true"
+EndSection
+
+Section "Device"
+       Identifier              "emulfb"
+       Driver                  "vigs"
+       Option                  "fbdev"         "/dev/fb0"
+EndSection
diff --git a/conf-i386-emulfb-wearable/input.conf b/conf-i386-emulfb-wearable/input.conf
new file mode 100644 (file)
index 0000000..e263e48
--- /dev/null
@@ -0,0 +1,51 @@
+Section "InputClass"
+       Identifier "evdev pointer catchall"
+       MatchIsPointer "on"
+       MatchDevicePath "/dev/input/event*"
+       Driver "evdev"
+EndSection
+
+Section "InputClass"
+       Identifier "evdev pointer catchall"
+       MatchIsTablet   "on"
+       MatchDevicePath "/dev/input/event*"
+       Driver "evdev"
+EndSection
+
+Section "InputClass"
+       Identifier "evdev touchscreen catchall"
+       MatchIsTouchScreen "on"
+       MatchDevicePath "/dev/input/event*"
+       Driver "evdevmultitouch"
+       Option "MultiTouch" "2"
+EndSection
+
+Section "InputClass"
+       Identifier "evdev keyboard catchall"
+       MatchIsKeyboard "on"
+       MatchDevicePath "/dev/input/event*"
+       Driver "evdev"
+EndSection
+
+Section "InputDevice"
+        Identifier "Gesture"
+        Driver  "gesture"
+        Option  "Device"                               "/dev/null"
+        Option "Activate"                              "1"
+        Option "ScreenWidth"                   "320"
+        Option "ScreenHeight"                  "320"
+        Option  "FlickDownKeycode"             "166"
+        Option  "FlickUpKeycode"               "147"
+        Option  "FlickPressArea"               "15"
+        Option  "FlickPressArea_LEFT"          "50"
+        Option "FlickMinimumHeight"    "25"
+        Option "ShutdownKeycode"               "0"
+        Option "SingleTapThresHold"    "200"
+        Option "DoubleTapThresHold"    "300"
+        Option "HoldAreaThresHold"             "1.3"
+        Option "HoldMoveThresHold"             "20"
+        Option "HoldTimeThresHold"             "500"
+        Option  "ActivateFlickDown"     "1"
+        Option  "ActivateFlickUp"       "0"
+        Option  "ActivateFlickRight"    "0"
+EndSection
diff --git a/conf-i386-emulfb-wearable/input.conf.wc1 b/conf-i386-emulfb-wearable/input.conf.wc1
new file mode 100644 (file)
index 0000000..b329efd
--- /dev/null
@@ -0,0 +1,51 @@
+Section "InputClass"
+       Identifier "evdev pointer catchall"
+       MatchIsPointer "on"
+       MatchDevicePath "/dev/input/event*"
+       Driver "evdev"
+EndSection
+
+Section "InputClass"
+       Identifier "evdev pointer catchall"
+       MatchIsTablet   "on"
+       MatchDevicePath "/dev/input/event*"
+       Driver "evdev"
+EndSection
+
+Section "InputClass"
+       Identifier "evdev touchscreen catchall"
+       MatchIsTouchScreen "on"
+       MatchDevicePath "/dev/input/event*"
+       Driver "evdevmultitouch"
+       Option "MultiTouch" "2"
+EndSection
+
+Section "InputClass"
+       Identifier "evdev keyboard catchall"
+       MatchIsKeyboard "on"
+       MatchDevicePath "/dev/input/event*"
+       Driver "evdev"
+EndSection
+
+Section "InputDevice"
+        Identifier "Gesture"
+        Driver  "gesture"
+        Option  "Device"                                       "/dev/null"
+        Option  "Activate"                                     "1"
+        Option "ScreenWidth"                   "320"
+        Option "ScreenHeight"                  "320"
+        Option  "FlickDownKeycode"             "166"
+        Option  "FlickUpKeycode"               "177"
+        Option  "FlickPressArea"               "45"
+        Option  "FlickPressArea_LEFT"          "80"
+        Option "FlickMinimumHeight"    "80"
+        Option "ShutdownKeycode"               "0"
+        Option "SingleTapThresHold"    "200"
+        Option "DoubleTapThresHold"    "400"
+        Option "HoldAreaThresHold"             "1.3"
+        Option "HoldMoveThresHold"             "20"
+        Option "HoldTimeThresHold"             "500"
+        Option  "ActivateFlickDown"     "1"
+        Option  "ActivateFlickUp"       "0"
+        Option  "ActivateFlickRight"    "0"
+EndSection
diff --git a/conf-i386-emulfb-wearable/module.conf b/conf-i386-emulfb-wearable/module.conf
new file mode 100644 (file)
index 0000000..05b566c
--- /dev/null
@@ -0,0 +1,5 @@
+Section "Module"
+    SubSection  "xdbg"
+        Option  "log_path"   "/var/log/Xorg.0.log2"
+    EndSubSection
+EndSection
index 62d121b..a3cc640 100644 (file)
@@ -1,4 +1,24 @@
+#  Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved 
+# 
+#  Permission to use, copy, modify, distribute, and sell this software and its
+#  documentation for any purpose is hereby granted without fee, provided that
+#  the above copyright notice appear in all copies and that both that
+#  copyright notice and this permission notice appear in supporting
+#  documentation, and that the name of Red Hat not be used in
+#  advertising or publicity pertaining to distribution of the software without
+#  specific, written prior permission.  Red Hat makes no
+#  representations about the suitability of this software for any purpose.  It
+#  is provided "as is" without express or implied warranty.
+# 
+#  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+#  EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+#  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+#  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+#  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+#  PERFORMANCE OF THIS SOFTWARE.
 #                                               -*- Autoconf -*-
+
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100755 (executable)
index b36fde1..0000000
+++ /dev/null
@@ -1,955 +0,0 @@
-xserver-xorg-misc (0.0.1-122) unstable; urgency=low
-
-  * add scim command in xinitrc of i386 and arm (rollback 120)
-  * Git: slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-122
-
- -- Jihoon Kim <jihoon48.kim@samsung.com>  Fri, 01 Jun 2012 17:27:45 +0900
-
-xserver-xorg-misc (0.0.1-121) unstable; urgency=low
-
-  * Replace vconftool command with file creation of /tmp/hibernation/xresources_ready
-  * Git: slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-121
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Fri, 01 Jun 2012 11:13:24 +0900
-
-xserver-xorg-misc (0.0.1-120) unstable; urgency=low
-
-  * Remove scim command(s) from xinitrc both from i386 and arm
-  * Git: slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-120
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Tue, 29 May 2012 15:19:35 +0900
-
-xserver-xorg-misc (0.0.1-119) unstable; urgency=low
-
-  * Change the value of "MultiTouch" from 2 to 3 in xorg.conf for i386
-  * Remove udevadm trigger command from xinitrc for arm
-  * Git: slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-119
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Fri, 27 Apr 2012 17:14:04 +0900
-
-xserver-xorg-misc (0.0.1-118) unstable; urgency=low
-
-  * remove system_server in xinitrc
-  * Git: slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-118
-
- -- SooChan Lim <sc1.lim@samsung.com>  Thu, 19 Apr 2012 16:16:51 +0900
-
-xserver-xorg-misc (0.0.1-117) unstable; urgency=low
-
-  * Booting sequence changed : S20xserver->S02xserver for arm
-  * Modify startx.in not to trigger udev
-  * Git: slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-117
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Mon, 16 Apr 2012 20:42:46 +0900
-
-xserver-xorg-misc (0.0.1-116) unstable; urgency=low
-
-  * Fix Xmodmap installation problem for arm-emulfb
-  * Git: slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-115
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Wed, 22 Feb 2012 11:09:22 +0900
-
-xserver-xorg-misc (0.0.1-115) unstable; urgency=low
-
-  * change driver name of emulator
-  * Git: slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-115
-
- -- Boram Park <boram1288.park@samsung.com>  Fri, 23 Dec 2011 10:11:28 +0900
-
-xserver-xorg-misc (0.0.1-114) unstable; urgency=low
-
-  * Add a Section for Tablet using evdev driver in simulator
-  * Git: 165.213.180.234:slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-114
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Fri, 09 Dec 2011 11:05:36 +0900
-
-xserver-xorg-misc (0.0.1-113) unstable; urgency=low
-
-  * Modify xorg.conf in i386-common for supporting multitouch in simulator
-  * Git: 165.213.180.234:slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-113
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Wed, 07 Dec 2011 11:50:58 +0900
-
-xserver-xorg-misc (0.0.1-112) unstable; urgency=low
-
-  * Enable/activate gesture driver
-  * Git: 165.213.180.234:slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-112
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Mon, 21 Nov 2011 17:24:28 +0900
-
-xserver-xorg-misc (0.0.1-111) unstable; urgency=low
-
-  * enable DPMS at i386
-  * Git: 165.213.180.234:slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-111
-
- -- SooChan Lim <sc1.lim@samsung.com>  Tue, 15 Nov 2011 17:42:10 +0900
-
-xserver-xorg-misc (0.0.1-110) unstable; urgency=low
-
-  * cleanup xinitrc file - E's configuration symbolic link
-  * Git: 165.213.180.234:slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-110
-
- -- Doyoun Kang <doyoun.kang@samsung.com>  Fri, 11 Nov 2011 19:19:19 +0900
-
-xserver-xorg-misc (0.0.1-109) unstable; urgency=low
-
-  * disable Gesture
-  * Git: 165.213.180.234:slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-109
-
- -- SooChan Lim <sc1.lim@samsung.com>  Wed, 09 Nov 2011 11:49:32 +0900
-
-xserver-xorg-misc (0.0.1-108) unstable; urgency=low
-
-  * set dpi at xinitrc
-  * Git: 165.213.180.234:slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-108
-
- -- SooChan Lim <sc1.lim@samsung.com>  Fri, 04 Nov 2011 19:22:00 +0900
-
-xserver-xorg-misc (0.0.1-107) unstable; urgency=low
-
-  * 1. Remove unused symbolic link in xinitrc file.
-    2. Add option "-profile samsung" to enlightenment_start in xinitrc file.
-    3. Add gesture driver configuration in display.conf and input.conf
-  * Git: 165.213.180.234:slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-107
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Wed, 02 Nov 2011 17:58:21 +0900
-
-xserver-xorg-misc (0.0.1-106) unstable; urgency=low
-
-  * Remove keysym redundencies (i.e. XF86AudioPlay, XF86AudioPause)
-  * Git: 165.213.180.234:slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-106
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Thu, 13 Oct 2011 11:18:07 +0900
-
-xserver-xorg-misc (0.0.1-105) unstable; urgency=low
-
-  * add option to support hw overlay
-  * Git: 165.213.180.234:slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-105
-
- -- SooChan Lim <sc1.lim@samsung.com>  Wed, 21 Sep 2011 19:31:53 +0900
-
-xserver-xorg-misc (0.0.1-104) unstable; urgency=low
-
-  * Remove startsapwood
-  * Git: 165.213.180.234:slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-104
-
- -- Boram Park <boram1288.park@samsung.com>  Tue, 30 Aug 2011 12:03:26 +0900
-
-xserver-xorg-misc (0.0.1-103) unstable; urgency=low
-
-  * [i386] Modify startx, xorg.conf to enable input device hotplugging on Xserver on i386 machine using udev
-  * Git: 165.213.180.234:slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-103
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Mon, 22 Aug 2011 15:47:23 +0900
-
-xserver-xorg-misc (0.0.1-102) unstable; urgency=low
-
-  * Revert previous wrong changes
-  * Git: 165.213.180.234:slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-102
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Tue, 16 Aug 2011 20:33:04 +0900
-
-xserver-xorg-misc (0.0.1-101) unstable; urgency=low
-
-  * Modify startx and xorg.conf in i386-common
-  * Git: 165.213.180.234:slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-101
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Tue, 16 Aug 2011 20:28:40 +0900
-
-xserver-xorg-misc (0.0.1-100) unstable; urgency=low
-
-  * Add xorg.conf.d.slp10 in arm-c210
-  * Git: 165.213.180.234:slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-100
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Tue, 16 Aug 2011 10:47:18 +0900
-
-xserver-xorg-misc (0.0.1-99) unstable; urgency=low
-
-  * change the name of binary packages
-  * Git: 165.213.180.234:slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-99
-
- -- SooChan Lim <sc1.lim@samsung.com>  Fri, 22 Jul 2011 14:07:41 +0900
-
-xserver-xorg-misc (0.0.1-98) unstable; urgency=low
-
-  * Remove a command line for executing boot-animation in i386's xinitrc file.
-  * Git: 165.213.180.234:slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-98
-
- -- Doyoun Kang <doyoun.kang@samsung.com>  Tue, 19 Jul 2011 16:50:11 +0900
-
-xserver-xorg-misc (0.0.1-97) unstable; urgency=low
-
-  * change the name of the display modules
-  * Git: 165.213.180.234:slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-97
-
- -- SooChan Lim <sc1.lim@samsung.com>  Mon, 18 Jul 2011 14:03:50 +0900
-
-xserver-xorg-misc (0.0.1-96) unstable; urgency=low
-
-  * Add udev trigger commands for drm/input subsystem for startx script for arm
-  * Change driver name from 'fbdev' to 'sec'
-  * Git: 165.213.180.234:slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-96
-
- -- Boram Park <boram1288.park@samsung.com>  Wed, 13 Jul 2011 19:47:31 +0900
-
-xserver-xorg-misc (0.0.1-95) unstable; urgency=low
-
-  * add sw_exa option
-  * Git: 165.213.180.234:slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-95
-
- -- SooChan Lim <sc1.lim@samsung.com>  Fri, 03 Jun 2011 15:34:38 +0900
-
-xserver-xorg-misc (0.0.1-94) unstable; urgency=low
-
-  * oal rollback
-  * Git: 165.213.180.234:slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-94
-
- -- SooChan Lim <sc1.lim@samsung.com>  Fri, 08 Apr 2011 14:02:34 +0900
-
-xserver-xorg-misc (0.0.1-93) unstable; urgency=low
-
-  * change the xorg.conf.d path
-  * Git: 165.213.180.234:slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-93
-
- -- SooChan Lim <sc1.lim@samsung.com>  Tue, 05 Apr 2011 21:46:54 +0900
-
-xserver-xorg-misc (0.0.1-92) unstable; urgency=low
-
-  * oal work
-  * Git: 165.213.180.234:slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-92
-
- -- SooChan Lim <sc1.lim@samsung.com>  Tue, 05 Apr 2011 10:39:23 +0900
-
-xserver-xorg-misc (0.0.1-91) unstable; urgency=low
-
-  * Modify xinitrc file to create desktop cache files
-  * Git: 165.213.180.234:slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-91
-
- -- Doyoun Kang <doyoun.kang@samsung.com>  Wed, 16 Mar 2011 19:09:55 +0900
-
-xserver-xorg-misc (0.0.1-90) unstable; urgency=low
-
-  * Remove "xset r on &" from arm-common/xinitrc to unset key repeat
-  * Git: 165.213.180.234:slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-90
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Mon, 07 Mar 2011 10:04:23 +0900
-
-xserver-xorg-misc (0.0.1-89) unstable; urgency=low
-
-  * add use_vsyn option to be false at c210
-  * Git: 165.213.180.234:slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-89
-
- -- SooChan Lim <sc1.lim@samsung.com>  Sun, 06 Mar 2011 14:51:54 +0900
-
-xserver-xorg-misc (0.0.1-88) unstable; urgency=low
-
-  * Fix Xmodmap installation problem for i386
-  * Fix boot-animation option from "-start' to "--start"
-  * Git: 165.213.180.234:slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-88
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Tue, 22 Feb 2011 18:44:49 +0900
-
-xserver-xorg-misc (0.0.1-87) unstable; urgency=low
-
-  * Make Xmodmap file unique (C210 Keymap == C110 Keymap)
-  * Git: 165.213.180.234:slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-87
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Wed, 16 Feb 2011 19:21:18 +0900
-
-xserver-xorg-misc (0.0.1-86) unstable; urgency=low
-
-  * Modify *-common/xinitrc to execute enlightenment_start in background
-  * Git: 165.213.180.234:slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-86
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Fri, 11 Feb 2011 15:30:48 +0900
-
-xserver-xorg-misc (0.0.1-85) unstable; urgency=low
-
-  * Modify arm-c210/Xmodmap file to remove redundant keysym (XF86Phone)
-  * Git: 165.213.180.234:slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-85
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Sun, 06 Feb 2011 15:32:59 +0900
-
-xserver-xorg-misc (0.0.1-84) unstable; urgency=low
-
-  * Modify xinitrc to import Xmodmap file under /opt/etc/X11/
-  * Git: 165.213.180.234:slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-84
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Tue, 25 Jan 2011 14:15:52 +0900
-
-xserver-xorg-misc (0.0.1-83) unstable; urgency=low
-
-  * Add xorg.conf.d.slp7 directory and files in it under arm-c210 directory
-  * Move/copy Xmodmap file under arm-c110 and arm-c210
-  * Git: 165.213.180.234:slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-83
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Tue, 25 Jan 2011 10:30:57 +0900
-
-xserver-xorg-misc (0.0.1-82) unstable; urgency=low
-
-  * Add an option "-i" into arm-common/xresources
-  * Git: 165.213.180.234:slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-82
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Tue, 28 Dec 2010 13:23:46 +0900
-
-xserver-xorg-misc (0.0.1-81) unstable; urgency=low
-
-  * Modify files to create 3 binary packages for arm (-sec-c110, -sec-c210 and
-    -sec-emulfb)
-  * Modify files to create 1 binary package for i386 (-sec-emulfb)
-  * Git: 165.213.180.234:slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-81
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Fri, 10 Dec 2010 16:01:07 +0900
-
-xserver-xorg-misc (0.0.1-80) unstable; urgency=low
-
-  * Add an option "-f" into vconftool cmdline in arm/xresources
-  * Git: 165.213.180.234:slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-80
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Wed, 08 Dec 2010 13:46:01 +0900
-
-xserver-xorg-misc (0.0.1-79) unstable; urgency=low
-
-  * Modify Xmodmap for Cancel key (keycode 231 = Cancel)
-  * Git: 165.213.180.234:/git/slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-79
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Fri, 03 Dec 2010 17:51:42 +0900
-
-xserver-xorg-misc (0.0.1-78) unstable; urgency=low
-
-  * Set evdev as the driver for pointer and keyboard device in x86 simulator
-  * Git: 165.213.180.234:/git/slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-78
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Thu, 02 Dec 2010 18:14:31 +0900
-
-xserver-xorg-misc (0.0.1-77) unstable; urgency=low
-
-  * Modify display conf for p1(Rotation CW -> CCW)
-  * Git: 165.213.180.234:/git/slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-77
-
- -- Sangjin Lee <lsj119@samsung.com>  Tue, 30 Nov 2010 17:51:10 +0900
-
-xserver-xorg-misc (0.0.1-76) unstable; urgency=low
-
-  * Copy xorg.conf.d.default/input.conf to xorg.conf.d.c210/input.conf
-  * Remove "Resolution" option from input.conf in xorg.conf.d.default and
-    xorg.conf.d.c210
-  * Git: 165.213.180.234:/git/slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-76
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Fri, 26 Nov 2010 22:30:56 +0900
-
-xserver-xorg-misc (0.0.1-75) unstable; urgency=low
-
-  * Modify arm/xresources to set vconf key
-    (memory/hibernation/xresources_ready)
-  * Git: 165.213.180.234:/git/slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-75
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Tue, 23 Nov 2010 16:29:06 +0900
-
-xserver-xorg-misc (0.0.1-74) unstable; urgency=low
-
-  * Modify the display conf for p1
-  * Git: 165.213.180.234:/git/slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-74
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Mon, 15 Nov 2010 13:02:08 +0900
-
-xserver-xorg-misc (0.0.1-73) unstable; urgency=low
-
-  * Modify the display conf for the unity sec
-  * Git: 165.213.180.234:/git/slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-73
-
- -- SooChan Lim <sc1.lim@samsung.com>  Fri, 12 Nov 2010 15:04:10 +0900
-
-xserver-xorg-misc (0.0.1-72) unstable; urgency=low
-
-  * Modify arm/xresources to set vconf key when it runs at booting time
-  * Git: 165.213.180.234:/git/slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-72
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Fri, 12 Nov 2010 11:15:29 +0900
-
-xserver-xorg-misc (0.0.1-71) unstable; urgency=low
-
-  * Modify input.conf in xorg.conf.d* directories to use evdev driver for
-    keyboard device instead of using evkbd driver
-  * Git: 165.213.180.234:/git/slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-71
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Wed, 10 Nov 2010 15:58:06 +0900
-
-xserver-xorg-misc (0.0.1-70) unstable; urgency=low
-
-  * Re-applied the changes in the version 0.0.1-68
-    (Modify arm/xinitrc not to import /opt/etc/X11/Xmodmap file automatically)
-  * Git: 165.213.180.234:/git/slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-70
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Tue, 09 Nov 2010 11:02:47 +0900
-
-xserver-xorg-misc (0.0.1-69) unstable; urgency=low
-
-  * Rollback the previous change(s) of 0.0.1-68
-  * Git: 165.213.180.234:/git/slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-69
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Mon, 08 Nov 2010 19:12:34 +0900
-
-xserver-xorg-misc (0.0.1-68) unstable; urgency=low
-
-  * Modify arm/xinitrc not to import /opt/etc/X11/Xmodmap file automatically
-  * Instead of importing Xmodmap file, the symbols for hardware key for SLP in
-    inet file in xkeyboard-config package were modified
-  * This changes will only be applied for arm (in arm directory)
-  * Git: 165.213.180.234:/git/slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-68
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Mon, 08 Nov 2010 14:28:26 +0900
-
-xserver-xorg-misc (0.0.1-67) unstable; urgency=low
-
-  * Modify license file (COPYING, LICENSE) with Samsung Electronics
-  * Git: 165.213.180.234:/git/slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-67
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Fri, 05 Nov 2010 10:54:30 +0900
-
-xserver-xorg-misc (0.0.1-66) unstable; urgency=low
-
-  * Modify xinitrc and input.conf both in xorg.conf.d.default and
-    xorg.conf.d.p1p2 directory in arm
-  * Add "MultiTouch" option and "Resolution" option
-  * Remove multitouchctl from xinitrc in arm
-  * Git: 165.213.180.234:/git/slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-66
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Thu, 04 Nov 2010 22:42:34 +0900
-
-xserver-xorg-misc (0.0.1-65) unstable; urgency=low
-
-  * Change xinitrc file to link /opt/share/.e directory.
-  * Git: 165.213.180.234:/git/slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-65
-
- -- Doyoun Kang <doyoun.kang@samsung.com>  Tue, 26 Oct 2010 14:29:12 +0900
-
-xserver-xorg-misc (0.0.1-64) unstable; urgency=low
-
-  * Modify debian/rules to make S80xresources (symbolic link of
-    /etc/init.d/xresources) in /etc/rc.d/rc4.d
-  * Git: 165.213.180.234:/git/slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-64
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Wed, 20 Oct 2010 17:45:20 +0900
-
-xserver-xorg-misc (0.0.1-63) unstable; urgency=low
-
-  * Modify debian/rules and debian/xserver-xorg-misc.install.in to make
-    S20xserver (symbolic link of /etc/init.d/xserver) in /etc/rc.d/rc4.d
-  * Git: 165.213.180.234:/git/slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-63
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Wed, 20 Oct 2010 17:36:07 +0900
-
-xserver-xorg-misc (0.0.1-62) unstable; urgency=low
-
-  * Change xinitrc file.
-  * Git: 165.213.180.234:/git/slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-62
-
- -- Doyoun Kang <doyoun.kang@samsung.com>  Wed, 20 Oct 2010 17:06:48 +0900
-
-xserver-xorg-misc (0.0.1-61) unstable; urgency=low
-
-  * Add an option "-logfile" to arm/startx.in to create Xorg.0.log file in
-    LOGDIR.
-  * Add command lines to backup previous Xorg.0.log* files in LOGDIR.
-  * Add a line to check and create LOGDIR.
-  * Git: 165.213.180.234:/git/slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-61
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Tue, 12 Oct 2010 22:05:13 +0900
-
-xserver-xorg-misc (0.0.1-60) unstable; urgency=low
-
-  * Change xinitrc file.
-    + change path /etc/.hib_capturing to /opt/etc/.hib_capturing
-    + add symbolic link for .order
-  * Git: 165.213.180.234:/git/slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-60
-
- -- Doyoun Kang <doyoun.kang@samsung.com>  Mon, 11 Oct 2010 11:24:57 +0900
-
-xserver-xorg-misc (0.0.1-59) unstable; urgency=low
-
-  * Enable Send key
-  * Git: 165.213.180.234:/git/slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-59
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Mon, 27 Sep 2010 14:05:53 +0900
-
-xserver-xorg-misc (0.0.1-58) unstable; urgency=low
-
-  * update xinitrc, xorg.conf for i386 simulator
-  * Git: 165.213.180.234:/git/slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-58
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Mon, 20 Sep 2010 20:15:33 +0900
-
-xserver-xorg-misc (0.0.1-57) unstable; urgency=low
-
-  * Add a command line for executing sapwood-server in xinitrc for arm/i386 by
-    Gtk team
-  * Git: 165.213.180.234:/git/slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-57
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Mon, 20 Sep 2010 12:47:28 +0900
-
-xserver-xorg-misc (0.0.1-56) unstable; urgency=low
-
-  * update /opt/etc/X11/Xmodmap (remove Xf86Send for removing redundency)
-  * Git: 165.213.180.234:/git/slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-56
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Wed, 15 Sep 2010 15:24:17 +0900
-
-xserver-xorg-misc (0.0.1-55) unstable; urgency=low
-
-  * update version
-  * Git: 165.213.180.234:/git/slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-55
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Mon, 13 Sep 2010 20:23:08 +0900
-
-xserver-xorg-misc (0.0.1-54) unstable; urgency=low
-
-  * Disable sapwood-server at booting time
-  * Git: 165.213.180.234:/git/slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-54
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Mon, 13 Sep 2010 20:07:05 +0900
-
-xserver-xorg-misc (0.0.1-53) unstable; urgency=low
-
-  * Add a command line for executing sapwood-server in xinitrc for arm/i386 by
-    request from Gtk team
-  * Git: 165.213.180.234:/git/slp/pkgs/xorg/driver/xserver-xorg-misc
-  * Tag: xserver-xorg-misc_0.0.1-53
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Mon, 13 Sep 2010 14:03:36 +0900
-
-xserver-xorg-misc (0.0.1-52) unstable; urgency=low
-
-  * enable accel to pvr2d_exa
-  * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/X11
-  * Tag: xserver-xorg-misc_0.0.1-52
-
- -- SooChan Lim <sc1.lim@samsung.com>  Thu, 09 Sep 2010 13:31:27 +0900
-
-xserver-xorg-misc (0.0.1-51) unstable; urgency=low
-
-  * disable shadowfb
-  * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/X11
-  * Tag: xserver-xorg-misc_0.0.1-51
-
- -- SooChan Lim <sc1.lim@samsung.com>  Mon, 06 Sep 2010 17:14:23 +0900
-
-xserver-xorg-misc (0.0.1-50) unstable; urgency=low
-
-  * Remove xorg.conf.d in arm directory
-  * Make xorg.conf.d.default, xorg.conf.d.p1p2 and put machine-specfic config
-    file in the directories.
-  * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/X11
-  * Tag: xserver-xorg-misc_0.0.1-50
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Fri, 03 Sep 2010 17:49:24 +0900
-
-xserver-xorg-misc (0.0.1-49) unstable; urgency=low
-
-  * Rollback and modify files in i386 directory
-  * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/X11
-  * Tag: xserver-xorg-misc_0.0.1-49
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Fri, 03 Sep 2010 13:27:41 +0900
-
-xserver-xorg-misc (0.0.1-48) unstable; urgency=low
-
-  * Move xinitrc from /opt/etc/X11 to /usr/etc/X11
-  * Copy all files in arm directory into i386 directory.
-  * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/X11
-  * Tag: xserver-xorg-misc_0.0.1-48
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Thu, 02 Sep 2010 16:57:34 +0900
-
-xserver-xorg-misc (0.0.1-47) unstable; urgency=low
-
-  * xorg conf loads sec_dev instead of fbdev_drv as video driver
-  * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/X11
-  * Tag: xserver-xorg-misc_0.0.1-47
-
- -- SooChan Lim <sc1.lim@samsung.com>  Tue, 31 Aug 2010 21:49:22 +0900
-
-xserver-xorg-misc (0.0.1-46) unstable; urgency=low
-
-  * Change arm's xinitrc script file to use symbolic link .e and .efreet
-  * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/X11
-  * Tag: xserver-xorg-misc_0.0.1-46
-
- -- Doyoun Kang <doyoun.kang@samsung.com>  Mon, 30 Aug 2010 21:04:19 +0900
-
-xserver-xorg-misc (0.0.1-45) unstable; urgency=low
-
-  * Disabling SendKey(XF86Send) by removing XF86Send in /opt/etc/X11/Xmodmap
-    by requests from PM
-  * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/X11
-  * Tag: xserver-xorg-misc_0.0.1-45
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Fri, 13 Aug 2010 18:59:14 +0900
-
-xserver-xorg-misc (0.0.1-44) unstable; urgency=low
-
-  * Add xorg.conf.d directory and devide xorg.conf into xorg.conf and
-    xorg.conf.d/*.conf files
-  * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/X11
-  * Tag: xserver-xorg-misc_0.0.1-44
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Thu, 12 Aug 2010 17:20:58 +0900
-
-xserver-xorg-misc (0.0.1-43) unstable; urgency=low
-
-  * Enable keyboard repeat for arm (xinitrc was modified : xset r on &)
-  * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/X11
-  * Tag: xserver-xorg-misc_0.0.1-43
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Fri, 30 Jul 2010 09:52:03 +0900
-
-xserver-xorg-misc (0.0.1-42) unstable; urgency=low
-
-  * Add a configuration for mouse in xorg.conf for arm
-  * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/X11
-  * Tag: xserver-xorg-misc_0.0.1-42
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Mon, 26 Jul 2010 16:42:57 +0900
-
-xserver-xorg-misc (0.0.1-41) unstable; urgency=low
-
-  * Remove xserver-xorg-misc.postinst by the request of security team
-  * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/X11
-  * Tag: xserver-xorg-misc_0.0.1-41
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Tue, 08 Jun 2010 17:18:43 +0900
-
-xserver-xorg-misc (0.0.1-40) unstable; urgency=low
-
-  * enable dpms
-  * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/X11
-  * Tag: xserver-xorg-misc_0.0.1-40
-
- -- SooChan Lim <sc1.lim@samsung.com>  Thu, 03 Jun 2010 16:54:16 +0900
-
-xserver-xorg-misc (0.0.1-39) unstable; urgency=low
-
-  * Add "udevadm trigger --subsystem-match=input" in startx script for setting
-    input devices under "--only" option
-  * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/X11
-  * Tag: xserver-xorg-misc_0.0.1-39
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Thu, 03 Jun 2010 10:26:11 +0900
-
-xserver-xorg-misc (0.0.1-38) unstable; urgency=low
-
-  * Change xinitrc file.
-  * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/X11
-  * Tag: xserver-xorg-misc_0.0.1-38
-
- -- Doyoun Kang <doyoun.kang@samsung.com>  Fri, 28 May 2010 19:32:45 +0900
-
-xserver-xorg-misc (0.0.1-37) unstable; urgency=low
-
-  * Remove xiprobe and related files to apply xinput device probing using udev
-  * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/X11
-  * Tag: xserver-xorg-misc_0.0.1-37
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Wed, 19 May 2010 16:30:36 +0900
-
-xserver-xorg-misc (0.0.1-36) unstable; urgency=low
-
-  * Remove DisplaySize
-  * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/X11
-  * Tag: xserver-xorg-misc_0.0.1-36
-
- -- SooChan Lim <sc1.lim@samsung.com>  Thu, 13 May 2010 21:26:19 +0900
-
-xserver-xorg-misc (0.0.1-35) unstable; urgency=low
-
-  * Fix scripts/setcpu to work properly in arm/i386
-    Add --gdb option in startx.in scripts for arm/i386
-  * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/X11
-  * Tag: xserver-xorg-misc_0.0.1-35
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Tue, 11 May 2010 10:43:15 +0900
-
-xserver-xorg-misc (0.0.1-34) unstable; urgency=low
-
-  * Add two scripts (setcpu, setpoll)
-  * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/X11
-  * Tag: xserver-xorg-misc_0.0.1-34
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Tue, 03 May 2010 16:51:50 +0900
-
-xserver-xorg-misc (0.0.1-33) unstable; urgency=low
-
-  * Add postinst to change file permission and to change ownership
-  * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/X11
-  * Tag: xserver-xorg-misc_0.0.1-33
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Tue, 27 Apr 2010 10:13:15 +0900
-
-xserver-xorg-misc (0.0.1-32) unstable; urgency=low
-
-  * Disable input-router
-  * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/X11
-  * Tag: xserver-xorg-misc_0.0.1-32
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Thu, 15 Apr 2010 22:40:42 +0900
-
-xserver-xorg-misc (0.0.1-31) unstable; urgency=low
-
-  * clean up xinitrc.probe (with request from APPFW team)
-  * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/X11
-  * Tag: xserver-xorg-misc_0.0.1-31
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Thu, 08 Apr 2010 15:38:03 +0900
-
-xserver-xorg-misc (0.0.1-30) unstable; urgency=low
-
-  * Modify xiprobe and startx script
-  * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/X11
-  * Tag: xserver-xorg-misc_0.0.1-30
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Thu, 01 Apr 2010 21:27:11 +0900
-
-xserver-xorg-misc (0.0.1-29) unstable; urgency=low
-
-  * Remove redundant keymap in Xmodmap
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Thu, 01 Apr 2010 14:42:46 +0900
-
-xserver-xorg-misc (0.0.1-28) unstable; urgency=low
-
-  * Update Xmodmap file for supporting both Kessler and SDK board
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Thu, 01 Apr 2010 04:58:53 +0000
-
-xserver-xorg-misc (0.0.1-27) unstable; urgency=low
-
-  * Add xiprobe script and modify xorg.conf.probe, xinitrc.probe for support input device probing
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Wed, 31 Mar 2010 17:00:43 +0900
-
-xserver-xorg-misc (0.0.1-26) unstable; urgency=low
-
-  * Change S50Xserver to S60xserver
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Thu, 25 Mar 2010 13:51:34 +0900
-
-xserver-xorg-misc (0.0.1-25) unstable; urgency=low
-
-  * Fix debian/xserver-xorg-misc.install.in for installing Xorg.sh file properly
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Wed, 24 Mar 2010 19:02:33 +0900
-
-xserver-xorg-misc (0.0.1-24) unstable; urgency=low
-
-  * Remove immvibed from xinitrc (with request from SYSFW)
-  * Add /etc/profile.d/Xorg.sh for exporting DISPLAY env variable globally
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Wed, 24 Mar 2010 16:09:34 +0900
-
-xserver-xorg-misc (0.0.1-23) unstable; urgency=low
-
-  * Fix the path of S50Xserver to /etc/rc.d/rc3.d/S50Xserver
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Mon, 22 Mar 2010 13:56:17 +0900
-
-xserver-xorg-misc (0.0.1-22) unstable; urgency=low
-
-  * Add /etc/init.d/Xserver script
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Mon, 22 Mar 2010 12:54:00 +0900
-
-xserver-xorg-misc (0.0.1-21) unstable; urgency=low
-
-  * Modify arm/xinitrc to copy .efreet directory
-
- -- Doyoun Kang <doyoun.kang@samsung.com>  Fri, 19 Mar 2010 23:10:19 +0900
-
-xserver-xorg-misc (0.0.1-20) unstable; urgency=low
-
-  * Remove startgtk.sh from xinitrc file (with request from GTK team)
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Thu, 18 Mar 2010 19:21:46 +0900
-
-xserver-xorg-misc (0.0.1-19) unstable; urgency=low
-
-  * Removed isf-panel-efl from xinitrc
-
- -- Ji-hoon Lee <dalton.lee@samsung.com>  Tue, 16 Mar 2010 18:43:15 +0900
-
-xserver-xorg-misc (0.0.1-18) unstable; urgency=low
-
-  * Add immvibed before running boot-animation (with request from SYSFW)
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Tue, 16 Mar 2010 11:48:05 +0900
-
-xserver-xorg-misc (0.0.1-17) unstable; urgency=low
-
-  * Modify arm/xinitrc to import xmodmap file properly
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Tue, 23 Feb 2010 13:04:19 +0900
-
-xserver-xorg-misc (0.0.1-16) unstable; urgency=low
-
-  * Modify xinitrc
-
- -- Doyoun Kang <doyoun.kang@samsung.com>  Sat, 20 Feb 2010 19:34:51 +0900
-
-xserver-xorg-misc (0.0.1-15) unstable; urgency=low
-
-  * Fix Makefile.am to install Xresources, Xmodmap file properly
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Sat, 20 Feb 2010 15:56:49 +0900
-
-xserver-xorg-misc (0.0.1-14) unstable; urgency=low
-
-  * Modify xinitrc
-    Add Xresource, Xmodmap
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Sat, 20 Feb 2010 15:40:57 +0900
-
-xserver-xorg-misc (0.0.1-13) unstable; urgency=low
-
-  * remove the mode option at xorg.conf
-
- -- SooChan Lim <sc1.lim@samsung.com>  Tue, 09 Feb 2010 00:09:17 +0900
-
-xserver-xorg-misc (0.0.1-12) unstable; urgency=low
-
-  * Change arm/xorg.conf for input router
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Fri, 22 Jan 2010 19:17:00 +0900
-
-xserver-xorg-misc (0.0.1-11) unstable; urgency=low
-
-  * enable exa and dri
-
- -- SooChan Lim <sc1.lim@samsung.com>  Wed, 20 Jan 2010 19:30:05 +0900
-
-xserver-xorg-misc (0.0.1-10) unstable; urgency=low
-
-  * Modify arm/xorg.conf file for multitouch
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Tue, 19 Jan 2010 18:57:40 +0900
-
-xserver-xorg-misc (0.0.1-9) unstable; urgency=low
-
-  * disable exa and dri2
-
- -- SooChan Lim <sc1.lim@samsung.com>  Fri, 15 Jan 2010 22:32:06 +0900
-
-xserver-xorg-misc (0.0.1-8) unstable; urgency=low
-
-  * enable exa and dri2
-
- -- SooChan Lim <sc1.lim@samsung.com>  Thu, 14 Jan 2010 16:07:49 +0900
-
-xserver-xorg-misc (0.0.1-7) unstable; urgency=low
-
-  * Modify xorg.conf file for armel again
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Tue, 29 Dec 2009 19:28:53 +0900
-
-xserver-xorg-misc (0.0.1-6) unstable; urgency=low
-
-  * Modify xorg.conf file for armel (Monitor section)
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Tue, 29 Dec 2009 17:59:27 +0900
-
-xserver-xorg-misc (0.0.1-5) unstable; urgency=low
-
-  * activate the fb3 and use it
-
- -- SooChan Lim <sc1.lim@samsung.com>  Fri, 11 Dec 2009 11:49:54 +0900
-
-xserver-xorg-misc (0.0.1-4) unstable; urgency=low
-
-  * Modify start script to disable AccessXKeys features of XKB
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Wed, 09 Dec 2009 22:11:51 +0900
-
-xserver-xorg-misc (0.0.1-3) unstable; urgency=low
-
-  * change startx to disable repeat key
-
- -- lsj119 <lsj119@samsung.com>  Mon, 07 Dec 2009 15:15:04 +0900
-
-xserver-xorg-misc (0.0.1-2) unstable; urgency=low
-
-  * chanage the default depth into 24bits
-
- -- SooChan Lim <sc1.lim@samsung.com>  Thu, 03 Dec 2009 20:35:58 +0900
-
-xserver-xorg-misc (0.0.1-1) unstable; urgency=low
-
-  * Initial Release.
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Thu, 12 Nov 2009 17:39:03 +0900
diff --git a/debian/compat b/debian/compat
deleted file mode 100644 (file)
index 7ed6ff8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/debian/control b/debian/control
deleted file mode 100755 (executable)
index 892f76e..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-Source: xserver-xorg-misc
-Section: x11
-Priority: optional
-Maintainer: Sung-Jin Park <sj76.park@samsung.com>, SooChan Lim <sc1.lim@samsung.com>, Doyoun Kang <doyoun.kang@samsung.com>, Sangjin Lee <lsj119@samsung.com>, Boram Park <boram1288.park@samsung.com>, Jihoon Kim <jihoon48.kim@samsung.com>
-Build-Depends: debhelper (>= 5)
-Standards-Version: 0.0.1
-
-Package: xserver-xorg-misc-s5pc110
-Section: x11
-Architecture: armel
-Conflicts: xserver-xorg-misc-s5pc210, xserver-xorg-misc-emulfb, xserver-xorg-misc
-Replaces: xserver-xorg-misc-s5p210, xserver-xorg-misc-emulfb, xserver-xorg-misc
-Depends: ${shlibs:Depends}, ${misc:Depends},  xserver-xorg-core (>= 1.7.1)
-Description: Xorg server misc package which contains startx, xinitrc and xorg.conf file for s5pc110
-
-Package: xserver-xorg-misc-s5pc210
-Section: x11
-Architecture: armel
-Conflicts: xserver-xorg-misc-s5pc110, xserver-xorg-misc-emulfb, xserver-xorg-misc
-Replaces: xserver-xorg-misc-s5pc110, xserver-xorg-misc-emulfb, xserver-xorg-misc
-Depends: ${shlibs:Depends}, ${misc:Depends},  xserver-xorg-core (>= 1.7.1)
-Description: Xorg server misc package which contains startx, xinitrc and xorg.conf file for s5pc210
-
-Package: xserver-xorg-misc-emulfb
-Section: x11
-Architecture: any
-Conflicts: xserver-xorg-misc-s5pc110, xserver-xorg-misc-s5pc210, xserver-xorg-misc
-Replaces: xserver-xorg-misc-s5pc110, xserver-xorg-misc-s5pc210, xserver-xorg-misc
-Depends: ${shlibs:Depends}, ${misc:Depends},  xserver-xorg-core (>= 1.7.1)
-Description: Xorg server misc package which contains startx, xinitrc and xorg.conf file for emulfb
-
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100755 (executable)
index d1434a3..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) 2000 - 2010 Samsung Electronics Co., Ltd. All rights reserved.\r
-\r
-This program is free software; you can redistribute it and/or modify\r
-it under the terms of the GNU Lesser General Public License version 2.1.\r
-\r
-The full text of the LGPL 2.1 can be found in\r
-/usr/share/common-licenses.\r
-\r
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644 (file)
index 53f5393..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-opt/etc/X11
diff --git a/debian/docs b/debian/docs
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/debian/rules b/debian/rules
deleted file mode 100755 (executable)
index ef5d413..0000000
+++ /dev/null
@@ -1,201 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-CFLAGS ?= -Wall -g
-LDFLAGS ?=
-PREFIX ?= /usr
-DATADIR ?= /opt
-PREFIX_NS ?= usr
-DATADIR_NS ?= opt
-ARCH ?= $(DEB_HOST_ARCH_CPU)
-ARCH_COMMON ?= $(ARCH)-common
-CONF_FLAGS ?=  --with-arch=$(ARCH) --with-conf-prefix=$(DATADIR)
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-       CFLAGS += -O0
-else
-       CFLAGS += -O2
-endif
-
-configure:
-       #autoreconf -i -v -f
-       ./autogen.sh
-
-config.status: configure
-       dh_testdir
-       # Add here commands to configure the package.
-
-       for f in `find $(CURDIR)/$(ARCH_COMMON)/ -name "*.in"`; do \
-                cat $$f > $${f%.in}; \
-                sed -i -e "s#@PREFIX@#$(PREFIX)#g" $${f%.in}; \
-                sed -i -e "s#@DATADIR@#$(DATADIR)#g" $${f%.in}; \
-               chmod a+x $${f%.in}; \
-        done
-
-       ./configure --prefix=$(PREFIX) $(CONF_FLAGS) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
-
-build-c110: build-stamp
-       rm -rf $(CURDIR)/debian/tmp/opt/etc/X11/xorg.conf.d*
-
-build-c210: build-stamp
-       rm -rf $(CURDIR)/debian/tmp/opt/etc/X11/xorg.conf.d*
-
-build-emulfb: build-stamp
-       rm -rf $(CURDIR)/debian/tmp/opt/etc/X11/xorg.conf.d*
-
-build-stamp: config.status
-       dh_testdir
-       # Add here commands to compile the package.
-       $(MAKE)
-       #docbook-to-man debian/x11proto-core.sgml > x11proto-core.1
-
-       for f in `find $(CURDIR)/debian/ -name "*.in"`; do \
-                cat $$f > $${f%.in}; \
-                sed -i -e "s#@PREFIX@#$(PREFIX_NS)#g" $${f%.in}; \
-                sed -i -e "s#@DATADIR@#$(DATADIR_NS)#g" $${f%.in}; \
-        done
-
-       touch $@
-
-clean:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp
-
-       # Add here commands to clean up after the build process.
-       -$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-       cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-       cp -f /usr/share/misc/config.guess config.guess
-endif
-       rm -f Makefile.in aclocal.m4 config.guess config.sub configure install-sh missing
-
-       for f in `find $(CURDIR)/$(ARCH_COMMON)/ -name "*.in"`; do \
-               rm -f $${f%.in}; \
-       done
-
-       for f in `find $(CURDIR)/debian/ -name "*.in"`; do \
-               rm -f $${f%.in}; \
-       done
-
-       dh_clean
-
-install-common:
-       dh_testdir
-       dh_testroot
-       dh_clean -k
-       dh_installdirs
-
-       # Add here commands to install the package into debian/tmp.
-       $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-       mkdir $(CURDIR)/debian/tmp/etc/rc.d/init.d/ -p
-       mkdir $(CURDIR)/debian/tmp/etc/rc.d/rc3.d/ -p
-       mkdir $(CURDIR)/debian/tmp/etc/rc.d/rc4.d/ -p
-       mkdir $(CURDIR)/debian/tmp/etc/profile.d/ -p
-       mkdir $(CURDIR)/debian/tmp/$(PREFIX)/etc/X11/ -p
-       cp -af $(CURDIR)/$(ARCH_COMMON)/xserver $(CURDIR)/debian/tmp/etc/rc.d/init.d/
-       cp -af $(CURDIR)/$(ARCH_COMMON)/xresources $(CURDIR)/debian/tmp/etc/rc.d/init.d/
-       cp -af $(CURDIR)/$(ARCH_COMMON)/xinitrc $(CURDIR)/debian/tmp/usr/etc/X11/
-ifneq (,$(findstring arm,$(ARCH)))
-       ln -s /etc/rc.d/init.d/xserver $(CURDIR)/debian/tmp/etc/rc.d/rc3.d/S02xserver
-       ln -s /etc/rc.d/init.d/xserver $(CURDIR)/debian/tmp/etc/rc.d/rc4.d/S02xserver
-else
-       ln -s /etc/rc.d/init.d/xserver $(CURDIR)/debian/tmp/etc/rc.d/rc3.d/S20xserver
-       ln -s /etc/rc.d/init.d/xserver $(CURDIR)/debian/tmp/etc/rc.d/rc4.d/S20xserver
-endif
-       ln -s /etc/rc.d/init.d/xresources $(CURDIR)/debian/tmp/etc/rc.d/rc3.d/S80xresources
-       ln -s /etc/rc.d/init.d/xresources $(CURDIR)/debian/tmp/etc/rc.d/rc4.d/S80xresources
-       cp -af $(CURDIR)/$(ARCH_COMMON)/Xorg.sh $(CURDIR)/debian/tmp/etc/profile.d/
-       -cp -af $(CURDIR)/$(ARCH_COMMON)/Xmodmap $(CURDIR)/debian/tmp/opt/etc/X11/ > /dev/null
-
-install-c110: build-c110 install-common
-       -cp -af $(CURDIR)/$(ARCH)-c110/* $(CURDIR)/debian/tmp/opt/etc/X11/ > /dev/null
-
-install-c210: build-c210 install-common
-       -cp -af $(CURDIR)/$(ARCH)-c210/* $(CURDIR)/debian/tmp/opt/etc/X11/ > /dev/null
-
-install-emulfb: build-emulfb install-common
-       -cp -af $(CURDIR)/$(ARCH)-emulfb/* $(CURDIR)/debian/tmp/opt/etc/X11/ > /dev/null
-
-# Build architecture-independent files here.
-binary-indep:
-# We have nothing to do by default.
-
-binary-c110: build-c110 install-c110
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs
-       dh_installdocs
-       dh_installexamples
-       dh_install --sourcedir=debian/tmp -pxserver-xorg-misc-s5pc110
-       dh_installman
-       dh_link
-       #dh_strip
-       dh_compress
-       dh_fixperms
-       -dh_installdeb -pxserver-xorg-misc-s5pc110
-       dh_shlibdeps
-       -dh_gencontrol -pxserver-xorg-misc-s5pc110
-       dh_md5sums
-       -dh_builddeb -pxserver-xorg-misc-s5pc110
-       #-Nxserver-xorg-misc-s5pc210 -Nxserver-xorg-misc-emulfb
-
-binary-c210: build-c210 install-c210
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs
-       dh_installdocs
-       dh_installexamples
-       dh_install --sourcedir=debian/tmp -pxserver-xorg-misc-s5pc210
-       dh_installman
-       dh_link
-       #dh_strip
-       dh_compress
-       dh_fixperms
-       -dh_installdeb -pxserver-xorg-misc-s5pc210
-       dh_shlibdeps
-       -dh_gencontrol -pxserver-xorg-misc-s5pc210
-       dh_md5sums
-       -dh_builddeb -pxserver-xorg-misc-s5pc210
-       #-Nxserver-xorg-misc-s5pc110 -Nxserver-xorg-misc-emulfb
-
-binary-emulfb: build-emulfb install-emulfb
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs
-       dh_installdocs
-       dh_installexamples
-       dh_install --sourcedir=debian/tmp -pxserver-xorg-misc-emulfb
-       dh_installman
-       dh_link
-#      dh_strip
-       dh_compress
-       dh_fixperms
-       -dh_installdeb -pxserver-xorg-misc-emulfb
-       dh_shlibdeps
-       -dh_gencontrol -pxserver-xorg-misc-emulfb
-       dh_md5sums
-       -dh_builddeb -pxserver-xorg-misc-emulfb
-       #-Nxserver-xorg-misc-s5pc110 -Nxserver-xorg-misc-s5pc210
-
-# Build architecture-dependent files here.
-binary-arch: binary-c110 binary-c210 binary-emulfb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
-
diff --git a/debian/rules.org b/debian/rules.org
deleted file mode 100755 (executable)
index 1616bdb..0000000
+++ /dev/null
@@ -1,149 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-CFLAGS ?= -Wall -g
-LDFLAGS ?= 
-PREFIX ?= /usr
-DATADIR ?= /opt
-PREFIX_NS ?= usr
-DATADIR_NS ?= opt
-ARCH ?= $(DEB_HOST_ARCH_CPU)
-CONF_FLAGS ?=  --with-arch=$(ARCH) --with-conf-prefix=$(DATADIR)
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-       CFLAGS += -O0
-else
-       CFLAGS += -O2
-endif
-
-configure:
-       autoreconf -i -v -f
-
-config.status: configure
-       dh_testdir
-       # Add here commands to configure the package.
-
-        for f in `find $(CURDIR)/$(ARCH)/ -name "*.in"`; do \
-                cat $$f > $${f%.in}; \
-                sed -i -e "s#@PREFIX@#$(PREFIX)#g" $${f%.in}; \
-                sed -i -e "s#@DATADIR@#$(DATADIR)#g" $${f%.in}; \
-               chmod a+x $${f%.in}; \
-        done
-       
-       ./configure --prefix=$(PREFIX) $(CONF_FLAGS) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
-
-build: build-stamp
-
-build-stamp: config.status
-       dh_testdir
-       # Add here commands to compile the package.
-       $(MAKE)
-       #docbook-to-man debian/x11proto-core.sgml > x11proto-core.1
-
-        for f in `find $(CURDIR)/debian/ -name "*.in"`; do \
-                cat $$f > $${f%.in}; \
-                sed -i -e "s#@PREFIX@#$(PREFIX_NS)#g" $${f%.in}; \
-                sed -i -e "s#@DATADIR@#$(DATADIR_NS)#g" $${f%.in}; \
-        done
-
-       touch $@
-
-clean:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp 
-
-       # Add here commands to clean up after the build process.
-       -$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-       cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-       cp -f /usr/share/misc/config.guess config.guess
-endif
-       rm -f Makefile.in aclocal.m4 config.guess config.sub configure install-sh missing
-
-       for f in `find $(CURDIR)/$(ARCH)/ -name "*.in"`; do \
-               rm -f $${f%.in}; \
-       done
-
-       for f in `find $(CURDIR)/debian/ -name "*.in"`; do \
-               rm -f $${f%.in}; \
-       done
-                               
-       dh_clean 
-
-install: build
-       dh_testdir
-       dh_testroot
-       dh_clean -k 
-       dh_installdirs
-
-       # Add here commands to install the package into debian/tmp.
-       $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-       mkdir $(CURDIR)/debian/tmp/etc/rc.d/init.d/ -p
-       mkdir $(CURDIR)/debian/tmp/etc/rc.d/rc3.d/ -p
-       mkdir $(CURDIR)/debian/tmp/etc/rc.d/rc4.d/ -p
-       mkdir $(CURDIR)/debian/tmp/etc/profile.d/ -p
-       mkdir $(CURDIR)/debian/tmp/$(PREFIX)/etc/X11/ -p
-       cp -af $(CURDIR)/$(ARCH)/xserver $(CURDIR)/debian/tmp/etc/rc.d/init.d/
-       cp -af $(CURDIR)/$(ARCH)/xresources $(CURDIR)/debian/tmp/etc/rc.d/init.d/
-       cp -af $(CURDIR)/$(ARCH)/xinitrc $(CURDIR)/debian/tmp/usr/etc/X11/
-       ln -s /etc/rc.d/init.d/xserver $(CURDIR)/debian/tmp/etc/rc.d/rc3.d/S20xserver
-       ln -s /etc/rc.d/init.d/xserver $(CURDIR)/debian/tmp/etc/rc.d/rc4.d/S20xserver
-       ln -s /etc/rc.d/init.d/xresources $(CURDIR)/debian/tmp/etc/rc.d/rc3.d/S80xresources
-       ln -s /etc/rc.d/init.d/xresources $(CURDIR)/debian/tmp/etc/rc.d/rc4.d/S80xresources
-       cp -af $(CURDIR)/$(ARCH)/Xorg.sh $(CURDIR)/debian/tmp/etc/profile.d/
-       cp -af $(CURDIR)/$(ARCH)/xorg.conf.d* $(CURDIR)/debian/tmp/opt/etc/X11/
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs 
-       dh_installdocs
-       dh_installexamples
-       dh_install --sourcedir=debian/tmp
-#      dh_installmenu
-#      dh_installdebconf       
-#      dh_installlogrotate
-#      dh_installemacsen
-#      dh_installpam
-#      dh_installmime
-#      dh_python
-#      dh_installinit
-#      dh_installcron
-#      dh_installinfo
-       dh_installman
-       dh_link
-       dh_strip
-       dh_compress
-       dh_fixperms
-#      dh_perl
-#      dh_makeshlibs
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
diff --git a/debian/xserver-xorg-misc-emulfb.install.in b/debian/xserver-xorg-misc-emulfb.install.in
deleted file mode 100644 (file)
index 5b3bfe3..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-@PREFIX@/bin/*
-@PREFIX@/etc/X11/*
-@DATADIR@/etc/X11/*
-etc/rc.d/init.d/*
-etc/rc.d/rc3.d/*
-etc/rc.d/rc4.d/*
-etc/profile.d/*
diff --git a/debian/xserver-xorg-misc-s5pc110.install.in b/debian/xserver-xorg-misc-s5pc110.install.in
deleted file mode 100644 (file)
index 5b3bfe3..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-@PREFIX@/bin/*
-@PREFIX@/etc/X11/*
-@DATADIR@/etc/X11/*
-etc/rc.d/init.d/*
-etc/rc.d/rc3.d/*
-etc/rc.d/rc4.d/*
-etc/profile.d/*
diff --git a/debian/xserver-xorg-misc-s5pc110.postinst.in b/debian/xserver-xorg-misc-s5pc110.postinst.in
deleted file mode 100644 (file)
index ca3e8f6..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-mkdir -p /opt/var/log
diff --git a/debian/xserver-xorg-misc-s5pc210.install.in b/debian/xserver-xorg-misc-s5pc210.install.in
deleted file mode 100644 (file)
index 5b3bfe3..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-@PREFIX@/bin/*
-@PREFIX@/etc/X11/*
-@DATADIR@/etc/X11/*
-etc/rc.d/init.d/*
-etc/rc.d/rc3.d/*
-etc/rc.d/rc4.d/*
-etc/profile.d/*
diff --git a/debian/xserver-xorg-misc-s5pc210.postinst.in b/debian/xserver-xorg-misc-s5pc210.postinst.in
deleted file mode 100644 (file)
index ca3e8f6..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-mkdir -p /opt/var/log
diff --git a/debian/xserver-xorg-misc.install.in.org b/debian/xserver-xorg-misc.install.in.org
deleted file mode 100644 (file)
index 5b3bfe3..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-@PREFIX@/bin/*
-@PREFIX@/etc/X11/*
-@DATADIR@/etc/X11/*
-etc/rc.d/init.d/*
-etc/rc.d/rc3.d/*
-etc/rc.d/rc4.d/*
-etc/profile.d/*
index 2d7c6b9..be42e4b 100644 (file)
@@ -1,11 +1,25 @@
 keycode 123 = XF86AudioRaiseVolume
 keycode 122 = XF86AudioLowerVolume
-keycode 231 = XF86Standby
+keycode 231 = Cancel
 keycode 177 = XF86Send
-keycode 140 = XF86Phone
-keycode 182 = XF86Stop
+keycode 147 = XF86Phone
+keycode 166 = XF86Stop
+keycode 225 = XF86Search
 keycode 124 = XF86PowerOff
 keycode 179 = XF86WebCam
 keycode 220 = XF86Pictures
+keycode 208 = XF86AudioPlay
+keycode 209 = XF86AudioPause
+keycode 174 = XF86AudioStop
+keycode 171 = XF86AudioNext
+keycode 173 = XF86AudioPrev
+keycode 176 = XF86AudioRewind
+keycode 216 = XF86AudioForward
+keycode 234 = XF86AudioMedia
 keycode 153 = 
 keycode 239 = 
+keycode 136 = 
+keycode 140 =
+keycode 182 =
+keycode 172 =
+keycode 215 =
diff --git a/i386-common/Xorg.arch-options b/i386-common/Xorg.arch-options
new file mode 100644 (file)
index 0000000..803571b
--- /dev/null
@@ -0,0 +1 @@
+XORG_ARCH_OPTS="-dumbSched"
diff --git a/i386-common/arch-preinit.d/i386-enumerate-input b/i386-common/arch-preinit.d/i386-enumerate-input
new file mode 100755 (executable)
index 0000000..3bf4915
--- /dev/null
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+udevadm trigger --subsystem-match=input &
+
diff --git a/i386-common/startx b/i386-common/startx
new file mode 100755 (executable)
index 0000000..9166ab1
--- /dev/null
@@ -0,0 +1,57 @@
+#!/bin/sh
+
+[ -r /etc/X11/Xorg.arch-options ] && . /etc/X11/Xorg.arch-options
+
+DISPLAY=":0"
+LOGDIR="/var/log"
+XORG_CONF=" -config /etc/X11/xorg.conf -configdir /etc/X11/xorg.conf.d "
+OTHER_OPTIONS=" -logfile /var/log/Xorg.0.log -ac -noreset +accessx 0 +dpmsphone $XORG_ARCH_OPTS"
+
+# Xorg automatically preserves logs in $LOGDIR/Xorg.DPY.log.(old)
+
+
+for scriptlet in $(find /etc/X11/arch-preinit.d ! -type d); do
+    test -x "$scriptlet" && . "$scriptlet"
+done
+
+if [ -e /etc/emulator/opengl-es-setup-yagl-env.sh ]; then
+    /etc/emulator/opengl-es-setup-yagl-env.sh
+fi
+
+#remove previous Xorg.0.log file
+if [ -e /var/log/Xorg.0.log ]; then
+    rm /var/log/Xorg.0.log
+fi
+
+#remove previous Xorg.0.log.old file
+if [ -e /var/log/Xorg.0.log.old ]; then
+    rm /var/log/Xorg.0.log.old
+fi
+
+if [ -e ~/.xinitrc ]; then
+    XINITRC=~/.xinitrc
+else
+    XINITRC=/etc/X11/xinitrc
+fi
+
+XSERVER_OPTIONS=" ${DISPLAY} ${OTHER_OPTIONS} ${XORG_CONF} "
+
+if [ "$1" = "--gdb" ]; then
+    /usr/bin/gdb --args /usr/bin/Xorg ${XSERVER_OPTIONS}
+else
+    if [ "$1" = "--only" ]; then
+        export XSERVER_WAIT_MS=100000
+
+        /usr/bin/Xorg ${XSERVER_OPTIONS} &
+    else
+        export WMRC=/etc/X11/wmrc
+        export WMUSERID=`/usr/bin/id -u app`
+        export WMGROUPID=`/usr/bin/id -g app`
+        export WMUSER=app
+        export WMUSERHOME=/opt/home/app
+        export XSERVER_WAIT_MS=100000
+
+        /usr/bin/xinit ${XINITRC} -- /usr/bin/Xorg ${XSERVER_OPTIONS} &
+    fi
+fi
+
diff --git a/i386-common/startx.in b/i386-common/startx.in
deleted file mode 100755 (executable)
index 06fd559..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-DISPLAY=":0"
-XORG_CONF=" -config @DATADIR@/etc/X11/xorg.conf -configdir /opt/etc/X11/xorg.conf.d "
-OTHER_OPTIONS=" -ac -noreset +accessx 0 -dumbSched "
-
-udevadm trigger --subsystem-match=input &
-
-if [ -e ~/.xinitrc ]; then
-       XINITRC=~/.xinitrc
-else
-       XINITRC=@PREFIX@/etc/X11/xinitrc
-fi
-
-XSERVER_OPTIONS=" ${DISPLAY} ${OTHER_OPTIONS} ${XORG_CONF} "
-
-if [ "$1" = "--gdb" ]; then
-       gdb --args Xorg ${XSERVER_OPTIONS}
-else    
-       if [ "$1" = "--only" ]; then
-               Xorg ${XSERVER_OPTIONS} &
-       else
-               xinit ${XINITRC} -- @PREFIX@/bin/Xorg ${XSERVER_OPTIONS} &
-       fi
-fi    
-
-
index 6358a9e..6446a7c 100755 (executable)
@@ -1,29 +1,14 @@
 #!/bin/sh
 
-# Remapping the keycodes to our key-symbols
-if [ -x /usr/bin/xmodmap ]; then
-       if [ -f /root/.xmodmap ]; then
-               xmodmap /root/.xmodmap
-       else
-               xmodmap - < /opt/etc/X11/Xmodmap
-       fi
-fi
-
 /usr/bin/scim -d &
-
-# Link .e
-if [ ! -d ${HOME}/.e ]; then
-       ln -s /opt/home/root/.e ${HOME}/.e
-fi
+/usr/bin/xmodmap /etc/X11/Xmodmap
 
 # set dpi
 if [ -x /usr/bin/xrdb ]; then
-       if [ -e ~/.Xresources ]; then
-               /usr/bin/xrdb -load -nocpp ~/.Xresources
-       else
-               /usr/bin/xrdb -load -nocpp /opt/etc/X11/Xresources
-       fi
+    if [ -e ~/.Xresources ]; then
+        /usr/bin/xrdb -load -nocpp ~/.Xresources
+    else
+        /usr/bin/xrdb -load -nocpp /etc/X11/Xresources
+    fi
 fi
 
-/usr/bin/enlightenment_start -profile samsung -i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it &
-/usr/etc/X11/xsetrc &
diff --git a/i386-common/xorg.conf b/i386-common/xorg.conf
deleted file mode 100755 (executable)
index 314fd2e..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-Section "ServerLayout"
-       Identifier              "Test Layout"
-       Screen          0       "Screen0" 0 0
-EndSection
-
-Section "Screen"
-       Identifier              "Screen0"
-       Device                  "emulfb"
-       Monitor                 "Monitor0"
-       #       SubSection              "Display"
-       #               Modes           "480x800"
-       #       EndSubSection
-EndSection
-
-Section "Monitor"
-       Identifier              "Monitor0"
-       Option                  "DPMS"  "true"
-EndSection
-
-Section "ServerFlags"
-       Option "blank time"     "0"
-       Option "standby time"   "0"
-       Option "suspend time"   "0"
-       Option "off time"       "0"
-EndSection
-
-Section "Device"
-       Identifier              "emulfb"
-       Driver                  "emulfb"
-       Option                  "fbdev"         "/dev/fb0"
-EndSection
-
-Section "InputClass"
-       Identifier "evdev pointer catchall"
-       MatchIsPointer "on"
-       MatchDevicePath "/dev/input/event*"
-       Driver "evdev"
-EndSection
-
-Section "InputClass"
-       Identifier "evdev pointer catchall"
-       MatchIsTablet   "on"
-       MatchDevicePath "/dev/input/event*"
-       Driver "evdev"
-EndSection
-
-Section "InputClass"
-        Identifier "evdev touchscreen catchall"
-        MatchIsTouchScreen "on"
-        MatchDevicePath "/dev/input/event*"
-        Driver "evdevmultitouch"
-        Option "MultiTouch"     "3"
-EndSection
-
-Section "InputClass"
-       Identifier "evdev keyboard catchall"
-       MatchIsKeyboard "on"
-       MatchDevicePath "/dev/input/event*"
-       Driver "evdev"
-EndSection
diff --git a/i386-common/xorg.service b/i386-common/xorg.service
new file mode 100644 (file)
index 0000000..d0226a2
--- /dev/null
@@ -0,0 +1,13 @@
+[Unit]
+Description=xserver
+DefaultDependencies=no
+After=systemd-udev-trigger.service opt.mount smack-default-labeling.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/bin/startx
+EnvironmentFile=-/run/tizen-mobile-env
+
+[Install]
+WantedBy=basic.target
index 0bad1eb..d7a6b1f 100755 (executable)
@@ -7,10 +7,12 @@ case "$1" in
   # Setting dpi to 72
     if [ -x /usr/bin/xrdb ]; then
       if [ -e ~/.Xresources ]; then
-       /usr/bin/xrdb -load -nocpp ~/.Xresources
+        /usr/bin/xrdb -load -nocpp ~/.Xresources
       else
-        /usr/bin/xrdb -load -nocpp /opt/etc/X11/Xresources
+        /usr/bin/xrdb -load -nocpp /etc/X11/Xresources
       fi
+      mkdir -p /tmp/hibernation
+      touch /tmp/hibernation/xresources_ready
     fi
   ;;
 
diff --git a/i386-common/xresources.service b/i386-common/xresources.service
new file mode 100644 (file)
index 0000000..60f93b9
--- /dev/null
@@ -0,0 +1,15 @@
+[Unit]
+Description=Xresources
+After=tizen-runtime.target
+Requires=tizen-runtime.target
+ConditionFileIsExecutable=/usr/bin/xrdb
+
+[Service]
+Type=oneshot
+EnvironmentFile=/run/tizen-mobile-env
+ExecStart=/usr/bin/xrdb -load -nocpp /etc/X11/Xresources
+ExecStartPost=/bin/mkdir -p /tmp/hibernation
+ExecStartPost=/bin/touch /tmp/hibernation/xresources_ready
+
+[Install]
+WantedBy=multi-user.target
index 0921e39..e614117 100755 (executable)
@@ -1,11 +1 @@
-xset -r 123
-xset -r 122
-xset -r 231
-xset -r 177
-xset -r 140
-xset -r 182
-xset -r 124
-xset -r 179
-xset -r 220
-xset -r 153
-xset -r 239
+xset -r 123 -r 122 -r 231 -r 177 -r 147 -r 166 -r 225 -r 124 -r 179 -r 220 -r 208 -r 209 -r 174 -r 171 -r 173 -r 176 -r 216 -r 234 &
index 496337c..285eefe 100644 (file)
@@ -1,5 +1,3 @@
-#sbs-git:slp/pkgs/xorg/driver/xserver-xorg-misc xserver-xorg-misc 0.0.1 13496ac354ad7f6709f1ef9b880a206a2df41c80
-
 %ifarch %ix86
 %define ARCH i386
 %endif
@@ -8,10 +6,10 @@
 %define ARCH arm
 %endif
 
-Name:  xorg-x11-misc
+Name:      xorg-x11-misc
 Summary:    X.Org X11 X server misc packages
-Version: 0.0.1
-Release:    99
+Version:    0.0.12
+Release:    1
 Group:      System/X11
 License:    MIT
 Source0:    %{name}-%{version}.tar.gz
@@ -19,87 +17,162 @@ Source0:    %{name}-%{version}.tar.gz
 %description
 Description: %{summary}
 
-%package emulfb
-Summary:    X11 X server misc files for emulfb
+%package common
+Summary:    architecture independent set of X11 X server configuration files
 Group:      System/X11
 Requires:   xserver-xorg-core
+Requires:   xorg-x11-drv-evdev-multitouch
+
+%description common
+Set of architecture independent files and scripts for X server
+
+%package %{ARCH}-common
+Summary:    X11 X server misc files for %{ARCH}
+Group:      System/X11
+Requires:   %{name}-common = %{version}
+
+%description %{ARCH}-common
+Set of architecture depended files and scripts for X server
+
+# emulfb
+
+%package emulfb
+Summary:    X11 X server misc files for emulated framebuffer device
+Group:      System/X11
+Requires:   %{name}-%{ARCH}-common = %{version}
+Provides:   xserver-xorg-misc-emulfb = %{version}
 
 %description emulfb
-Xorg server misc package which contains startx, xinitrc and xorg.conf file for emulfb
+Xorg server misc package which contains device specific configuration files
+
 
 %prep
 %setup -q
 
-%build
-{
-for f in `find %{ARCH}-common/ -name "*.in"`; do
-       cat $f > ${f%.in};
-       sed -i -e "s#@PREFIX@#/usr#g" ${f%.in};
-       sed -i -e "s#@DATADIR@#/opt#g" ${f%.in};
-       chmod a+x ${f%.in};
-done
-}
+%install
+mkdir -p %{buildroot}/usr/share/license
+cp -af COPYING %{buildroot}/usr/share/license/%{name}-emulfb
 
-%reconfigure \
-       --with-arch=%{ARCH} \
-       --with-conf-prefix=/opt
 
-make %{?jobs:-j%jobs}
+mkdir -p %{buildroot}/usr/bin
+mkdir -p %{buildroot}/etc/X11/xorg.conf.d
+mkdir -p %{buildroot}/etc/X11/arch-preinit.d
+mkdir -p %{buildroot}/etc/rc.d/init.d
+mkdir -p %{buildroot}/etc/rc.d/rc3.d
+mkdir -p %{buildroot}/etc/rc.d/rc4.d
+mkdir -p %{buildroot}/etc/profile.d
+
+%ifarch %{arm}
+install -m 755 common/startx %{buildroot}/usr/bin/startx
+install -m 755 common/xinitrc %{buildroot}/etc/X11/xinitrc
+install -m 755 common/xresources %{buildroot}/etc/rc.d/init.d/xresources
+%endif
+
+%ifarch %ix86
+install -m 755 %{ARCH}-common/startx %{buildroot}/usr/bin/startx
+install -m 755 %{ARCH}-common/xinitrc %{buildroot}/etc/X11/xinitrc
+install -m 755 %{ARCH}-common/xresources %{buildroot}/etc/rc.d/init.d/xresources
+%endif
+
+install -m 755 common/scripts/setcpu %{buildroot}/usr/bin/setcpu
+install -m 755 common/scripts/setpoll %{buildroot}/usr/bin/setpoll
+install -m 644 common/xorg.conf %{buildroot}/etc/X11/xorg.conf
+
+install -m 755 common/Xorg.sh %{buildroot}/etc/profile.d/Xorg.sh
+install -m 755 common/xserver %{buildroot}/etc/rc.d/init.d/xserver
+
+install -m 644 %{ARCH}-common/Xmodmap %{buildroot}/etc/X11/Xmodmap
+install -m 644 %{ARCH}-common/Xresources %{buildroot}/etc/X11/Xresources
+install -m 644 %{ARCH}-common/Xorg.arch-options %{buildroot}/etc/X11/Xorg.arch-options
+install -m 755 %{ARCH}-common/xsetrc %{buildroot}/etc/X11/xsetrc
+
+if [ -d %{ARCH}-common/arch-preinit.d ]; then
+    cp -a %{ARCH}-common/arch-preinit.d %{buildroot}/etc/X11/
+fi
 
-%install
-rm -rf %{buildroot}
-%make_install
-
-rm -fr %{buildroot}/opt/etc/X11/xorg.conf.d*
-mkdir -p %{buildroot}/etc/rc.d/init.d/
-mkdir -p %{buildroot}/etc/rc.d/rc3.d/
-mkdir -p %{buildroot}/etc/rc.d/rc4.d/
-mkdir -p %{buildroot}/etc/profile.d/
-mkdir -p %{buildroot}/%{_prefix}/etc/X11/
-cp -af %{ARCH}-common/xserver %{buildroot}/etc/rc.d/init.d/
-cp -af %{ARCH}-common/xresources %{buildroot}/etc/rc.d/init.d/
-cp -af %{ARCH}-common/xinitrc %{buildroot}/%{_prefix}/etc/X11/
-cp -af %{ARCH}-common/xsetrc %{buildroot}/%{_prefix}/etc/X11/
-cp -af %{ARCH}-common/Xmodmap %{buildroot}/opt/etc/X11/
 %ifarch %ix86
 ln -s /etc/rc.d/init.d/xserver %{buildroot}/etc/rc.d/rc3.d/S20xserver
 ln -s /etc/rc.d/init.d/xserver %{buildroot}/etc/rc.d/rc4.d/S20xserver
 %endif
+
 %ifarch %{arm}
 ln -s /etc/rc.d/init.d/xserver %{buildroot}/etc/rc.d/rc3.d/S02xserver
 ln -s /etc/rc.d/init.d/xserver %{buildroot}/etc/rc.d/rc4.d/S02xserver
 %endif
+
 ln -s /etc/rc.d/init.d/xresources %{buildroot}/etc/rc.d/rc3.d/S80xresources
 ln -s /etc/rc.d/init.d/xresources %{buildroot}/etc/rc.d/rc4.d/S80xresources
-cp -af %{ARCH}-common/Xorg.sh %{buildroot}/etc/profile.d/
+%if "%{?tizen_profile_name}" == "wearable"
+cp -Rd conf-%{ARCH}-emulfb-wearable %{buildroot}/etc/X11/conf-%{ARCH}-emulfb
+  %if "%{ARCH}" == "i386"
+    %if "%{?_repository}" == "emulator-circle"
+    mv %{buildroot}/etc/X11/conf-%{ARCH}-emulfb/input.conf.wc1 %{buildroot}/etc/X11/conf-%{ARCH}-emulfb/input.conf
+    %else
+    rm %{buildroot}/etc/X11/conf-%{ARCH}-emulfb/input.conf.wc1
+    %endif
+  %endif
+%else
+cp -Rd conf-%{ARCH}-emulfb-mobile %{buildroot}/etc/X11/conf-%{ARCH}-emulfb
+%endif
 
-cp -rf %{ARCH}-emulfb %{buildroot}/opt/etc/X11/
+# XXX Copy-paste terror - could some rpm guy help me unify this?
 
-%post emulfb
-ln -s /opt/etc/X11/%{ARCH}-emulfb/* /opt/etc/X11/
+%ifarch %{ix86}
+mkdir -p %{buildroot}%{_libdir}/systemd/system/basic.target.wants
+install -m 0644 %{ARCH}-common/xorg.service %{buildroot}%{_libdir}/systemd/system/xorg.service
+ln -s ../xorg.service %{buildroot}%{_libdir}/systemd/system/basic.target.wants/xorg.service
+mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
+install -m 0644 %{ARCH}-common/xresources.service %{buildroot}%{_libdir}/systemd/system/xresources.service
+ln -s ../xresources.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/xresources.service
+%endif
 
-%preun
-rm -f /opt/etc/X11/Xmodmap
-rm -f /opt/etc/X11/xorg.conf.d.*
+# arm/i386 emulfb
 
+%post emulfb
+mkdir -p /etc/X11/xorg.conf.d
+for i in /etc/X11/conf-%{ARCH}-emulfb/*; do
+    f="${i##*/}"
+    d="/etc/X11/xorg.conf.d/$f"
+    rm -f "$d"
+    ln -s "$i" "$d"
+done
+
+%files common
+/usr/bin/startx
+/usr/bin/setcpu
+/usr/bin/setpoll
+/etc/X11/xinitrc
+/etc/profile.d/Xorg.sh
+/etc/rc.d/init.d/*
+/etc/rc.d/rc3.d/*
+/etc/rc.d/rc4.d/*
+/etc/X11/xorg.conf
+
+
+%files %{ARCH}-common
+/etc/X11/Xmodmap
+/etc/X11/Xresources
+%attr(755,root,root) /etc/X11/xsetrc
+/etc/X11/Xorg.arch-options
+%dir /etc/X11/arch-preinit.d
+/etc/X11/arch-preinit.d/*
+
+%ifarch %{ix86}
 %files emulfb
-%defattr(-,root,root,-)
-%{_sysconfdir}/profile.d/Xorg.sh
-%{_sysconfdir}/rc.d/init.d/*
-%{_sysconfdir}/rc.d/rc3.d/*
-%{_sysconfdir}/rc.d/rc4.d/*
-%attr(-,inhouse,inhouse) /opt/etc/X11/Xresources
-%{_prefix}/etc/X11/xinitrc
-%{_prefix}/etc/X11/xsetrc
-/opt/etc/X11/Xmodmap
-%ifarch %{arm}
-/opt/etc/X11/xorg.conf
-/opt/etc/X11/arm-emulfb/xorg.conf.d.*/*.conf
-%else
-/opt/etc/X11/xorg.conf
-/opt/etc/X11/i386-emulfb/xorg.conf.d/*
+%manifest xorg-x11-misc-emulfb.manifest
+/usr/share/license/%{name}-emulfb
+/etc/X11/conf-%{ARCH}-emulfb/*
+%{_libdir}/systemd/system/xorg.service
+%{_libdir}/systemd/system/basic.target.wants/xorg.service
+%{_libdir}/systemd/system/xresources.service
+%{_libdir}/systemd/system/multi-user.target.wants/xresources.service
 %endif
-%{_bindir}/setcpu
-%{_bindir}/setpoll
-%{_bindir}/startx
 
+%ifarch %{arm}
+
+%files emulfb
+%manifest xorg-x11-misc-emulfb.manifest
+/usr/share/license/%{name}-emulfb
+/etc/X11/conf-%{ARCH}-emulfb/*
+
+%endif
diff --git a/xorg-x11-misc-arm-common.manifest b/xorg-x11-misc-arm-common.manifest
new file mode 100644 (file)
index 0000000..5df55dc
--- /dev/null
@@ -0,0 +1,13 @@
+<manifest>
+       <request>
+               <domain name="xorg"/>
+       </request>
+       <assign>
+                <filesystem path="/etc/rc.d/init.d/xserver" label="_" exec_label="none" />
+                <filesystem path="/etc/rc.d/init.d/xresources" label="_" exec_label="none" />
+                <filesystem path="/etc/rc.d/rc3.d/S02xserver" label="_" exec_label="none" />
+                <filesystem path="/etc/rc.d/rc4.d/S02xserver" label="_" exec_label="none" />
+                <filesystem path="/etc/rc.d/rc3.d/S80xresources" label="_" exec_label="none" />
+                <filesystem path="/etc/rc.d/rc4.d/S80xresources" label="_" exec_label="none" />
+       </assign>
+</manifest>
diff --git a/xorg-x11-misc-emulfb.manifest b/xorg-x11-misc-emulfb.manifest
new file mode 100644 (file)
index 0000000..bf728b0
--- /dev/null
@@ -0,0 +1,5 @@
+<manifest>
+       <request>
+               <domain name="xorg"/>
+       </request>
+</manifest>
diff --git a/xorg-x11-misc-i386-common.manifest b/xorg-x11-misc-i386-common.manifest
new file mode 100644 (file)
index 0000000..306c7f8
--- /dev/null
@@ -0,0 +1,13 @@
+<manifest>
+       <request>
+               <domain name="xorg"/>
+       </request>
+       <assign>
+                <filesystem path="/etc/rc.d/init.d/xserver" label="_" exec_label="none" />
+                <filesystem path="/etc/rc.d/init.d/xresources" label="_" exec_label="none" />
+                <filesystem path="/etc/rc.d/rc3.d/S20xserver" label="_" exec_label="none" />
+                <filesystem path="/etc/rc.d/rc4.d/S20xserver" label="_" exec_label="none" />
+                <filesystem path="/etc/rc.d/rc3.d/S80xresources" label="_" exec_label="none" />
+                <filesystem path="/etc/rc.d/rc4.d/S80xresources" label="_" exec_label="none" />
+       </assign>
+</manifest>