From 7d1267848571b91a1fd7e19705381ea465e9b4d4 Mon Sep 17 00:00:00 2001 From: mirko Date: Tue, 9 Dec 2008 23:24:25 +0000 Subject: [PATCH] seperate xorg-tree from other x11-stuff git-svn-id: svn://svn.openwrt.org/openwrt/packages@13571 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- Xorg/{ => xorg}/app/font-util/Makefile | 0 Xorg/{ => xorg}/app/fontconfig/Makefile | 0 Xorg/{ => xorg}/app/iceauth/Makefile | 0 Xorg/{ => xorg}/app/x11perf/Makefile | 0 Xorg/{ => xorg}/app/xauth/Makefile | 0 Xorg/{ => xorg}/app/xrandr/Makefile | 0 Xorg/{ => xorg}/app/xrandr/patches/001-xrandr-1.2.2-clone-nameclash.patch | 0 Xorg/{ => xorg}/app/xset/Makefile | 0 Xorg/{ => xorg}/app/xsetroot/Makefile | 0 Xorg/{ => xorg}/data/xbitmaps/Makefile | 0 Xorg/{ => xorg}/driver/packages | 0 Xorg/{ => xorg}/driver/template.mk | 0 Xorg/{ => xorg}/driver/xf86-input-evdev/Makefile | 0 Xorg/{ => xorg}/driver/xf86-input-keyboard/Makefile | 0 Xorg/{ => xorg}/driver/xf86-input-mouse/Makefile | 0 Xorg/{ => xorg}/driver/xf86-video-ati/Makefile | 0 Xorg/{ => xorg}/driver/xf86-video-fbdev/Makefile | 0 Xorg/{ => xorg}/driver/xf86-video-geode/Makefile | 0 Xorg/{ => xorg}/driver/xf86-video-intel/Makefile | 0 Xorg/{ => xorg}/driver/xf86-video-nv/Makefile | 0 Xorg/{ => xorg}/driver/xf86-video-vesa/Makefile | 0 .../driver/xf86-video-vesa/patches/010-dont-mess-up-include-paths.patch | 0 Xorg/{ => xorg}/font/encodings/Makefile | 0 Xorg/{ => xorg}/font/font-alias/Makefile | 0 Xorg/{ => xorg}/font/font-bh-75dpi/Makefile | 0 Xorg/{ => xorg}/font/font-cursor-misc/Makefile | 0 Xorg/{ => xorg}/font/font-daewoo-misc/Makefile | 0 Xorg/{ => xorg}/font/font-dec-misc/Makefile | 0 Xorg/{ => xorg}/font/font-ibm-type1/Makefile | 0 Xorg/{ => xorg}/font/font-isas-misc/Makefile | 0 Xorg/{ => xorg}/font/font-jis-misc/Makefile | 0 Xorg/{ => xorg}/font/font-micro-misc/Makefile | 0 Xorg/{ => xorg}/font/font-misc-cyrillic/Makefile | 0 Xorg/{ => xorg}/font/font-misc-misc/Makefile | 0 Xorg/{ => xorg}/font/font-misc-misc/files/fonts.dir.font-base | 0 Xorg/{ => xorg}/font/font-misc-misc/files/fonts.dir.font-misc-misc | 0 Xorg/{ => xorg}/font/font-xfree86-type1/Makefile | 0 Xorg/{ => xorg}/font/packages | 0 Xorg/{ => xorg}/font/template.mk | 0 Xorg/{ => xorg}/lib/libICE/Makefile | 0 Xorg/{ => xorg}/lib/libSM/Makefile | 0 Xorg/{ => xorg}/lib/libX11/Makefile | 0 Xorg/{ => xorg}/lib/libX11/patches/003-cross-compile.patch | 0 Xorg/{ => xorg}/lib/libXau/Makefile | 0 Xorg/{ => xorg}/lib/libXaw/Makefile | 0 Xorg/{ => xorg}/lib/libXcursor/Makefile | 0 Xorg/{ => xorg}/lib/libXdamage/Makefile | 0 Xorg/{ => xorg}/lib/libXdmcp/Makefile | 0 Xorg/{ => xorg}/lib/libXext/Makefile | 0 Xorg/{ => xorg}/lib/libXfixes/Makefile | 0 Xorg/{ => xorg}/lib/libXfont/Makefile | 0 Xorg/{ => xorg}/lib/libXft/Makefile | 0 Xorg/{ => xorg}/lib/libXi/Makefile | 0 Xorg/{ => xorg}/lib/libXmu/Makefile | 0 Xorg/{ => xorg}/lib/libXpm/Makefile | 0 Xorg/{ => xorg}/lib/libXrandr/Makefile | 0 Xorg/{ => xorg}/lib/libXrender/Makefile | 0 Xorg/{ => xorg}/lib/libXt/Makefile | 0 Xorg/{ => xorg}/lib/libXt/patches/001-cross-compiling.patch | 0 Xorg/{ => xorg}/lib/libXtst/Makefile | 0 Xorg/{ => xorg}/lib/libXv/Makefile | 0 Xorg/{ => xorg}/lib/libXvMC/Makefile | 0 Xorg/{ => xorg}/lib/libXxf86misc/Makefile | 0 Xorg/{ => xorg}/lib/libXxf86vm/Makefile | 0 Xorg/{ => xorg}/lib/libfontenc/Makefile | 0 Xorg/{ => xorg}/lib/libpciaccess/Makefile | 0 Xorg/{ => xorg}/lib/libxkbfile/Makefile | 0 Xorg/{ => xorg}/lib/xtrans/Makefile | 0 Xorg/{ => xorg}/proto/applewmproto/Makefile | 0 Xorg/{ => xorg}/proto/bigreqsproto/Makefile | 0 Xorg/{ => xorg}/proto/calibrateproto/Makefile | 0 Xorg/{ => xorg}/proto/calibrateproto/src/ChangeLog | 0 Xorg/{ => xorg}/proto/calibrateproto/src/Makefile | 0 Xorg/{ => xorg}/proto/calibrateproto/src/Makefile.am | 0 Xorg/{ => xorg}/proto/calibrateproto/src/Makefile.in | 0 Xorg/{ => xorg}/proto/calibrateproto/src/aclocal.m4 | 0 Xorg/{ => xorg}/proto/calibrateproto/src/autogen.sh | 0 Xorg/{ => xorg}/proto/calibrateproto/src/config.log | 0 Xorg/{ => xorg}/proto/calibrateproto/src/config.status | 0 Xorg/{ => xorg}/proto/calibrateproto/src/configure | 0 Xorg/{ => xorg}/proto/calibrateproto/src/configure.ac | 0 Xorg/{ => xorg}/proto/calibrateproto/src/install-sh | 0 Xorg/{ => xorg}/proto/calibrateproto/src/missing | 0 Xorg/{ => xorg}/proto/calibrateproto/src/xcalibrateproto.h | 0 Xorg/{ => xorg}/proto/calibrateproto/src/xcalibrateproto.pc | 0 Xorg/{ => xorg}/proto/calibrateproto/src/xcalibrateproto.pc.in | 0 Xorg/{ => xorg}/proto/calibrateproto/src/xcalibratewire.h | 0 Xorg/{ => xorg}/proto/compositeproto/Makefile | 0 Xorg/{ => xorg}/proto/damageproto/Makefile | 0 Xorg/{ => xorg}/proto/dmxproto/Makefile | 0 Xorg/{ => xorg}/proto/evieext/Makefile | 0 Xorg/{ => xorg}/proto/fixesproto/Makefile | 0 Xorg/{ => xorg}/proto/fontcacheproto/Makefile | 0 Xorg/{ => xorg}/proto/fontsproto/Makefile | 0 Xorg/{ => xorg}/proto/glproto/Makefile | 0 Xorg/{ => xorg}/proto/inputproto/Makefile | 0 Xorg/{ => xorg}/proto/kbproto/Makefile | 0 Xorg/{ => xorg}/proto/packages | 0 Xorg/{ => xorg}/proto/printproto/Makefile | 0 Xorg/{ => xorg}/proto/randrproto/Makefile | 0 Xorg/{ => xorg}/proto/recordproto/Makefile | 0 Xorg/{ => xorg}/proto/renderproto/Makefile | 0 Xorg/{ => xorg}/proto/resourceproto/Makefile | 0 Xorg/{ => xorg}/proto/scrnsaverproto/Makefile | 0 Xorg/{ => xorg}/proto/template.mk | 0 Xorg/{ => xorg}/proto/trapproto/Makefile | 0 Xorg/{ => xorg}/proto/videoproto/Makefile | 0 Xorg/{ => xorg}/proto/windowswmproto/Makefile | 0 Xorg/{ => xorg}/proto/xcmiscproto/Makefile | 0 Xorg/{ => xorg}/proto/xextproto/Makefile | 0 Xorg/{ => xorg}/proto/xf86bigfontproto/Makefile | 0 Xorg/{ => xorg}/proto/xf86dgaproto/Makefile | 0 Xorg/{ => xorg}/proto/xf86driproto/Makefile | 0 Xorg/{ => xorg}/proto/xf86miscproto/Makefile | 0 Xorg/{ => xorg}/proto/xf86rushproto/Makefile | 0 Xorg/{ => xorg}/proto/xf86vidmodeproto/Makefile | 0 Xorg/{ => xorg}/proto/xineramaproto/Makefile | 0 Xorg/{ => xorg}/proto/xproto/Makefile | 0 Xorg/{ => xorg}/util/util-macros/Makefile | 0 Xorg/{xserver/xorg-xserver => xorg/xserver/xorg-server}/Config.in | 0 Xorg/{xserver/xorg-xserver => xorg/xserver/xorg-server}/Makefile | 0 .../xorg-xserver => xorg/xserver/xorg-server}/files/config/generic | 0 Xorg/{xserver/xorg-xserver => xorg/xserver/xorg-server}/files/config/olpc | 0 .../xorg-xserver => xorg/xserver/xorg-server}/files/config/om_gta02 | 0 .../xorg-xserver => xorg/xserver/xorg-server}/files/tmp/xorg-olpc.conf | 0 .../xserver/xorg-server}/files/tmp/xorg-om_gta02.conf | 0 .../xorg-xserver => xorg/xserver/xorg-server}/files/tmp/xorg.conf | 0 Xorg/{xserver/xorg-xserver => xorg/xserver/xorg-server}/files/x.init | 0 .../xorg-xserver => xorg/xserver/xorg-server}/patches/001-tslib.patch | 0 .../xserver/xorg-server}/patches/002-480x640-support.patch | 0 130 files changed, 0 insertions(+), 0 deletions(-) rename Xorg/{ => xorg}/app/font-util/Makefile (100%) rename Xorg/{ => xorg}/app/fontconfig/Makefile (100%) rename Xorg/{ => xorg}/app/iceauth/Makefile (100%) rename Xorg/{ => xorg}/app/x11perf/Makefile (100%) rename Xorg/{ => xorg}/app/xauth/Makefile (100%) rename Xorg/{ => xorg}/app/xrandr/Makefile (100%) rename Xorg/{ => xorg}/app/xrandr/patches/001-xrandr-1.2.2-clone-nameclash.patch (100%) rename Xorg/{ => xorg}/app/xset/Makefile (100%) rename Xorg/{ => xorg}/app/xsetroot/Makefile (100%) rename Xorg/{ => xorg}/data/xbitmaps/Makefile (100%) rename Xorg/{ => xorg}/driver/packages (100%) rename Xorg/{ => xorg}/driver/template.mk (100%) rename Xorg/{ => xorg}/driver/xf86-input-evdev/Makefile (100%) rename Xorg/{ => xorg}/driver/xf86-input-keyboard/Makefile (100%) rename Xorg/{ => xorg}/driver/xf86-input-mouse/Makefile (100%) rename Xorg/{ => xorg}/driver/xf86-video-ati/Makefile (100%) rename Xorg/{ => xorg}/driver/xf86-video-fbdev/Makefile (100%) rename Xorg/{ => xorg}/driver/xf86-video-geode/Makefile (100%) rename Xorg/{ => xorg}/driver/xf86-video-intel/Makefile (100%) rename Xorg/{ => xorg}/driver/xf86-video-nv/Makefile (100%) rename Xorg/{ => xorg}/driver/xf86-video-vesa/Makefile (100%) rename Xorg/{ => xorg}/driver/xf86-video-vesa/patches/010-dont-mess-up-include-paths.patch (100%) rename Xorg/{ => xorg}/font/encodings/Makefile (100%) rename Xorg/{ => xorg}/font/font-alias/Makefile (100%) rename Xorg/{ => xorg}/font/font-bh-75dpi/Makefile (100%) rename Xorg/{ => xorg}/font/font-cursor-misc/Makefile (100%) rename Xorg/{ => xorg}/font/font-daewoo-misc/Makefile (100%) rename Xorg/{ => xorg}/font/font-dec-misc/Makefile (100%) rename Xorg/{ => xorg}/font/font-ibm-type1/Makefile (100%) rename Xorg/{ => xorg}/font/font-isas-misc/Makefile (100%) rename Xorg/{ => xorg}/font/font-jis-misc/Makefile (100%) rename Xorg/{ => xorg}/font/font-micro-misc/Makefile (100%) rename Xorg/{ => xorg}/font/font-misc-cyrillic/Makefile (100%) rename Xorg/{ => xorg}/font/font-misc-misc/Makefile (100%) rename Xorg/{ => xorg}/font/font-misc-misc/files/fonts.dir.font-base (100%) rename Xorg/{ => xorg}/font/font-misc-misc/files/fonts.dir.font-misc-misc (100%) rename Xorg/{ => xorg}/font/font-xfree86-type1/Makefile (100%) rename Xorg/{ => xorg}/font/packages (100%) rename Xorg/{ => xorg}/font/template.mk (100%) rename Xorg/{ => xorg}/lib/libICE/Makefile (100%) rename Xorg/{ => xorg}/lib/libSM/Makefile (100%) rename Xorg/{ => xorg}/lib/libX11/Makefile (100%) rename Xorg/{ => xorg}/lib/libX11/patches/003-cross-compile.patch (100%) rename Xorg/{ => xorg}/lib/libXau/Makefile (100%) rename Xorg/{ => xorg}/lib/libXaw/Makefile (100%) rename Xorg/{ => xorg}/lib/libXcursor/Makefile (100%) rename Xorg/{ => xorg}/lib/libXdamage/Makefile (100%) rename Xorg/{ => xorg}/lib/libXdmcp/Makefile (100%) rename Xorg/{ => xorg}/lib/libXext/Makefile (100%) rename Xorg/{ => xorg}/lib/libXfixes/Makefile (100%) rename Xorg/{ => xorg}/lib/libXfont/Makefile (100%) rename Xorg/{ => xorg}/lib/libXft/Makefile (100%) rename Xorg/{ => xorg}/lib/libXi/Makefile (100%) rename Xorg/{ => xorg}/lib/libXmu/Makefile (100%) rename Xorg/{ => xorg}/lib/libXpm/Makefile (100%) rename Xorg/{ => xorg}/lib/libXrandr/Makefile (100%) rename Xorg/{ => xorg}/lib/libXrender/Makefile (100%) rename Xorg/{ => xorg}/lib/libXt/Makefile (100%) rename Xorg/{ => xorg}/lib/libXt/patches/001-cross-compiling.patch (100%) rename Xorg/{ => xorg}/lib/libXtst/Makefile (100%) rename Xorg/{ => xorg}/lib/libXv/Makefile (100%) rename Xorg/{ => xorg}/lib/libXvMC/Makefile (100%) rename Xorg/{ => xorg}/lib/libXxf86misc/Makefile (100%) rename Xorg/{ => xorg}/lib/libXxf86vm/Makefile (100%) rename Xorg/{ => xorg}/lib/libfontenc/Makefile (100%) rename Xorg/{ => xorg}/lib/libpciaccess/Makefile (100%) rename Xorg/{ => xorg}/lib/libxkbfile/Makefile (100%) rename Xorg/{ => xorg}/lib/xtrans/Makefile (100%) rename Xorg/{ => xorg}/proto/applewmproto/Makefile (100%) rename Xorg/{ => xorg}/proto/bigreqsproto/Makefile (100%) rename Xorg/{ => xorg}/proto/calibrateproto/Makefile (100%) rename Xorg/{ => xorg}/proto/calibrateproto/src/ChangeLog (100%) rename Xorg/{ => xorg}/proto/calibrateproto/src/Makefile (100%) rename Xorg/{ => xorg}/proto/calibrateproto/src/Makefile.am (100%) rename Xorg/{ => xorg}/proto/calibrateproto/src/Makefile.in (100%) rename Xorg/{ => xorg}/proto/calibrateproto/src/aclocal.m4 (100%) rename Xorg/{ => xorg}/proto/calibrateproto/src/autogen.sh (100%) rename Xorg/{ => xorg}/proto/calibrateproto/src/config.log (100%) rename Xorg/{ => xorg}/proto/calibrateproto/src/config.status (100%) rename Xorg/{ => xorg}/proto/calibrateproto/src/configure (100%) rename Xorg/{ => xorg}/proto/calibrateproto/src/configure.ac (100%) rename Xorg/{ => xorg}/proto/calibrateproto/src/install-sh (100%) rename Xorg/{ => xorg}/proto/calibrateproto/src/missing (100%) rename Xorg/{ => xorg}/proto/calibrateproto/src/xcalibrateproto.h (100%) rename Xorg/{ => xorg}/proto/calibrateproto/src/xcalibrateproto.pc (100%) rename Xorg/{ => xorg}/proto/calibrateproto/src/xcalibrateproto.pc.in (100%) rename Xorg/{ => xorg}/proto/calibrateproto/src/xcalibratewire.h (100%) rename Xorg/{ => xorg}/proto/compositeproto/Makefile (100%) rename Xorg/{ => xorg}/proto/damageproto/Makefile (100%) rename Xorg/{ => xorg}/proto/dmxproto/Makefile (100%) rename Xorg/{ => xorg}/proto/evieext/Makefile (100%) rename Xorg/{ => xorg}/proto/fixesproto/Makefile (100%) rename Xorg/{ => xorg}/proto/fontcacheproto/Makefile (100%) rename Xorg/{ => xorg}/proto/fontsproto/Makefile (100%) rename Xorg/{ => xorg}/proto/glproto/Makefile (100%) rename Xorg/{ => xorg}/proto/inputproto/Makefile (100%) rename Xorg/{ => xorg}/proto/kbproto/Makefile (100%) rename Xorg/{ => xorg}/proto/packages (100%) rename Xorg/{ => xorg}/proto/printproto/Makefile (100%) rename Xorg/{ => xorg}/proto/randrproto/Makefile (100%) rename Xorg/{ => xorg}/proto/recordproto/Makefile (100%) rename Xorg/{ => xorg}/proto/renderproto/Makefile (100%) rename Xorg/{ => xorg}/proto/resourceproto/Makefile (100%) rename Xorg/{ => xorg}/proto/scrnsaverproto/Makefile (100%) rename Xorg/{ => xorg}/proto/template.mk (100%) rename Xorg/{ => xorg}/proto/trapproto/Makefile (100%) rename Xorg/{ => xorg}/proto/videoproto/Makefile (100%) rename Xorg/{ => xorg}/proto/windowswmproto/Makefile (100%) rename Xorg/{ => xorg}/proto/xcmiscproto/Makefile (100%) rename Xorg/{ => xorg}/proto/xextproto/Makefile (100%) rename Xorg/{ => xorg}/proto/xf86bigfontproto/Makefile (100%) rename Xorg/{ => xorg}/proto/xf86dgaproto/Makefile (100%) rename Xorg/{ => xorg}/proto/xf86driproto/Makefile (100%) rename Xorg/{ => xorg}/proto/xf86miscproto/Makefile (100%) rename Xorg/{ => xorg}/proto/xf86rushproto/Makefile (100%) rename Xorg/{ => xorg}/proto/xf86vidmodeproto/Makefile (100%) rename Xorg/{ => xorg}/proto/xineramaproto/Makefile (100%) rename Xorg/{ => xorg}/proto/xproto/Makefile (100%) rename Xorg/{ => xorg}/util/util-macros/Makefile (100%) rename Xorg/{xserver/xorg-xserver => xorg/xserver/xorg-server}/Config.in (100%) rename Xorg/{xserver/xorg-xserver => xorg/xserver/xorg-server}/Makefile (100%) rename Xorg/{xserver/xorg-xserver => xorg/xserver/xorg-server}/files/config/generic (100%) rename Xorg/{xserver/xorg-xserver => xorg/xserver/xorg-server}/files/config/olpc (100%) rename Xorg/{xserver/xorg-xserver => xorg/xserver/xorg-server}/files/config/om_gta02 (100%) rename Xorg/{xserver/xorg-xserver => xorg/xserver/xorg-server}/files/tmp/xorg-olpc.conf (100%) rename Xorg/{xserver/xorg-xserver => xorg/xserver/xorg-server}/files/tmp/xorg-om_gta02.conf (100%) rename Xorg/{xserver/xorg-xserver => xorg/xserver/xorg-server}/files/tmp/xorg.conf (100%) rename Xorg/{xserver/xorg-xserver => xorg/xserver/xorg-server}/files/x.init (100%) rename Xorg/{xserver/xorg-xserver => xorg/xserver/xorg-server}/patches/001-tslib.patch (100%) rename Xorg/{xserver/xorg-xserver => xorg/xserver/xorg-server}/patches/002-480x640-support.patch (100%) diff --git a/Xorg/app/font-util/Makefile b/Xorg/xorg/app/font-util/Makefile similarity index 100% rename from Xorg/app/font-util/Makefile rename to Xorg/xorg/app/font-util/Makefile diff --git a/Xorg/app/fontconfig/Makefile b/Xorg/xorg/app/fontconfig/Makefile similarity index 100% rename from Xorg/app/fontconfig/Makefile rename to Xorg/xorg/app/fontconfig/Makefile diff --git a/Xorg/app/iceauth/Makefile b/Xorg/xorg/app/iceauth/Makefile similarity index 100% rename from Xorg/app/iceauth/Makefile rename to Xorg/xorg/app/iceauth/Makefile diff --git a/Xorg/app/x11perf/Makefile b/Xorg/xorg/app/x11perf/Makefile similarity index 100% rename from Xorg/app/x11perf/Makefile rename to Xorg/xorg/app/x11perf/Makefile diff --git a/Xorg/app/xauth/Makefile b/Xorg/xorg/app/xauth/Makefile similarity index 100% rename from Xorg/app/xauth/Makefile rename to Xorg/xorg/app/xauth/Makefile diff --git a/Xorg/app/xrandr/Makefile b/Xorg/xorg/app/xrandr/Makefile similarity index 100% rename from Xorg/app/xrandr/Makefile rename to Xorg/xorg/app/xrandr/Makefile diff --git a/Xorg/app/xrandr/patches/001-xrandr-1.2.2-clone-nameclash.patch b/Xorg/xorg/app/xrandr/patches/001-xrandr-1.2.2-clone-nameclash.patch similarity index 100% rename from Xorg/app/xrandr/patches/001-xrandr-1.2.2-clone-nameclash.patch rename to Xorg/xorg/app/xrandr/patches/001-xrandr-1.2.2-clone-nameclash.patch diff --git a/Xorg/app/xset/Makefile b/Xorg/xorg/app/xset/Makefile similarity index 100% rename from Xorg/app/xset/Makefile rename to Xorg/xorg/app/xset/Makefile diff --git a/Xorg/app/xsetroot/Makefile b/Xorg/xorg/app/xsetroot/Makefile similarity index 100% rename from Xorg/app/xsetroot/Makefile rename to Xorg/xorg/app/xsetroot/Makefile diff --git a/Xorg/data/xbitmaps/Makefile b/Xorg/xorg/data/xbitmaps/Makefile similarity index 100% rename from Xorg/data/xbitmaps/Makefile rename to Xorg/xorg/data/xbitmaps/Makefile diff --git a/Xorg/driver/packages b/Xorg/xorg/driver/packages similarity index 100% rename from Xorg/driver/packages rename to Xorg/xorg/driver/packages diff --git a/Xorg/driver/template.mk b/Xorg/xorg/driver/template.mk similarity index 100% rename from Xorg/driver/template.mk rename to Xorg/xorg/driver/template.mk diff --git a/Xorg/driver/xf86-input-evdev/Makefile b/Xorg/xorg/driver/xf86-input-evdev/Makefile similarity index 100% rename from Xorg/driver/xf86-input-evdev/Makefile rename to Xorg/xorg/driver/xf86-input-evdev/Makefile diff --git a/Xorg/driver/xf86-input-keyboard/Makefile b/Xorg/xorg/driver/xf86-input-keyboard/Makefile similarity index 100% rename from Xorg/driver/xf86-input-keyboard/Makefile rename to Xorg/xorg/driver/xf86-input-keyboard/Makefile diff --git a/Xorg/driver/xf86-input-mouse/Makefile b/Xorg/xorg/driver/xf86-input-mouse/Makefile similarity index 100% rename from Xorg/driver/xf86-input-mouse/Makefile rename to Xorg/xorg/driver/xf86-input-mouse/Makefile diff --git a/Xorg/driver/xf86-video-ati/Makefile b/Xorg/xorg/driver/xf86-video-ati/Makefile similarity index 100% rename from Xorg/driver/xf86-video-ati/Makefile rename to Xorg/xorg/driver/xf86-video-ati/Makefile diff --git a/Xorg/driver/xf86-video-fbdev/Makefile b/Xorg/xorg/driver/xf86-video-fbdev/Makefile similarity index 100% rename from Xorg/driver/xf86-video-fbdev/Makefile rename to Xorg/xorg/driver/xf86-video-fbdev/Makefile diff --git a/Xorg/driver/xf86-video-geode/Makefile b/Xorg/xorg/driver/xf86-video-geode/Makefile similarity index 100% rename from Xorg/driver/xf86-video-geode/Makefile rename to Xorg/xorg/driver/xf86-video-geode/Makefile diff --git a/Xorg/driver/xf86-video-intel/Makefile b/Xorg/xorg/driver/xf86-video-intel/Makefile similarity index 100% rename from Xorg/driver/xf86-video-intel/Makefile rename to Xorg/xorg/driver/xf86-video-intel/Makefile diff --git a/Xorg/driver/xf86-video-nv/Makefile b/Xorg/xorg/driver/xf86-video-nv/Makefile similarity index 100% rename from Xorg/driver/xf86-video-nv/Makefile rename to Xorg/xorg/driver/xf86-video-nv/Makefile diff --git a/Xorg/driver/xf86-video-vesa/Makefile b/Xorg/xorg/driver/xf86-video-vesa/Makefile similarity index 100% rename from Xorg/driver/xf86-video-vesa/Makefile rename to Xorg/xorg/driver/xf86-video-vesa/Makefile diff --git a/Xorg/driver/xf86-video-vesa/patches/010-dont-mess-up-include-paths.patch b/Xorg/xorg/driver/xf86-video-vesa/patches/010-dont-mess-up-include-paths.patch similarity index 100% rename from Xorg/driver/xf86-video-vesa/patches/010-dont-mess-up-include-paths.patch rename to Xorg/xorg/driver/xf86-video-vesa/patches/010-dont-mess-up-include-paths.patch diff --git a/Xorg/font/encodings/Makefile b/Xorg/xorg/font/encodings/Makefile similarity index 100% rename from Xorg/font/encodings/Makefile rename to Xorg/xorg/font/encodings/Makefile diff --git a/Xorg/font/font-alias/Makefile b/Xorg/xorg/font/font-alias/Makefile similarity index 100% rename from Xorg/font/font-alias/Makefile rename to Xorg/xorg/font/font-alias/Makefile diff --git a/Xorg/font/font-bh-75dpi/Makefile b/Xorg/xorg/font/font-bh-75dpi/Makefile similarity index 100% rename from Xorg/font/font-bh-75dpi/Makefile rename to Xorg/xorg/font/font-bh-75dpi/Makefile diff --git a/Xorg/font/font-cursor-misc/Makefile b/Xorg/xorg/font/font-cursor-misc/Makefile similarity index 100% rename from Xorg/font/font-cursor-misc/Makefile rename to Xorg/xorg/font/font-cursor-misc/Makefile diff --git a/Xorg/font/font-daewoo-misc/Makefile b/Xorg/xorg/font/font-daewoo-misc/Makefile similarity index 100% rename from Xorg/font/font-daewoo-misc/Makefile rename to Xorg/xorg/font/font-daewoo-misc/Makefile diff --git a/Xorg/font/font-dec-misc/Makefile b/Xorg/xorg/font/font-dec-misc/Makefile similarity index 100% rename from Xorg/font/font-dec-misc/Makefile rename to Xorg/xorg/font/font-dec-misc/Makefile diff --git a/Xorg/font/font-ibm-type1/Makefile b/Xorg/xorg/font/font-ibm-type1/Makefile similarity index 100% rename from Xorg/font/font-ibm-type1/Makefile rename to Xorg/xorg/font/font-ibm-type1/Makefile diff --git a/Xorg/font/font-isas-misc/Makefile b/Xorg/xorg/font/font-isas-misc/Makefile similarity index 100% rename from Xorg/font/font-isas-misc/Makefile rename to Xorg/xorg/font/font-isas-misc/Makefile diff --git a/Xorg/font/font-jis-misc/Makefile b/Xorg/xorg/font/font-jis-misc/Makefile similarity index 100% rename from Xorg/font/font-jis-misc/Makefile rename to Xorg/xorg/font/font-jis-misc/Makefile diff --git a/Xorg/font/font-micro-misc/Makefile b/Xorg/xorg/font/font-micro-misc/Makefile similarity index 100% rename from Xorg/font/font-micro-misc/Makefile rename to Xorg/xorg/font/font-micro-misc/Makefile diff --git a/Xorg/font/font-misc-cyrillic/Makefile b/Xorg/xorg/font/font-misc-cyrillic/Makefile similarity index 100% rename from Xorg/font/font-misc-cyrillic/Makefile rename to Xorg/xorg/font/font-misc-cyrillic/Makefile diff --git a/Xorg/font/font-misc-misc/Makefile b/Xorg/xorg/font/font-misc-misc/Makefile similarity index 100% rename from Xorg/font/font-misc-misc/Makefile rename to Xorg/xorg/font/font-misc-misc/Makefile diff --git a/Xorg/font/font-misc-misc/files/fonts.dir.font-base b/Xorg/xorg/font/font-misc-misc/files/fonts.dir.font-base similarity index 100% rename from Xorg/font/font-misc-misc/files/fonts.dir.font-base rename to Xorg/xorg/font/font-misc-misc/files/fonts.dir.font-base diff --git a/Xorg/font/font-misc-misc/files/fonts.dir.font-misc-misc b/Xorg/xorg/font/font-misc-misc/files/fonts.dir.font-misc-misc similarity index 100% rename from Xorg/font/font-misc-misc/files/fonts.dir.font-misc-misc rename to Xorg/xorg/font/font-misc-misc/files/fonts.dir.font-misc-misc diff --git a/Xorg/font/font-xfree86-type1/Makefile b/Xorg/xorg/font/font-xfree86-type1/Makefile similarity index 100% rename from Xorg/font/font-xfree86-type1/Makefile rename to Xorg/xorg/font/font-xfree86-type1/Makefile diff --git a/Xorg/font/packages b/Xorg/xorg/font/packages similarity index 100% rename from Xorg/font/packages rename to Xorg/xorg/font/packages diff --git a/Xorg/font/template.mk b/Xorg/xorg/font/template.mk similarity index 100% rename from Xorg/font/template.mk rename to Xorg/xorg/font/template.mk diff --git a/Xorg/lib/libICE/Makefile b/Xorg/xorg/lib/libICE/Makefile similarity index 100% rename from Xorg/lib/libICE/Makefile rename to Xorg/xorg/lib/libICE/Makefile diff --git a/Xorg/lib/libSM/Makefile b/Xorg/xorg/lib/libSM/Makefile similarity index 100% rename from Xorg/lib/libSM/Makefile rename to Xorg/xorg/lib/libSM/Makefile diff --git a/Xorg/lib/libX11/Makefile b/Xorg/xorg/lib/libX11/Makefile similarity index 100% rename from Xorg/lib/libX11/Makefile rename to Xorg/xorg/lib/libX11/Makefile diff --git a/Xorg/lib/libX11/patches/003-cross-compile.patch b/Xorg/xorg/lib/libX11/patches/003-cross-compile.patch similarity index 100% rename from Xorg/lib/libX11/patches/003-cross-compile.patch rename to Xorg/xorg/lib/libX11/patches/003-cross-compile.patch diff --git a/Xorg/lib/libXau/Makefile b/Xorg/xorg/lib/libXau/Makefile similarity index 100% rename from Xorg/lib/libXau/Makefile rename to Xorg/xorg/lib/libXau/Makefile diff --git a/Xorg/lib/libXaw/Makefile b/Xorg/xorg/lib/libXaw/Makefile similarity index 100% rename from Xorg/lib/libXaw/Makefile rename to Xorg/xorg/lib/libXaw/Makefile diff --git a/Xorg/lib/libXcursor/Makefile b/Xorg/xorg/lib/libXcursor/Makefile similarity index 100% rename from Xorg/lib/libXcursor/Makefile rename to Xorg/xorg/lib/libXcursor/Makefile diff --git a/Xorg/lib/libXdamage/Makefile b/Xorg/xorg/lib/libXdamage/Makefile similarity index 100% rename from Xorg/lib/libXdamage/Makefile rename to Xorg/xorg/lib/libXdamage/Makefile diff --git a/Xorg/lib/libXdmcp/Makefile b/Xorg/xorg/lib/libXdmcp/Makefile similarity index 100% rename from Xorg/lib/libXdmcp/Makefile rename to Xorg/xorg/lib/libXdmcp/Makefile diff --git a/Xorg/lib/libXext/Makefile b/Xorg/xorg/lib/libXext/Makefile similarity index 100% rename from Xorg/lib/libXext/Makefile rename to Xorg/xorg/lib/libXext/Makefile diff --git a/Xorg/lib/libXfixes/Makefile b/Xorg/xorg/lib/libXfixes/Makefile similarity index 100% rename from Xorg/lib/libXfixes/Makefile rename to Xorg/xorg/lib/libXfixes/Makefile diff --git a/Xorg/lib/libXfont/Makefile b/Xorg/xorg/lib/libXfont/Makefile similarity index 100% rename from Xorg/lib/libXfont/Makefile rename to Xorg/xorg/lib/libXfont/Makefile diff --git a/Xorg/lib/libXft/Makefile b/Xorg/xorg/lib/libXft/Makefile similarity index 100% rename from Xorg/lib/libXft/Makefile rename to Xorg/xorg/lib/libXft/Makefile diff --git a/Xorg/lib/libXi/Makefile b/Xorg/xorg/lib/libXi/Makefile similarity index 100% rename from Xorg/lib/libXi/Makefile rename to Xorg/xorg/lib/libXi/Makefile diff --git a/Xorg/lib/libXmu/Makefile b/Xorg/xorg/lib/libXmu/Makefile similarity index 100% rename from Xorg/lib/libXmu/Makefile rename to Xorg/xorg/lib/libXmu/Makefile diff --git a/Xorg/lib/libXpm/Makefile b/Xorg/xorg/lib/libXpm/Makefile similarity index 100% rename from Xorg/lib/libXpm/Makefile rename to Xorg/xorg/lib/libXpm/Makefile diff --git a/Xorg/lib/libXrandr/Makefile b/Xorg/xorg/lib/libXrandr/Makefile similarity index 100% rename from Xorg/lib/libXrandr/Makefile rename to Xorg/xorg/lib/libXrandr/Makefile diff --git a/Xorg/lib/libXrender/Makefile b/Xorg/xorg/lib/libXrender/Makefile similarity index 100% rename from Xorg/lib/libXrender/Makefile rename to Xorg/xorg/lib/libXrender/Makefile diff --git a/Xorg/lib/libXt/Makefile b/Xorg/xorg/lib/libXt/Makefile similarity index 100% rename from Xorg/lib/libXt/Makefile rename to Xorg/xorg/lib/libXt/Makefile diff --git a/Xorg/lib/libXt/patches/001-cross-compiling.patch b/Xorg/xorg/lib/libXt/patches/001-cross-compiling.patch similarity index 100% rename from Xorg/lib/libXt/patches/001-cross-compiling.patch rename to Xorg/xorg/lib/libXt/patches/001-cross-compiling.patch diff --git a/Xorg/lib/libXtst/Makefile b/Xorg/xorg/lib/libXtst/Makefile similarity index 100% rename from Xorg/lib/libXtst/Makefile rename to Xorg/xorg/lib/libXtst/Makefile diff --git a/Xorg/lib/libXv/Makefile b/Xorg/xorg/lib/libXv/Makefile similarity index 100% rename from Xorg/lib/libXv/Makefile rename to Xorg/xorg/lib/libXv/Makefile diff --git a/Xorg/lib/libXvMC/Makefile b/Xorg/xorg/lib/libXvMC/Makefile similarity index 100% rename from Xorg/lib/libXvMC/Makefile rename to Xorg/xorg/lib/libXvMC/Makefile diff --git a/Xorg/lib/libXxf86misc/Makefile b/Xorg/xorg/lib/libXxf86misc/Makefile similarity index 100% rename from Xorg/lib/libXxf86misc/Makefile rename to Xorg/xorg/lib/libXxf86misc/Makefile diff --git a/Xorg/lib/libXxf86vm/Makefile b/Xorg/xorg/lib/libXxf86vm/Makefile similarity index 100% rename from Xorg/lib/libXxf86vm/Makefile rename to Xorg/xorg/lib/libXxf86vm/Makefile diff --git a/Xorg/lib/libfontenc/Makefile b/Xorg/xorg/lib/libfontenc/Makefile similarity index 100% rename from Xorg/lib/libfontenc/Makefile rename to Xorg/xorg/lib/libfontenc/Makefile diff --git a/Xorg/lib/libpciaccess/Makefile b/Xorg/xorg/lib/libpciaccess/Makefile similarity index 100% rename from Xorg/lib/libpciaccess/Makefile rename to Xorg/xorg/lib/libpciaccess/Makefile diff --git a/Xorg/lib/libxkbfile/Makefile b/Xorg/xorg/lib/libxkbfile/Makefile similarity index 100% rename from Xorg/lib/libxkbfile/Makefile rename to Xorg/xorg/lib/libxkbfile/Makefile diff --git a/Xorg/lib/xtrans/Makefile b/Xorg/xorg/lib/xtrans/Makefile similarity index 100% rename from Xorg/lib/xtrans/Makefile rename to Xorg/xorg/lib/xtrans/Makefile diff --git a/Xorg/proto/applewmproto/Makefile b/Xorg/xorg/proto/applewmproto/Makefile similarity index 100% rename from Xorg/proto/applewmproto/Makefile rename to Xorg/xorg/proto/applewmproto/Makefile diff --git a/Xorg/proto/bigreqsproto/Makefile b/Xorg/xorg/proto/bigreqsproto/Makefile similarity index 100% rename from Xorg/proto/bigreqsproto/Makefile rename to Xorg/xorg/proto/bigreqsproto/Makefile diff --git a/Xorg/proto/calibrateproto/Makefile b/Xorg/xorg/proto/calibrateproto/Makefile similarity index 100% rename from Xorg/proto/calibrateproto/Makefile rename to Xorg/xorg/proto/calibrateproto/Makefile diff --git a/Xorg/proto/calibrateproto/src/ChangeLog b/Xorg/xorg/proto/calibrateproto/src/ChangeLog similarity index 100% rename from Xorg/proto/calibrateproto/src/ChangeLog rename to Xorg/xorg/proto/calibrateproto/src/ChangeLog diff --git a/Xorg/proto/calibrateproto/src/Makefile b/Xorg/xorg/proto/calibrateproto/src/Makefile similarity index 100% rename from Xorg/proto/calibrateproto/src/Makefile rename to Xorg/xorg/proto/calibrateproto/src/Makefile diff --git a/Xorg/proto/calibrateproto/src/Makefile.am b/Xorg/xorg/proto/calibrateproto/src/Makefile.am similarity index 100% rename from Xorg/proto/calibrateproto/src/Makefile.am rename to Xorg/xorg/proto/calibrateproto/src/Makefile.am diff --git a/Xorg/proto/calibrateproto/src/Makefile.in b/Xorg/xorg/proto/calibrateproto/src/Makefile.in similarity index 100% rename from Xorg/proto/calibrateproto/src/Makefile.in rename to Xorg/xorg/proto/calibrateproto/src/Makefile.in diff --git a/Xorg/proto/calibrateproto/src/aclocal.m4 b/Xorg/xorg/proto/calibrateproto/src/aclocal.m4 similarity index 100% rename from Xorg/proto/calibrateproto/src/aclocal.m4 rename to Xorg/xorg/proto/calibrateproto/src/aclocal.m4 diff --git a/Xorg/proto/calibrateproto/src/autogen.sh b/Xorg/xorg/proto/calibrateproto/src/autogen.sh similarity index 100% rename from Xorg/proto/calibrateproto/src/autogen.sh rename to Xorg/xorg/proto/calibrateproto/src/autogen.sh diff --git a/Xorg/proto/calibrateproto/src/config.log b/Xorg/xorg/proto/calibrateproto/src/config.log similarity index 100% rename from Xorg/proto/calibrateproto/src/config.log rename to Xorg/xorg/proto/calibrateproto/src/config.log diff --git a/Xorg/proto/calibrateproto/src/config.status b/Xorg/xorg/proto/calibrateproto/src/config.status similarity index 100% rename from Xorg/proto/calibrateproto/src/config.status rename to Xorg/xorg/proto/calibrateproto/src/config.status diff --git a/Xorg/proto/calibrateproto/src/configure b/Xorg/xorg/proto/calibrateproto/src/configure similarity index 100% rename from Xorg/proto/calibrateproto/src/configure rename to Xorg/xorg/proto/calibrateproto/src/configure diff --git a/Xorg/proto/calibrateproto/src/configure.ac b/Xorg/xorg/proto/calibrateproto/src/configure.ac similarity index 100% rename from Xorg/proto/calibrateproto/src/configure.ac rename to Xorg/xorg/proto/calibrateproto/src/configure.ac diff --git a/Xorg/proto/calibrateproto/src/install-sh b/Xorg/xorg/proto/calibrateproto/src/install-sh similarity index 100% rename from Xorg/proto/calibrateproto/src/install-sh rename to Xorg/xorg/proto/calibrateproto/src/install-sh diff --git a/Xorg/proto/calibrateproto/src/missing b/Xorg/xorg/proto/calibrateproto/src/missing similarity index 100% rename from Xorg/proto/calibrateproto/src/missing rename to Xorg/xorg/proto/calibrateproto/src/missing diff --git a/Xorg/proto/calibrateproto/src/xcalibrateproto.h b/Xorg/xorg/proto/calibrateproto/src/xcalibrateproto.h similarity index 100% rename from Xorg/proto/calibrateproto/src/xcalibrateproto.h rename to Xorg/xorg/proto/calibrateproto/src/xcalibrateproto.h diff --git a/Xorg/proto/calibrateproto/src/xcalibrateproto.pc b/Xorg/xorg/proto/calibrateproto/src/xcalibrateproto.pc similarity index 100% rename from Xorg/proto/calibrateproto/src/xcalibrateproto.pc rename to Xorg/xorg/proto/calibrateproto/src/xcalibrateproto.pc diff --git a/Xorg/proto/calibrateproto/src/xcalibrateproto.pc.in b/Xorg/xorg/proto/calibrateproto/src/xcalibrateproto.pc.in similarity index 100% rename from Xorg/proto/calibrateproto/src/xcalibrateproto.pc.in rename to Xorg/xorg/proto/calibrateproto/src/xcalibrateproto.pc.in diff --git a/Xorg/proto/calibrateproto/src/xcalibratewire.h b/Xorg/xorg/proto/calibrateproto/src/xcalibratewire.h similarity index 100% rename from Xorg/proto/calibrateproto/src/xcalibratewire.h rename to Xorg/xorg/proto/calibrateproto/src/xcalibratewire.h diff --git a/Xorg/proto/compositeproto/Makefile b/Xorg/xorg/proto/compositeproto/Makefile similarity index 100% rename from Xorg/proto/compositeproto/Makefile rename to Xorg/xorg/proto/compositeproto/Makefile diff --git a/Xorg/proto/damageproto/Makefile b/Xorg/xorg/proto/damageproto/Makefile similarity index 100% rename from Xorg/proto/damageproto/Makefile rename to Xorg/xorg/proto/damageproto/Makefile diff --git a/Xorg/proto/dmxproto/Makefile b/Xorg/xorg/proto/dmxproto/Makefile similarity index 100% rename from Xorg/proto/dmxproto/Makefile rename to Xorg/xorg/proto/dmxproto/Makefile diff --git a/Xorg/proto/evieext/Makefile b/Xorg/xorg/proto/evieext/Makefile similarity index 100% rename from Xorg/proto/evieext/Makefile rename to Xorg/xorg/proto/evieext/Makefile diff --git a/Xorg/proto/fixesproto/Makefile b/Xorg/xorg/proto/fixesproto/Makefile similarity index 100% rename from Xorg/proto/fixesproto/Makefile rename to Xorg/xorg/proto/fixesproto/Makefile diff --git a/Xorg/proto/fontcacheproto/Makefile b/Xorg/xorg/proto/fontcacheproto/Makefile similarity index 100% rename from Xorg/proto/fontcacheproto/Makefile rename to Xorg/xorg/proto/fontcacheproto/Makefile diff --git a/Xorg/proto/fontsproto/Makefile b/Xorg/xorg/proto/fontsproto/Makefile similarity index 100% rename from Xorg/proto/fontsproto/Makefile rename to Xorg/xorg/proto/fontsproto/Makefile diff --git a/Xorg/proto/glproto/Makefile b/Xorg/xorg/proto/glproto/Makefile similarity index 100% rename from Xorg/proto/glproto/Makefile rename to Xorg/xorg/proto/glproto/Makefile diff --git a/Xorg/proto/inputproto/Makefile b/Xorg/xorg/proto/inputproto/Makefile similarity index 100% rename from Xorg/proto/inputproto/Makefile rename to Xorg/xorg/proto/inputproto/Makefile diff --git a/Xorg/proto/kbproto/Makefile b/Xorg/xorg/proto/kbproto/Makefile similarity index 100% rename from Xorg/proto/kbproto/Makefile rename to Xorg/xorg/proto/kbproto/Makefile diff --git a/Xorg/proto/packages b/Xorg/xorg/proto/packages similarity index 100% rename from Xorg/proto/packages rename to Xorg/xorg/proto/packages diff --git a/Xorg/proto/printproto/Makefile b/Xorg/xorg/proto/printproto/Makefile similarity index 100% rename from Xorg/proto/printproto/Makefile rename to Xorg/xorg/proto/printproto/Makefile diff --git a/Xorg/proto/randrproto/Makefile b/Xorg/xorg/proto/randrproto/Makefile similarity index 100% rename from Xorg/proto/randrproto/Makefile rename to Xorg/xorg/proto/randrproto/Makefile diff --git a/Xorg/proto/recordproto/Makefile b/Xorg/xorg/proto/recordproto/Makefile similarity index 100% rename from Xorg/proto/recordproto/Makefile rename to Xorg/xorg/proto/recordproto/Makefile diff --git a/Xorg/proto/renderproto/Makefile b/Xorg/xorg/proto/renderproto/Makefile similarity index 100% rename from Xorg/proto/renderproto/Makefile rename to Xorg/xorg/proto/renderproto/Makefile diff --git a/Xorg/proto/resourceproto/Makefile b/Xorg/xorg/proto/resourceproto/Makefile similarity index 100% rename from Xorg/proto/resourceproto/Makefile rename to Xorg/xorg/proto/resourceproto/Makefile diff --git a/Xorg/proto/scrnsaverproto/Makefile b/Xorg/xorg/proto/scrnsaverproto/Makefile similarity index 100% rename from Xorg/proto/scrnsaverproto/Makefile rename to Xorg/xorg/proto/scrnsaverproto/Makefile diff --git a/Xorg/proto/template.mk b/Xorg/xorg/proto/template.mk similarity index 100% rename from Xorg/proto/template.mk rename to Xorg/xorg/proto/template.mk diff --git a/Xorg/proto/trapproto/Makefile b/Xorg/xorg/proto/trapproto/Makefile similarity index 100% rename from Xorg/proto/trapproto/Makefile rename to Xorg/xorg/proto/trapproto/Makefile diff --git a/Xorg/proto/videoproto/Makefile b/Xorg/xorg/proto/videoproto/Makefile similarity index 100% rename from Xorg/proto/videoproto/Makefile rename to Xorg/xorg/proto/videoproto/Makefile diff --git a/Xorg/proto/windowswmproto/Makefile b/Xorg/xorg/proto/windowswmproto/Makefile similarity index 100% rename from Xorg/proto/windowswmproto/Makefile rename to Xorg/xorg/proto/windowswmproto/Makefile diff --git a/Xorg/proto/xcmiscproto/Makefile b/Xorg/xorg/proto/xcmiscproto/Makefile similarity index 100% rename from Xorg/proto/xcmiscproto/Makefile rename to Xorg/xorg/proto/xcmiscproto/Makefile diff --git a/Xorg/proto/xextproto/Makefile b/Xorg/xorg/proto/xextproto/Makefile similarity index 100% rename from Xorg/proto/xextproto/Makefile rename to Xorg/xorg/proto/xextproto/Makefile diff --git a/Xorg/proto/xf86bigfontproto/Makefile b/Xorg/xorg/proto/xf86bigfontproto/Makefile similarity index 100% rename from Xorg/proto/xf86bigfontproto/Makefile rename to Xorg/xorg/proto/xf86bigfontproto/Makefile diff --git a/Xorg/proto/xf86dgaproto/Makefile b/Xorg/xorg/proto/xf86dgaproto/Makefile similarity index 100% rename from Xorg/proto/xf86dgaproto/Makefile rename to Xorg/xorg/proto/xf86dgaproto/Makefile diff --git a/Xorg/proto/xf86driproto/Makefile b/Xorg/xorg/proto/xf86driproto/Makefile similarity index 100% rename from Xorg/proto/xf86driproto/Makefile rename to Xorg/xorg/proto/xf86driproto/Makefile diff --git a/Xorg/proto/xf86miscproto/Makefile b/Xorg/xorg/proto/xf86miscproto/Makefile similarity index 100% rename from Xorg/proto/xf86miscproto/Makefile rename to Xorg/xorg/proto/xf86miscproto/Makefile diff --git a/Xorg/proto/xf86rushproto/Makefile b/Xorg/xorg/proto/xf86rushproto/Makefile similarity index 100% rename from Xorg/proto/xf86rushproto/Makefile rename to Xorg/xorg/proto/xf86rushproto/Makefile diff --git a/Xorg/proto/xf86vidmodeproto/Makefile b/Xorg/xorg/proto/xf86vidmodeproto/Makefile similarity index 100% rename from Xorg/proto/xf86vidmodeproto/Makefile rename to Xorg/xorg/proto/xf86vidmodeproto/Makefile diff --git a/Xorg/proto/xineramaproto/Makefile b/Xorg/xorg/proto/xineramaproto/Makefile similarity index 100% rename from Xorg/proto/xineramaproto/Makefile rename to Xorg/xorg/proto/xineramaproto/Makefile diff --git a/Xorg/proto/xproto/Makefile b/Xorg/xorg/proto/xproto/Makefile similarity index 100% rename from Xorg/proto/xproto/Makefile rename to Xorg/xorg/proto/xproto/Makefile diff --git a/Xorg/util/util-macros/Makefile b/Xorg/xorg/util/util-macros/Makefile similarity index 100% rename from Xorg/util/util-macros/Makefile rename to Xorg/xorg/util/util-macros/Makefile diff --git a/Xorg/xserver/xorg-xserver/Config.in b/Xorg/xorg/xserver/xorg-server/Config.in similarity index 100% rename from Xorg/xserver/xorg-xserver/Config.in rename to Xorg/xorg/xserver/xorg-server/Config.in diff --git a/Xorg/xserver/xorg-xserver/Makefile b/Xorg/xorg/xserver/xorg-server/Makefile similarity index 100% rename from Xorg/xserver/xorg-xserver/Makefile rename to Xorg/xorg/xserver/xorg-server/Makefile diff --git a/Xorg/xserver/xorg-xserver/files/config/generic b/Xorg/xorg/xserver/xorg-server/files/config/generic similarity index 100% rename from Xorg/xserver/xorg-xserver/files/config/generic rename to Xorg/xorg/xserver/xorg-server/files/config/generic diff --git a/Xorg/xserver/xorg-xserver/files/config/olpc b/Xorg/xorg/xserver/xorg-server/files/config/olpc similarity index 100% rename from Xorg/xserver/xorg-xserver/files/config/olpc rename to Xorg/xorg/xserver/xorg-server/files/config/olpc diff --git a/Xorg/xserver/xorg-xserver/files/config/om_gta02 b/Xorg/xorg/xserver/xorg-server/files/config/om_gta02 similarity index 100% rename from Xorg/xserver/xorg-xserver/files/config/om_gta02 rename to Xorg/xorg/xserver/xorg-server/files/config/om_gta02 diff --git a/Xorg/xserver/xorg-xserver/files/tmp/xorg-olpc.conf b/Xorg/xorg/xserver/xorg-server/files/tmp/xorg-olpc.conf similarity index 100% rename from Xorg/xserver/xorg-xserver/files/tmp/xorg-olpc.conf rename to Xorg/xorg/xserver/xorg-server/files/tmp/xorg-olpc.conf diff --git a/Xorg/xserver/xorg-xserver/files/tmp/xorg-om_gta02.conf b/Xorg/xorg/xserver/xorg-server/files/tmp/xorg-om_gta02.conf similarity index 100% rename from Xorg/xserver/xorg-xserver/files/tmp/xorg-om_gta02.conf rename to Xorg/xorg/xserver/xorg-server/files/tmp/xorg-om_gta02.conf diff --git a/Xorg/xserver/xorg-xserver/files/tmp/xorg.conf b/Xorg/xorg/xserver/xorg-server/files/tmp/xorg.conf similarity index 100% rename from Xorg/xserver/xorg-xserver/files/tmp/xorg.conf rename to Xorg/xorg/xserver/xorg-server/files/tmp/xorg.conf diff --git a/Xorg/xserver/xorg-xserver/files/x.init b/Xorg/xorg/xserver/xorg-server/files/x.init similarity index 100% rename from Xorg/xserver/xorg-xserver/files/x.init rename to Xorg/xorg/xserver/xorg-server/files/x.init diff --git a/Xorg/xserver/xorg-xserver/patches/001-tslib.patch b/Xorg/xorg/xserver/xorg-server/patches/001-tslib.patch similarity index 100% rename from Xorg/xserver/xorg-xserver/patches/001-tslib.patch rename to Xorg/xorg/xserver/xorg-server/patches/001-tslib.patch diff --git a/Xorg/xserver/xorg-xserver/patches/002-480x640-support.patch b/Xorg/xorg/xserver/xorg-server/patches/002-480x640-support.patch similarity index 100% rename from Xorg/xserver/xorg-xserver/patches/002-480x640-support.patch rename to Xorg/xorg/xserver/xorg-server/patches/002-480x640-support.patch -- 2.11.0