upload tizen2.0 source

diff --git a/arm-common/startx.in b/arm-common/startx.in
index 3ffaba8..2ba93f2 100755 (executable)
--- a/arm-common/startx.in
+++ b/arm-common/startx.in
@@ -2,16 +2,8 @@
 
 DISPLAY=":0"
 LOGDIR="/opt/var/log"
-XORG_CONF=" -config @DATADIR@/etc/X11/xorg.conf -configdir /opt/etc/X11/xorg.conf.d "
-OTHER_OPTIONS=" -logfile ${LOGDIR}/Xorg.0.log -ac -noreset -r +accessx 0 "
-
-udevadm trigger --subsystem-match=drm &
-udevadm trigger --subsystem-match=input &
-
-#check the existence of LOGDIR, if not create LOGDIR
-if [ ! -d ${LOGDIR} ]; then
-       mkdir -p ${LOGDIR}
-fi
+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
@@ -22,7 +14,7 @@ fi
 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
@@ -36,11 +28,11 @@ fi
 XSERVER_OPTIONS=" ${DISPLAY} ${OTHER_OPTIONS} ${XORG_CONF} "
 
 if [ "$1" = "--gdb" ]; then
-       if [ -x /usr/bin/pvrsrvinit ]; then         
-               pvrsrvinit start                    
+       if [ -x /usr/bin/pvrsrvinit ]; then
+               pvrsrvinit start
        fi
        gdb --args Xorg ${XSERVER_OPTIONS}
-else    
+else
        if [ "$1" = "--only" ]; then
                if [ -x /usr/bin/pvrsrvinit ]; then
                        pvrsrvinit start
@@ -50,5 +42,5 @@ else
        else
                xinit ${XINITRC} -- @PREFIX@/bin/Xorg ${XSERVER_OPTIONS} &
        fi
-fi    
+fi
 

diff --git a/arm-common/xinitrc b/arm-common/xinitrc
index 1dd3e49..0a676ec 100755 (executable)
--- a/arm-common/xinitrc
+++ b/arm-common/xinitrc
@@ -1,18 +1,12 @@
 #!/bin/sh
 
-/usr/bin/scim -d
-
-if [ ! -e /opt/etc/.hib_capturing ]; then
-       /usr/bin/system_server &
-fi
+/usr/bin/scim -d &
 
 # Link .e
 if [ ! -d ${HOME}/.e ]; then
        ln -s /opt/home/root/.e ${HOME}/.e
 fi
 
-udevadm trigger --subsystem-match=input
-
 # Remapping the keycodes to our key-symbols
 if [ -x /usr/bin/xmodmap ]; then
        if [ -e ~/.Xmodmap ]; then
@@ -32,3 +26,4 @@ if [ -x /usr/bin/xrdb ]; then
 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/xresources b/arm-common/xresources
index b8d7afc..9e4b2c1 100755 (executable)
--- a/arm-common/xresources
+++ b/arm-common/xresources
@@ -11,7 +11,7 @@ case "$1" in
       else
         /usr/bin/xrdb -load -nocpp /opt/etc/X11/Xresources
       fi
-      vconftool set -t int memory/hibernation/xresources_ready 1 -i -f
+      touch /tmp/hibernation/xresources_ready
     fi
   ;;
 

diff --git a/arm-common/xsetrc b/arm-common/xsetrc
new file mode 100755 (executable)
index 0000000..c35840d
--- /dev/null
+++ b/arm-common/xsetrc
@@ -0,0 +1,17 @@
+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

diff --git a/arm-emulfb/xorg.conf.d.default/display.conf b/arm-emulfb/xorg.conf.d.default/display.conf
index a6913cd..b47d207 100755 (executable)
--- a/arm-emulfb/xorg.conf.d.default/display.conf
+++ b/arm-emulfb/xorg.conf.d.default/display.conf
@@ -1,6 +1,7 @@
 Section "ServerLayout"
         Identifier              "Test Layout"
         Screen          0       "Screen0" 0 0
+       InputDevice             "Gesture"
 EndSection
 
 Section "Screen"

diff --git a/arm-emulfb/xorg.conf.d.default/input.conf b/arm-emulfb/xorg.conf.d.default/input.conf
index 52b11eb..6e9171a 100755 (executable)
--- a/arm-emulfb/xorg.conf.d.default/input.conf
+++ b/arm-emulfb/xorg.conf.d.default/input.conf
@@ -26,3 +26,9 @@ Section "InputClass"
         Driver "evdev"
 EndSection
 
+Section "InputDevice"
+        Identifier "Gesture"
+        Driver  "gesture"
+        Option  "Device"        "/dev/null"
+        Option  "Activate"      "1"
+EndSection

diff --git a/debian/changelog b/debian/changelog
index afa7502..b36fde1 100755 (executable)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,31 +1,955 @@
+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-116
+  * Tag: xserver-xorg-misc_0.0.1-115
 
