--- xorg-7.4+3.orig/debian/changelog
+++ xorg-7.4+3/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.4+3-0+interix.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * patches for interix-i386
+
+ -- Martin Koeppe <mkoeppe@gmx.de>  Sun, 19 Jul 2009 13:59:39 +0200
+
 xorg (1:7.4+3) unstable; urgency=low
 
   * Call db_stop at the end of xserver-xorg.postinst, otherwise debconf gets
--- xorg-7.4+3.orig/debian/rules
+++ xorg-7.4+3/debian/rules
@@ -23,6 +23,8 @@
 # debhelper
 export DH_OPTIONS
 
+CC = gcc -D_ALL_SOURCE
+
 include debian/xsfbs/xsfbs.mk
 
 # Get package version info.
@@ -94,7 +96,7 @@
 	dh_link
 	dh_compress
 	dh_fixperms
-	chown root:root debian/x11-common/etc/X11/Xsession
+	#chown root:root debian/x11-common/etc/X11/Xsession
 	chmod 755 debian/x11-common/etc/X11/Xsession
 	dh_installdeb
 	dh_gencontrol
@@ -117,7 +119,7 @@
 	dh_strip
 	dh_compress
 	dh_fixperms
-	chown root:root debian/xserver-xorg/usr/bin/X
+	#chown root:root debian/xserver-xorg/usr/bin/X
 	chmod ug+s debian/xserver-xorg/usr/bin/X
 	dh_installdeb
 	dh_shlibdeps
--- xorg-7.4+3.orig/debian/x11-common.init
+++ xorg-7.4+3/debian/x11-common.init
@@ -34,7 +34,7 @@
     mv $SOCKET_DIR $SOCKET_DIR.$$
   fi
   mkdir -p $SOCKET_DIR
-  chown root:root $SOCKET_DIR
+#  chown root:root $SOCKET_DIR
   chmod 1777 $SOCKET_DIR
   do_restorecon $SOCKET_DIR
   [ "$VERBOSE" != no ] && log_end_msg 0 || return 0
@@ -48,7 +48,7 @@
     mv $ICE_DIR $ICE_DIR.$$
   fi
   mkdir -p $ICE_DIR
-  chown root:root $ICE_DIR
+#  chown root:root $ICE_DIR
   chmod 1777 $ICE_DIR
   do_restorecon $ICE_DIR
   [ "$VERBOSE" != no ] && log_end_msg 0 || return 0
--- xorg-7.4+3.orig/debian/x11-common.postinst.in
+++ xorg-7.4+3/debian/x11-common.postinst.in
@@ -28,7 +28,7 @@
 fi
 
 if ! [ -d "$CONFIG_AUX_DIR" ]; then
-  mkdir --mode=755 --parents "$CONFIG_AUX_DIR"
+  mkdir -m 755 -p "$CONFIG_AUX_DIR"
 fi
 
 # only mess with config file it exists; otherwise, assume that's the way the
--- xorg-7.4+3.orig/debian/scripts/vars.interix-i386
+++ xorg-7.4+3/debian/scripts/vars.interix-i386
@@ -0,0 +1,20 @@
+
+# This file is NOT a shell script.
+#
+# This file gets included by both debian/rules (make) AND the scripts in
+# debian/scripts (Bourne shell).
+XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, xserver-xorg-video-ark, xserver-xorg-video-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-i810 | xserver-xorg-video-intel | xserver-xorg-video-i810-modesetting | xserver-xorg-video-intel-modesetting, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nsc, xserver-xorg-video-nv, xserver-xorg-video-rendition, xserver-xorg-video-s3, xserver-xorg-video-s3virge, xserver-xorg-video-savage, xserver-xorg-video-siliconmotion, xserver-xorg-video-sis, xserver-xorg-video-tdfx, xserver-xorg-video-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-voodoo"
+
+# xserver-xorg-video-glide,
+
+XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-kbd, xserver-xorg-input-mouse"
+
+# This file is NOT a shell script.
+#
+# This file gets included by both debian/rules (make) AND the scripts in
+# debian/scripts (Bourne shell).
+XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, xserver-xorg-video-ark, xserver-xorg-video-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-i810 | xserver-xorg-video-intel | xserver-xorg-video-i810-modesetting | xserver-xorg-video-intel-modesetting, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nsc, xserver-xorg-video-nv, xserver-xorg-video-rendition, xserver-xorg-video-s3, xserver-xorg-video-s3virge, xserver-xorg-video-savage, xserver-xorg-video-siliconmotion, xserver-xorg-video-sis, xserver-xorg-video-tdfx, xserver-xorg-video-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-voodoo"
+
+# xserver-xorg-video-glide,
+
+XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-kbd, xserver-xorg-input-mouse"