- -- Sung-Jin Park <sj76.park@samsung.com>  Wed, 22 Feb 2012 11:28:58 +0900
+ -- 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
+  * 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>  Thu, 22 Dec 2011 13:39:15 +0900
+ -- Boram Park <boram1288.park@samsung.com>  Fri, 23 Dec 2011 10:11:28 +0900
 
 xserver-xorg-misc (0.0.1-114) unstable; urgency=low
 
-  * Modify xserver script in i386-common to work properly on old version of ps command
+  * 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>  Thu, 22 Dec 2011 11:43:09 +0900
+ -- 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
 
-  * initial version for Tizen
+  * 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 12:35:51 +0900
+ -- 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/control b/debian/control
index 8c6dfd5..892f76e 100755 (executable)
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,31 @@
 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>
+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
-Replaces: xserver-xorg-misc
+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/rules b/debian/rules
index 0a2b4aa..ef5d413 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -47,6 +47,12 @@ config.status: configure
 
        ./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*
 
@@ -105,13 +111,24 @@ install-common:
        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
 
@@ -119,6 +136,44 @@ install-emulfb: build-emulfb install-common
 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
@@ -136,9 +191,10 @@ binary-emulfb: build-emulfb install-emulfb
        -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-emulfb
+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/xserver-xorg-misc-s5pc110.postinst.in b/debian/xserver-xorg-misc-s5pc110.postinst.in
new file mode 100644 (file)
index 0000000..ca3e8f6
--- /dev/null
+++ b/debian/xserver-xorg-misc-s5pc110.postinst.in
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+mkdir -p /opt/var/log

diff --git a/debian/xserver-xorg-misc-s5pc210.postinst.in b/debian/xserver-xorg-misc-s5pc210.postinst.in
new file mode 100644 (file)
index 0000000..ca3e8f6
--- /dev/null
+++ b/debian/xserver-xorg-misc-s5pc210.postinst.in
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+mkdir -p /opt/var/log

diff --git a/i386-common/startx.in b/i386-common/startx.in
index b1a4f30..7db7275 100755 (executable)
--- a/i386-common/startx.in
+++ b/i386-common/startx.in
@@ -2,7 +2,7 @@
 
 DISPLAY=":0"
 XORG_CONF=" -config @DATADIR@/etc/X11/xorg.conf -configdir /opt/etc/X11/xorg.conf.d "
-OTHER_OPTIONS=" -ac -noreset -r +accessx 0 "
+OTHER_OPTIONS=" -ac -noreset +accessx 0 "
 
 udevadm trigger --subsystem-match=input &
 

diff --git a/i386-common/xinitrc b/i386-common/xinitrc
index 5e8419e..6358a9e 100755 (executable)
--- a/i386-common/xinitrc
+++ b/i386-common/xinitrc
@@ -9,8 +9,7 @@ if [ -x /usr/bin/xmodmap ]; then
        fi
 fi
 
-/usr/bin/scim -d
-/usr/bin/system_server &
+/usr/bin/scim -d &
 
 # Link .e
 if [ ! -d ${HOME}/.e ]; then
@@ -27,3 +26,4 @@ if [ -x /usr/bin/xrdb ]; then
 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
index 651c5a2..314fd2e 100755 (executable)
--- a/i386-common/xorg.conf
+++ b/i386-common/xorg.conf
@@ -38,11 +38,18 @@ Section "InputClass"
 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"
+        Option "MultiTouch"     "3"
 EndSection
 
 Section "InputClass"

diff --git a/i386-common/xserver b/i386-common/xserver
index 8026ca8..40f2667 100755 (executable)
--- a/i386-common/xserver
+++ b/i386-common/xserver
@@ -7,7 +7,7 @@ export PATH=/bin:/usr/bin/:/sbin:/usr/sbin
 
 case "$1" in
   start)
-    is_running=`ps | grep -v grep | awk '{ print \$6 }' | grep Xorg` || true
+    is_running=`ps ax | awk '{ print \$5 }' | grep Xorg` || true
     if [ "${is_running}" = "" ]; then                          
         echo "Starting Xorg server..."
         /usr/bin/startx
@@ -17,7 +17,7 @@ case "$1" in
   ;;
 
   restart|reload|force-reload)
-    is_running=`ps | grep -v grep | awk '{ print \$6 }' | grep Xorg` || true
+    is_running=`ps ax | awk '{ print \$5 }' | grep Xorg` || true                
     if [ "${is_running}" != "" ]; then                                           
         $0 stop || true
         sleep 3
@@ -26,7 +26,7 @@ case "$1" in
   ;;
 
   stop)
-    is_running=`ps | grep -v grep | awk '{ print \$6 }' | grep Xorg` || true
+    is_running=`ps ax | awk '{ print \$5 }' | grep Xorg` || true
     if [ "${is_running}" != "" ]; then                        
         echo "Stopping Xorg server..."
         killall -9 Xorg
@@ -36,7 +36,7 @@ case "$1" in
   ;;
 
   status)
-    is_running=`ps | grep -v grep | awk '{ print \$6 }' | grep Xorg` || true
+    is_running=`ps ax | awk '{ print \$5 }' | grep Xorg` || true
     if [ "${is_running}" = "" ]; then
         echo "Xorg server is not running..."
     else

diff --git a/i386-common/xsetrc b/i386-common/xsetrc
new file mode 100755 (executable)
index 0000000..0921e39
--- /dev/null
+++ b/i386-common/xsetrc
@@ -0,0 +1,11 @@
+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

diff --git a/packaging/xorg-x11-server-misc.spec b/packaging/xorg-x11-misc.spec
similarity index 52%
rename from packaging/xorg-x11-server-misc.spec
rename to packaging/xorg-x11-misc.spec
index de37b9c..496337c 100644 (file)
--- a/packaging/xorg-x11-server-misc.spec
+++ b/packaging/xorg-x11-misc.spec
@@ -1,3 +1,5 @@
+#sbs-git:slp/pkgs/xorg/driver/xserver-xorg-misc xserver-xorg-misc 0.0.1 13496ac354ad7f6709f1ef9b880a206a2df41c80
+
 %ifarch %ix86
 %define ARCH i386
 %endif
@@ -6,10 +8,10 @@
 %define ARCH arm
 %endif
 
-Name:       xorg-x11-server-misc
+Name:  xorg-x11-misc
 Summary:    X.Org X11 X server misc packages
-Version:    0.0.1
-Release:    1
+Version: 0.0.1
+Release:    99
 Group:      System/X11
 License:    MIT
 Source0:    %{name}-%{version}.tar.gz
@@ -17,30 +19,30 @@ Source0:    %{name}-%{version}.tar.gz
 %description
 Description: %{summary}
 
-
 %package emulfb
-Summary:    X11 X server misc files for s5pc110
+Summary:    X11 X server misc files for emulfb
 Group:      System/X11
 Requires:   xserver-xorg-core
 
 %description emulfb
 Xorg server misc package which contains startx, xinitrc and xorg.conf file for emulfb
 
-
 %prep
-%setup -q -n %{name}-%{version}
-
+%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};
+       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
+}
 
-./autogen.sh
-%configure --with-arch=%{ARCH} --with-conf-prefix=/opt
+%reconfigure \
+       --with-arch=%{ARCH} \
+       --with-conf-prefix=/opt
 
 make %{?jobs:-j%jobs}
 
@@ -48,7 +50,7 @@ make %{?jobs:-j%jobs}
 rm -rf %{buildroot}
 %make_install
 
-#rm -fr %{buildroot}/opt/etc/X11/xorg.conf.d*
+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/
@@ -57,42 +59,47 @@ 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/
-ln -sf /etc/rc.d/init.d/xserver %{buildroot}/etc/rc.d/rc3.d/S20xserver
-ln -sf /etc/rc.d/init.d/xserver %{buildroot}/etc/rc.d/rc4.d/S20xserver
-ln -sf /etc/rc.d/init.d/xresources %{buildroot}/etc/rc.d/rc3.d/S80xresources
-ln -sf /etc/rc.d/init.d/xresources %{buildroot}/etc/rc.d/rc4.d/S80xresources
-cp -af %{ARCH}-common/Xorg.sh %{buildroot}/etc/profile.d/
+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/
 
 cp -rf %{ARCH}-emulfb %{buildroot}/opt/etc/X11/
-mkdir -p %{buildroot}/opt/etc/X11/xorg.conf.d
 
 %post emulfb
-if [ -d /opt/etc/X11/xorg.conf.d ]; then
-    rm -rf /opt/etc/X11/xorg.conf.d
-    ln -sf /opt/etc/X11/xorg.conf.d.default /opt/etc/X11/xorg.conf.d
-fi
-ln -s /opt/etc/X11/%{ARCH}-emulfb/* /opt/etc/X11/  
+ln -s /opt/etc/X11/%{ARCH}-emulfb/* /opt/etc/X11/
 
-%preun emulfb
+%preun
 rm -f /opt/etc/X11/Xmodmap
 rm -f /opt/etc/X11/xorg.conf.d.*
 
-%post
-chown -R 5000:5000 /opt/etc/X11/Xresources
-
 %files emulfb
-/opt/etc/X11/xorg.conf.d
+%defattr(-,root,root,-)
 %{_sysconfdir}/profile.d/Xorg.sh
 %{_sysconfdir}/rc.d/init.d/*
 %{_sysconfdir}/rc.d/rc3.d/*
 %{_sysconfdir}/rc.d/rc4.d/*
-/opt/etc/X11/Xresources
-/opt/etc/X11/xorg.conf
+%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/*
+%endif
 %{_bindir}/setcpu
 %{_bindir}/setpoll
 %{_bindir}/startx
-/opt/etc/X11/Xmodmap
-/opt/etc/X11/%{ARCH}-emulfb/*