merge of 479497b7433f60ba6841fc3a8ab4e8d56a20dc5d

     and cd606927120111af896127f6b1483d9fbe915358

344 files changed, 0 insertions, 0 deletions

diff --git a/packages/x11-apps/xauth/.mtn2git_empty b/packages/xorg-app/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/x11-apps/xauth/.mtn2git_empty
+++ b/packages/xorg-app/.mtn2git_empty
diff --git a/packages/x11-apps/bdftopcf_1.0.0.bb b/packages/xorg-app/bdftopcf_X11R7.0-1.0.0.bb
index 96492be848..96492be848 100644
--- a/packages/x11-apps/bdftopcf_1.0.0.bb
+++ b/packages/xorg-app/bdftopcf_X11R7.0-1.0.0.bb
diff --git a/packages/x11-apps/iceauth_1.0.1.bb b/packages/xorg-app/iceauth_X11R7.0-1.0.1.bb
index 19b59b8381..19b59b8381 100644
--- a/packages/x11-apps/iceauth_1.0.1.bb
+++ b/packages/xorg-app/iceauth_X11R7.0-1.0.1.bb
diff --git a/packages/x11-apps/mkfontdir_1.0.1.bb b/packages/xorg-app/mkfontdir_X11R7.0-1.0.1.bb
index eff2e125e7..eff2e125e7 100644
--- a/packages/x11-apps/mkfontdir_1.0.1.bb
+++ b/packages/xorg-app/mkfontdir_X11R7.0-1.0.1.bb
diff --git a/packages/x11-apps/mkfontscale_1.0.1.bb b/packages/xorg-app/mkfontscale_X11R7.0-1.0.1.bb
index ead4663781..ead4663781 100644
--- a/packages/x11-apps/mkfontscale_1.0.1.bb
+++ b/packages/xorg-app/mkfontscale_X11R7.0-1.0.1.bb
diff --git a/packages/x11-apps/rgb_1.0.0.bb b/packages/xorg-app/rgb_X11R7.0-1.0.0.bb
index 714ab3f83f..714ab3f83f 100644
--- a/packages/x11-apps/rgb_1.0.0.bb
+++ b/packages/xorg-app/rgb_X11R7.0-1.0.0.bb
diff --git a/packages/x11-apps/twm_1.0.1.bb b/packages/xorg-app/twm_X11R7.0-1.0.1.bb
index e02bc4cf7b..e02bc4cf7b 100644
--- a/packages/x11-apps/twm_1.0.1.bb
+++ b/packages/xorg-app/twm_X11R7.0-1.0.1.bb
diff --git a/packages/xdpyinfo/xdpyinfo/.mtn2git_empty b/packages/xorg-app/xauth/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xdpyinfo/xdpyinfo/.mtn2git_empty
+++ b/packages/xorg-app/xauth/.mtn2git_empty
diff --git a/packages/x11-apps/xauth/autofoo.patch b/packages/xorg-app/xauth/autofoo.patch
index d279a6f4fc..d279a6f4fc 100644
--- a/packages/x11-apps/xauth/autofoo.patch
+++ b/packages/xorg-app/xauth/autofoo.patch
diff --git a/packages/x11-apps/xauth_1.0.1.bb b/packages/xorg-app/xauth_X11R7.0-1.0.1.bb
index c9d1a12ba2..c9d1a12ba2 100644
--- a/packages/x11-apps/xauth_1.0.1.bb
+++ b/packages/xorg-app/xauth_X11R7.0-1.0.1.bb
diff --git a/packages/x11-apps/xauth_cvs.bb b/packages/xorg-app/xauth_cvs.bb
index 54700574b7..54700574b7 100644
--- a/packages/x11-apps/xauth_cvs.bb
+++ b/packages/xorg-app/xauth_cvs.bb
diff --git a/packages/x11-apps/xclock_1.0.1.bb b/packages/xorg-app/xclock_X11R7.0-1.0.1.bb
index 8a4b59d811..8a4b59d811 100644
--- a/packages/x11-apps/xclock_1.0.1.bb
+++ b/packages/xorg-app/xclock_X11R7.0-1.0.1.bb
diff --git a/packages/xev/files/.mtn2git_empty b/packages/xorg-app/xdpyinfo/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xev/files/.mtn2git_empty
+++ b/packages/xorg-app/xdpyinfo/.mtn2git_empty
diff --git a/packages/xdpyinfo/xdpyinfo/disable-xkb.patch b/packages/xorg-app/xdpyinfo/disable-xkb.patch
index 24af21f4fc..24af21f4fc 100644
--- a/packages/xdpyinfo/xdpyinfo/disable-xkb.patch
+++ b/packages/xorg-app/xdpyinfo/disable-xkb.patch
diff --git a/packages/xdpyinfo/xdpyinfo_1.0.1.bb b/packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb
index a8972e18ab..a8972e18ab 100644
--- a/packages/xdpyinfo/xdpyinfo_1.0.1.bb
+++ b/packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb
diff --git a/packages/xdpyinfo/xdpyinfo_cvs.bb b/packages/xorg-app/xdpyinfo_cvs.bb
index eb63ae7f4d..eb63ae7f4d 100644
--- a/packages/xdpyinfo/xdpyinfo_cvs.bb
+++ b/packages/xorg-app/xdpyinfo_cvs.bb
diff --git a/packages/xhost/xhost/.mtn2git_empty b/packages/xorg-app/xev/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xhost/xhost/.mtn2git_empty
+++ b/packages/xorg-app/xev/.mtn2git_empty
diff --git a/packages/xev/files/diet-x11.patch b/packages/xorg-app/xev/diet-x11.patch
index 7e93f160a5..7e93f160a5 100644
--- a/packages/xev/files/diet-x11.patch
+++ b/packages/xorg-app/xev/diet-x11.patch
diff --git a/packages/xev/xev_1.0.1.bb b/packages/xorg-app/xev_X11R7.0-1.0.1.bb
index 2d0f79b046..2d0f79b046 100644
--- a/packages/xev/xev_1.0.1.bb
+++ b/packages/xorg-app/xev_X11R7.0-1.0.1.bb
diff --git a/packages/xev/xev_cvs.bb b/packages/xorg-app/xev_cvs.bb
index 3ea9d05c63..3ea9d05c63 100644
--- a/packages/xev/xev_cvs.bb
+++ b/packages/xorg-app/xev_cvs.bb
diff --git a/packages/x11-apps/xeyes_1.0.1.bb b/packages/xorg-app/xeyes_X11R7.0-1.0.1.bb
index c9d1a12ba2..c9d1a12ba2 100644
--- a/packages/x11-apps/xeyes_1.0.1.bb
+++ b/packages/xorg-app/xeyes_X11R7.0-1.0.1.bb
diff --git a/packages/xlibs/diet-x11/.mtn2git_empty b/packages/xorg-app/xhost/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/diet-x11/.mtn2git_empty
+++ b/packages/xorg-app/xhost/.mtn2git_empty
diff --git a/packages/xhost/xhost/autofoo.patch b/packages/xorg-app/xhost/autofoo.patch
index b29f017abc..b29f017abc 100644
--- a/packages/xhost/xhost/autofoo.patch
+++ b/packages/xorg-app/xhost/autofoo.patch
diff --git a/packages/xhost/xhost_20040413.bb b/packages/xorg-app/xhost_20040413.bb
index 4d36e62bee..4d36e62bee 100644
--- a/packages/xhost/xhost_20040413.bb
+++ b/packages/xorg-app/xhost_20040413.bb
diff --git a/packages/xhost/xhost_1.0.0.bb b/packages/xorg-app/xhost_X11R7.0-1.0.0.bb
index 220de1b535..220de1b535 100644
--- a/packages/xhost/xhost_1.0.0.bb
+++ b/packages/xorg-app/xhost_X11R7.0-1.0.0.bb
diff --git a/packages/x11-apps/xinit_1.0.1.bb b/packages/xorg-app/xinit_X11R7.0-1.0.1.bb
index 2e65b76202..2e65b76202 100644
--- a/packages/x11-apps/xinit_1.0.1.bb
+++ b/packages/xorg-app/xinit_X11R7.0-1.0.1.bb
diff --git a/packages/x11-apps/xkbcomp_1.0.1.bb b/packages/xorg-app/xkbcomp_X11R7.0-1.0.1.bb
index 808f5d0a6d..808f5d0a6d 100644
--- a/packages/x11-apps/xkbcomp_1.0.1.bb
+++ b/packages/xorg-app/xkbcomp_X11R7.0-1.0.1.bb
diff --git a/packages/xlibs/files/.mtn2git_empty b/packages/xorg-app/xmodmap/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/files/.mtn2git_empty
+++ b/packages/xorg-app/xmodmap/.mtn2git_empty
diff --git a/packages/xmodmap/xmodmap/autofoo.patch b/packages/xorg-app/xmodmap/autofoo.patch
index f309add086..f309add086 100644
--- a/packages/xmodmap/xmodmap/autofoo.patch
+++ b/packages/xorg-app/xmodmap/autofoo.patch
diff --git a/packages/xmodmap/xmodmap_1.0.0.bb b/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb
index d65c84bb71..d65c84bb71 100644
--- a/packages/xmodmap/xmodmap_1.0.0.bb
+++ b/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb
diff --git a/packages/xmodmap/xmodmap_cvs.bb b/packages/xorg-app/xmodmap_cvs.bb
index 773466e6bb..773466e6bb 100644
--- a/packages/xmodmap/xmodmap_cvs.bb
+++ b/packages/xorg-app/xmodmap_cvs.bb
diff --git a/packages/x11-apps/app-common.inc b/packages/xorg-app/xorg-app-common.inc
index 9d668cd9b2..9d668cd9b2 100644
--- a/packages/x11-apps/app-common.inc
+++ b/packages/xorg-app/xorg-app-common.inc
diff --git a/packages/xlibs/libice/.mtn2git_empty b/packages/xorg-app/xprop/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libice/.mtn2git_empty
+++ b/packages/xorg-app/xprop/.mtn2git_empty
diff --git a/packages/xprop/xprop/autofoo.patch b/packages/xorg-app/xprop/autofoo.patch
index 2526d95087..2526d95087 100644
--- a/packages/xprop/xprop/autofoo.patch
+++ b/packages/xorg-app/xprop/autofoo.patch
diff --git a/packages/xprop/xprop_cvs.bb b/packages/xorg-app/xprop_cvs.bb
index f6dd54b7cd..f6dd54b7cd 100644
--- a/packages/xprop/xprop_cvs.bb
+++ b/packages/xorg-app/xprop_cvs.bb
diff --git a/packages/xrandr/xrandr_1.0.1.bb b/packages/xorg-app/xrandr_X11R7.0-1.0.1.bb
index db750c8b97..db750c8b97 100644
--- a/packages/xrandr/xrandr_1.0.1.bb
+++ b/packages/xorg-app/xrandr_X11R7.0-1.0.1.bb
diff --git a/packages/xrandr/xrandr_cvs.bb b/packages/xorg-app/xrandr_cvs.bb
index 0ab7c745f4..0ab7c745f4 100644
--- a/packages/xrandr/xrandr_cvs.bb
+++ b/packages/xorg-app/xrandr_cvs.bb
diff --git a/packages/xlibs/liblbxutil/.mtn2git_empty b/packages/xorg-app/xrdb/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/liblbxutil/.mtn2git_empty
+++ b/packages/xorg-app/xrdb/.mtn2git_empty
diff --git a/packages/xrdb/xrdb/autofoo.patch b/packages/xorg-app/xrdb/autofoo.patch
index b30a46bc36..b30a46bc36 100644
--- a/packages/xrdb/xrdb/autofoo.patch
+++ b/packages/xorg-app/xrdb/autofoo.patch
diff --git a/packages/xrdb/xrdb_1.0.1.bb b/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb
index 5703556a33..5703556a33 100644
--- a/packages/xrdb/xrdb_1.0.1.bb
+++ b/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb
diff --git a/packages/xrdb/xrdb_cvs.bb b/packages/xorg-app/xrdb_cvs.bb
index cbf2caac70..cbf2caac70 100644
--- a/packages/xrdb/xrdb_cvs.bb
+++ b/packages/xorg-app/xrdb_cvs.bb
diff --git a/packages/xlibs/libsm/.mtn2git_empty b/packages/xorg-app/xset/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libsm/.mtn2git_empty
+++ b/packages/xorg-app/xset/.mtn2git_empty
diff --git a/packages/xset/xset/autofoo.patch b/packages/xorg-app/xset/autofoo.patch
index 039d1319e3..039d1319e3 100644
--- a/packages/xset/xset/autofoo.patch
+++ b/packages/xorg-app/xset/autofoo.patch
diff --git a/packages/xset/xset/disable-xkb.patch b/packages/xorg-app/xset/disable-xkb.patch
index 6060fbb995..6060fbb995 100644
--- a/packages/xset/xset/disable-xkb.patch
+++ b/packages/xorg-app/xset/disable-xkb.patch
diff --git a/packages/xset/xset_20040817.bb b/packages/xorg-app/xset_20040817.bb
index daf57d15c8..daf57d15c8 100644
--- a/packages/xset/xset_20040817.bb
+++ b/packages/xorg-app/xset_20040817.bb
diff --git a/packages/xset/xset_1.0.1.bb b/packages/xorg-app/xset_X11R7.0-1.0.1.bb
index 55f3a0de21..55f3a0de21 100644
--- a/packages/xset/xset_1.0.1.bb
+++ b/packages/xorg-app/xset_X11R7.0-1.0.1.bb
diff --git a/packages/xorg-data/xbitmaps_1.0.1.bb b/packages/xorg-data/xbitmaps_X11R7.0-1.0.1.bb
index aa6c16c802..aa6c16c802 100644
--- a/packages/xorg-data/xbitmaps_1.0.1.bb
+++ b/packages/xorg-data/xbitmaps_X11R7.0-1.0.1.bb
diff --git a/packages/xorg-data/xkbdata_1.0.1.bb b/packages/xorg-data/xkbdata_X11R7.0-1.0.1.bb
index 9b34b04ad2..9b34b04ad2 100644
--- a/packages/xorg-data/xkbdata_1.0.1.bb
+++ b/packages/xorg-data/xkbdata_X11R7.0-1.0.1.bb
diff --git a/packages/xorg-data/data-common.inc b/packages/xorg-data/xorg-data-common.inc
index 47dc922500..47dc922500 100644
--- a/packages/xorg-data/data-common.inc
+++ b/packages/xorg-data/xorg-data-common.inc
diff --git a/packages/xlibs/libx11/.mtn2git_empty b/packages/xorg-font/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libx11/.mtn2git_empty
+++ b/packages/xorg-font/.mtn2git_empty
diff --git a/packages/xlibs/libxau/.mtn2git_empty b/packages/xorg-font/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libxau/.mtn2git_empty
+++ b/packages/xorg-font/files/.mtn2git_empty
diff --git a/packages/xfonts/imake-staging.patch b/packages/xorg-font/files/imake-staging.patch
index bf2e350830..bf2e350830 100644
--- a/packages/xfonts/imake-staging.patch
+++ b/packages/xorg-font/files/imake-staging.patch
diff --git a/packages/xfonts/lexer.patch b/packages/xorg-font/files/lexer.patch
index c3caf57174..c3caf57174 100644
--- a/packages/xfonts/lexer.patch
+++ b/packages/xorg-font/files/lexer.patch
diff --git a/packages/xorg-fonts/font-alias_1.0.1.bb b/packages/xorg-font/font-alias_X11R7.0-1.0.1.bb
index f757dd39bf..f757dd39bf 100644
--- a/packages/xorg-fonts/font-alias_1.0.1.bb
+++ b/packages/xorg-font/font-alias_X11R7.0-1.0.1.bb
diff --git a/packages/xorg-fonts/font-cursor-misc_1.0.0.bb b/packages/xorg-font/font-cursor-misc_X11R7.0-1.0.0.bb
index a7b1ceaf0d..a7b1ceaf0d 100644
--- a/packages/xorg-fonts/font-cursor-misc_1.0.0.bb
+++ b/packages/xorg-font/font-cursor-misc_X11R7.0-1.0.0.bb
diff --git a/packages/xorg-fonts/font-misc-misc_1.0.0.bb b/packages/xorg-font/font-micro-misc_X11R7.0-1.0.0.bb
index 14022adaf9..14022adaf9 100644
--- a/packages/xorg-fonts/font-misc-misc_1.0.0.bb
+++ b/packages/xorg-font/font-micro-misc_X11R7.0-1.0.0.bb
diff --git a/packages/xorg-fonts/font-util_1.0.0.bb b/packages/xorg-font/font-util_X11R7.0-1.0.0.bb
index 5bbf7e0809..5bbf7e0809 100644
--- a/packages/xorg-fonts/font-util_1.0.0.bb
+++ b/packages/xorg-font/font-util_X11R7.0-1.0.0.bb
diff --git a/packages/xfonts/xfonts-xorg_6.8.bb b/packages/xorg-font/xfonts-xorg_6.8.bb
index f6710dcd5b..f6710dcd5b 100644
--- a/packages/xfonts/xfonts-xorg_6.8.bb
+++ b/packages/xorg-font/xfonts-xorg_6.8.bb
diff --git a/packages/xorg-fonts/font-common.inc b/packages/xorg-font/xorg-font-common.inc
index 37d478bdc6..37d478bdc6 100644
--- a/packages/xorg-fonts/font-common.inc
+++ b/packages/xorg-font/xorg-font-common.inc
diff --git a/packages/xlibs/libxaw/.mtn2git_empty b/packages/xorg-lib/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libxaw/.mtn2git_empty
+++ b/packages/xorg-lib/.mtn2git_empty
diff --git a/packages/xlibs/libxcomposite-1.0.1/.mtn2git_empty b/packages/xorg-lib/diet-x11/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libxcomposite-1.0.1/.mtn2git_empty
+++ b/packages/xorg-lib/diet-x11/.mtn2git_empty
diff --git a/packages/xlibs/diet-x11/X18NCMSstubs.diff b/packages/xorg-lib/diet-x11/X18NCMSstubs.diff
index 54b1727a95..54b1727a95 100644
--- a/packages/xlibs/diet-x11/X18NCMSstubs.diff
+++ b/packages/xorg-lib/diet-x11/X18NCMSstubs.diff
diff --git a/packages/xlibs/diet-x11/fix-disable-xlocale.diff b/packages/xorg-lib/diet-x11/fix-disable-xlocale.diff
index 9dbf6dac68..9dbf6dac68 100644
--- a/packages/xlibs/diet-x11/fix-disable-xlocale.diff
+++ b/packages/xorg-lib/diet-x11/fix-disable-xlocale.diff
diff --git a/packages/xlibs/diet-x11/fix-utf8-wrong-define.patch b/packages/xorg-lib/diet-x11/fix-utf8-wrong-define.patch
index a098db1941..a098db1941 100644
--- a/packages/xlibs/diet-x11/fix-utf8-wrong-define.patch
+++ b/packages/xorg-lib/diet-x11/fix-utf8-wrong-define.patch
diff --git a/packages/xlibs/diet-x11_20050226.bb b/packages/xorg-lib/diet-x11_20050226.bb
index cab8c5d570..cab8c5d570 100644
--- a/packages/xlibs/diet-x11_20050226.bb
+++ b/packages/xorg-lib/diet-x11_20050226.bb
diff --git a/packages/xlibs/diet-x11_6.2.1.bb b/packages/xorg-lib/diet-x11_6.2.1.bb
index 643e658412..643e658412 100644
--- a/packages/xlibs/diet-x11_6.2.1.bb
+++ b/packages/xorg-lib/diet-x11_6.2.1.bb
diff --git a/packages/xlibs/diet-x11_X11R7.0-1.0.0.bb b/packages/xorg-lib/diet-x11_X11R7.0-1.0.0.bb
index 3e09f9a4b8..3e09f9a4b8 100644
--- a/packages/xlibs/diet-x11_X11R7.0-1.0.0.bb
+++ b/packages/xorg-lib/diet-x11_X11R7.0-1.0.0.bb
diff --git a/packages/xlibs/diet-x11_X11R7.1-1.0.1.bb b/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb
index 747c525535..747c525535 100644
--- a/packages/xlibs/diet-x11_X11R7.1-1.0.1.bb
+++ b/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb
diff --git a/packages/xlibs/diet-x11_cvs.bb b/packages/xorg-lib/diet-x11_cvs.bb
index eea73f0964..eea73f0964 100644
--- a/packages/xlibs/diet-x11_cvs.bb
+++ b/packages/xorg-lib/diet-x11_cvs.bb
diff --git a/packages/xlibs/libxcomposite/.mtn2git_empty b/packages/xorg-lib/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libxcomposite/.mtn2git_empty
+++ b/packages/xorg-lib/files/.mtn2git_empty
diff --git a/packages/xlibs/files/errordb-keysymdb-path-fix.patch b/packages/xorg-lib/files/errordb-keysymdb-path-fix.patch
index f43d38065e..f43d38065e 100644
--- a/packages/xlibs/files/errordb-keysymdb-path-fix.patch
+++ b/packages/xorg-lib/files/errordb-keysymdb-path-fix.patch
diff --git a/packages/xlibs/files/fix-utf8-wrong-define.patch b/packages/xorg-lib/files/fix-utf8-wrong-define.patch
index dca88fba92..dca88fba92 100644
--- a/packages/xlibs/files/fix-utf8-wrong-define.patch
+++ b/packages/xorg-lib/files/fix-utf8-wrong-define.patch
diff --git a/packages/xlibs/libfontenc_1.0.1.bb b/packages/xorg-lib/libfontenc_X11R7.0-1.0.1.bb
index 02883c4d26..02883c4d26 100644
--- a/packages/xlibs/libfontenc_1.0.1.bb
+++ b/packages/xorg-lib/libfontenc_X11R7.0-1.0.1.bb
diff --git a/packages/xlibs/libfontenc_1.0.2.bb b/packages/xorg-lib/libfontenc_X11R7.1-1.0.2.bb
index b67c4a0e38..b67c4a0e38 100644
--- a/packages/xlibs/libfontenc_1.0.2.bb
+++ b/packages/xorg-lib/libfontenc_X11R7.1-1.0.2.bb
diff --git a/packages/xlibs/libxcursor-1.1.2/.mtn2git_empty b/packages/xorg-lib/libice/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libxcursor-1.1.2/.mtn2git_empty
+++ b/packages/xorg-lib/libice/.mtn2git_empty
diff --git a/packages/xlibs/libice/autofoo.patch b/packages/xorg-lib/libice/autofoo.patch
index 8ab0585fb8..8ab0585fb8 100644
--- a/packages/xlibs/libice/autofoo.patch
+++ b/packages/xorg-lib/libice/autofoo.patch
diff --git a/packages/xlibs/libice_6.3.3.bb b/packages/xorg-lib/libice_6.3.3.bb
index 1311145334..1311145334 100644
--- a/packages/xlibs/libice_6.3.3.bb
+++ b/packages/xorg-lib/libice_6.3.3.bb
diff --git a/packages/xlibs/libice_X11R7.0-1.0.0.bb b/packages/xorg-lib/libice_X11R7.0-1.0.0.bb
index cd5c2d372f..cd5c2d372f 100644
--- a/packages/xlibs/libice_X11R7.0-1.0.0.bb
+++ b/packages/xorg-lib/libice_X11R7.0-1.0.0.bb
diff --git a/packages/xlibs/libice_X11R7.1-1.0.1.bb b/packages/xorg-lib/libice_X11R7.1-1.0.1.bb
index a1e92b66fa..a1e92b66fa 100644
--- a/packages/xlibs/libice_X11R7.1-1.0.1.bb
+++ b/packages/xorg-lib/libice_X11R7.1-1.0.1.bb
diff --git a/packages/xlibs/libice_cvs.bb b/packages/xorg-lib/libice_cvs.bb
index 90c98d594a..90c98d594a 100644
--- a/packages/xlibs/libice_cvs.bb
+++ b/packages/xorg-lib/libice_cvs.bb
diff --git a/packages/xlibs/libxcursor/.mtn2git_empty b/packages/xorg-lib/liblbxutil/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libxcursor/.mtn2git_empty
+++ b/packages/xorg-lib/liblbxutil/.mtn2git_empty
diff --git a/packages/xlibs/liblbxutil/mkg3states.patch b/packages/xorg-lib/liblbxutil/mkg3states.patch
index 58463db46b..58463db46b 100644
--- a/packages/xlibs/liblbxutil/mkg3states.patch
+++ b/packages/xorg-lib/liblbxutil/mkg3states.patch
diff --git a/packages/xlibs/liblbxutil_1.0.0.bb b/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb
index 36837c23e4..36837c23e4 100644
--- a/packages/xlibs/liblbxutil_1.0.0.bb
+++ b/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb
diff --git a/packages/xlibs/liblbxutil_1.0.1.bb b/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb
index 795cd4555d..795cd4555d 100644
--- a/packages/xlibs/liblbxutil_1.0.1.bb
+++ b/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb
diff --git a/packages/xlibs/libxdamage-1.0.1/.mtn2git_empty b/packages/xorg-lib/libsm/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libxdamage-1.0.1/.mtn2git_empty
+++ b/packages/xorg-lib/libsm/.mtn2git_empty
diff --git a/packages/xlibs/libsm/autofoo.patch b/packages/xorg-lib/libsm/autofoo.patch
index 8cb204a66e..8cb204a66e 100644
--- a/packages/xlibs/libsm/autofoo.patch
+++ b/packages/xorg-lib/libsm/autofoo.patch
diff --git a/packages/xlibs/libsm_6.0.3.bb b/packages/xorg-lib/libsm_6.0.3.bb
index 08f9597045..08f9597045 100644
--- a/packages/xlibs/libsm_6.0.3.bb
+++ b/packages/xorg-lib/libsm_6.0.3.bb
diff --git a/packages/xlibs/libsm_X11R7.0-1.0.0.bb b/packages/xorg-lib/libsm_X11R7.0-1.0.0.bb
index bf96271ba6..bf96271ba6 100644
--- a/packages/xlibs/libsm_X11R7.0-1.0.0.bb
+++ b/packages/xorg-lib/libsm_X11R7.0-1.0.0.bb
diff --git a/packages/xlibs/libsm_X11R7.1-1.0.1.bb b/packages/xorg-lib/libsm_X11R7.1-1.0.1.bb
index 468b014165..468b014165 100644
--- a/packages/xlibs/libsm_X11R7.1-1.0.1.bb
+++ b/packages/xorg-lib/libsm_X11R7.1-1.0.1.bb
diff --git a/packages/xlibs/libsm_cvs.bb b/packages/xorg-lib/libsm_cvs.bb
index 22b316cf57..22b316cf57 100644
--- a/packages/xlibs/libsm_cvs.bb
+++ b/packages/xorg-lib/libsm_cvs.bb
diff --git a/packages/xlibs/libx11-native_6.2.1.bb b/packages/xorg-lib/libx11-native_6.2.1.bb
index 9513c4237e..9513c4237e 100644
--- a/packages/xlibs/libx11-native_6.2.1.bb
+++ b/packages/xorg-lib/libx11-native_6.2.1.bb
diff --git a/packages/xlibs/libx11-native_cvs.bb b/packages/xorg-lib/libx11-native_cvs.bb
index 5b221122d3..5b221122d3 100644
--- a/packages/xlibs/libx11-native_cvs.bb
+++ b/packages/xorg-lib/libx11-native_cvs.bb
diff --git a/packages/xlibs/libxdamage/.mtn2git_empty b/packages/xorg-lib/libx11/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libxdamage/.mtn2git_empty
+++ b/packages/xorg-lib/libx11/.mtn2git_empty
diff --git a/packages/xlibs/libx11/autofoo.patch b/packages/xorg-lib/libx11/autofoo.patch
index 8bdba09768..8bdba09768 100644
--- a/packages/xlibs/libx11/autofoo.patch
+++ b/packages/xorg-lib/libx11/autofoo.patch
diff --git a/packages/xlibs/libx11/xim.patch b/packages/xorg-lib/libx11/xim.patch
index 0eab197a80..0eab197a80 100644
--- a/packages/xlibs/libx11/xim.patch
+++ b/packages/xorg-lib/libx11/xim.patch
diff --git a/packages/xlibs/libx11_20050226.bb b/packages/xorg-lib/libx11_20050226.bb
index 0bc30a42cc..0bc30a42cc 100644
--- a/packages/xlibs/libx11_20050226.bb
+++ b/packages/xorg-lib/libx11_20050226.bb
diff --git a/packages/xlibs/libx11_6.2.1.bb b/packages/xorg-lib/libx11_6.2.1.bb
index 901746bafa..901746bafa 100644
--- a/packages/xlibs/libx11_6.2.1.bb
+++ b/packages/xorg-lib/libx11_6.2.1.bb
diff --git a/packages/xlibs/libx11_X11R7.0-1.0.0.bb b/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb
index ac9d87292a..ac9d87292a 100644
--- a/packages/xlibs/libx11_X11R7.0-1.0.0.bb
+++ b/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb
diff --git a/packages/xlibs/libx11_X11R7.1-1.0.1.bb b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
index 6836c872bd..6836c872bd 100644
--- a/packages/xlibs/libx11_X11R7.1-1.0.1.bb
+++ b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
diff --git a/packages/xlibs/libx11_cvs.bb b/packages/xorg-lib/libx11_cvs.bb
index d44dd76aac..d44dd76aac 100644
--- a/packages/xlibs/libx11_cvs.bb
+++ b/packages/xorg-lib/libx11_cvs.bb
diff --git a/packages/xlibs/libx11_git.bb b/packages/xorg-lib/libx11_git.bb
index ed6623f03a..ed6623f03a 100644
--- a/packages/xlibs/libx11_git.bb
+++ b/packages/xorg-lib/libx11_git.bb
diff --git a/packages/xlibs/libxau-native_0.1.1.bb b/packages/xorg-lib/libxau-native_0.1.1.bb
index ecb71ce3d6..ecb71ce3d6 100644
--- a/packages/xlibs/libxau-native_0.1.1.bb
+++ b/packages/xorg-lib/libxau-native_0.1.1.bb
diff --git a/packages/xlibs/libxau-native_cvs.bb b/packages/xorg-lib/libxau-native_cvs.bb
index cd070033ce..cd070033ce 100644
--- a/packages/xlibs/libxau-native_cvs.bb
+++ b/packages/xorg-lib/libxau-native_cvs.bb
diff --git a/packages/xlibs/libxdmcp/.mtn2git_empty b/packages/xorg-lib/libxau/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libxdmcp/.mtn2git_empty
+++ b/packages/xorg-lib/libxau/.mtn2git_empty
diff --git a/packages/xlibs/libxau/autofoo.patch b/packages/xorg-lib/libxau/autofoo.patch
index 1e42eb974d..1e42eb974d 100644
--- a/packages/xlibs/libxau/autofoo.patch
+++ b/packages/xorg-lib/libxau/autofoo.patch
diff --git a/packages/xlibs/libxau_0.1.1.bb b/packages/xorg-lib/libxau_0.1.1.bb
index dc1a28171b..dc1a28171b 100644
--- a/packages/xlibs/libxau_0.1.1.bb
+++ b/packages/xorg-lib/libxau_0.1.1.bb
diff --git a/packages/xlibs/libxau_1.0.0.bb b/packages/xorg-lib/libxau_X11R7.0-1.0.0.bb
index f64be68583..f64be68583 100644
--- a/packages/xlibs/libxau_1.0.0.bb
+++ b/packages/xorg-lib/libxau_X11R7.0-1.0.0.bb
diff --git a/packages/xlibs/libxau_1.0.1.bb b/packages/xorg-lib/libxau_X11R7.1-1.0.1.bb
index 39e2f88b95..39e2f88b95 100644
--- a/packages/xlibs/libxau_1.0.1.bb
+++ b/packages/xorg-lib/libxau_X11R7.1-1.0.1.bb
diff --git a/packages/xlibs/libxau_cvs.bb b/packages/xorg-lib/libxau_cvs.bb
index 518744816d..518744816d 100644
--- a/packages/xlibs/libxau_cvs.bb
+++ b/packages/xorg-lib/libxau_cvs.bb
diff --git a/packages/xlibs/libxext/.mtn2git_empty b/packages/xorg-lib/libxaw/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libxext/.mtn2git_empty
+++ b/packages/xorg-lib/libxaw/.mtn2git_empty
diff --git a/packages/xlibs/libxaw/auxdir.patch b/packages/xorg-lib/libxaw/auxdir.patch
index 4226ab6a4d..4226ab6a4d 100644
--- a/packages/xlibs/libxaw/auxdir.patch
+++ b/packages/xorg-lib/libxaw/auxdir.patch
diff --git a/packages/xlibs/libxaw_7.0.2.bb b/packages/xorg-lib/libxaw_7.0.2.bb
index 929b54a127..929b54a127 100644
--- a/packages/xlibs/libxaw_7.0.2.bb
+++ b/packages/xorg-lib/libxaw_7.0.2.bb
diff --git a/packages/xlibs/libxaw_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb
index 03ac373f77..03ac373f77 100644
--- a/packages/xlibs/libxaw_X11R7.0-1.0.1.bb
+++ b/packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb
diff --git a/packages/xlibs/libxaw_X11R7.1-1.0.2.bb b/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb
index 7fb68385a1..7fb68385a1 100644
--- a/packages/xlibs/libxaw_X11R7.1-1.0.2.bb
+++ b/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb
diff --git a/packages/xlibs/libxaw_cvs.bb b/packages/xorg-lib/libxaw_cvs.bb
index 7860f6e6b1..7860f6e6b1 100644
--- a/packages/xlibs/libxaw_cvs.bb
+++ b/packages/xorg-lib/libxaw_cvs.bb
diff --git a/packages/xlibs/libxfixes/.mtn2git_empty b/packages/xorg-lib/libxcomposite-1.0.1/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libxfixes/.mtn2git_empty
+++ b/packages/xorg-lib/libxcomposite-1.0.1/.mtn2git_empty
diff --git a/packages/xlibs/libxcomposite-1.0.1/autofoo.patch b/packages/xorg-lib/libxcomposite-1.0.1/autofoo.patch
index 072cf25214..072cf25214 100644
--- a/packages/xlibs/libxcomposite-1.0.1/autofoo.patch
+++ b/packages/xorg-lib/libxcomposite-1.0.1/autofoo.patch
diff --git a/packages/xlibs/libxfont/.mtn2git_empty b/packages/xorg-lib/libxcomposite/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libxfont/.mtn2git_empty
+++ b/packages/xorg-lib/libxcomposite/.mtn2git_empty
diff --git a/packages/xlibs/libxcomposite/change-include-order.patch b/packages/xorg-lib/libxcomposite/change-include-order.patch
index 630b8818fc..630b8818fc 100644
--- a/packages/xlibs/libxcomposite/change-include-order.patch
+++ b/packages/xorg-lib/libxcomposite/change-include-order.patch
diff --git a/packages/xlibs/libxcomposite_1.0.1.bb b/packages/xorg-lib/libxcomposite_1.0.1.bb
index e2ca3bbc7b..e2ca3bbc7b 100644
--- a/packages/xlibs/libxcomposite_1.0.1.bb
+++ b/packages/xorg-lib/libxcomposite_1.0.1.bb
diff --git a/packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb b/packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb
index d3166a99f4..d3166a99f4 100644
--- a/packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb
+++ b/packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb
diff --git a/packages/xlibs/libxcomposite_X11R7.1-0.3.bb b/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb
index 2847ada716..2847ada716 100644
--- a/packages/xlibs/libxcomposite_X11R7.1-0.3.bb
+++ b/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb
diff --git a/packages/xlibs/libxcomposite_cvs.bb b/packages/xorg-lib/libxcomposite_cvs.bb
index 1d8b69c8c6..1d8b69c8c6 100644
--- a/packages/xlibs/libxcomposite_cvs.bb
+++ b/packages/xorg-lib/libxcomposite_cvs.bb
diff --git a/packages/xlibs/libxft/.mtn2git_empty b/packages/xorg-lib/libxcursor-1.1.2/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libxft/.mtn2git_empty
+++ b/packages/xorg-lib/libxcursor-1.1.2/.mtn2git_empty
diff --git a/packages/xlibs/libxcursor-1.1.2/autofoo.patch b/packages/xorg-lib/libxcursor-1.1.2/autofoo.patch
index 99cd45a7ea..99cd45a7ea 100644
--- a/packages/xlibs/libxcursor-1.1.2/autofoo.patch
+++ b/packages/xorg-lib/libxcursor-1.1.2/autofoo.patch
diff --git a/packages/xlibs/libxi/.mtn2git_empty b/packages/xorg-lib/libxcursor/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libxi/.mtn2git_empty
+++ b/packages/xorg-lib/libxcursor/.mtn2git_empty
diff --git a/packages/xlibs/libxcursor/autofoo.patch b/packages/xorg-lib/libxcursor/autofoo.patch
index 7aa573ce13..7aa573ce13 100644
--- a/packages/xlibs/libxcursor/autofoo.patch
+++ b/packages/xorg-lib/libxcursor/autofoo.patch
diff --git a/packages/xlibs/libxcursor_1.1.2.bb b/packages/xorg-lib/libxcursor_1.1.2.bb
index 25744c7dca..25744c7dca 100644
--- a/packages/xlibs/libxcursor_1.1.2.bb
+++ b/packages/xorg-lib/libxcursor_1.1.2.bb
diff --git a/packages/xlibs/libxcursor_1.1.5.2.bb b/packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb
index 9aed134fbb..9aed134fbb 100644
--- a/packages/xlibs/libxcursor_1.1.5.2.bb
+++ b/packages/xorg-lib/libxcursor_X11R7.0-1.1.5.2.bb
diff --git a/packages/xlibs/libxcursor_1.1.6.bb b/packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb
index 20f44bfb41..20f44bfb41 100644
--- a/packages/xlibs/libxcursor_1.1.6.bb
+++ b/packages/xorg-lib/libxcursor_X11R7.1-1.1.6.bb
diff --git a/packages/xlibs/libxcursor_cvs.bb b/packages/xorg-lib/libxcursor_cvs.bb
index 5fe2334b85..5fe2334b85 100644
--- a/packages/xlibs/libxcursor_cvs.bb
+++ b/packages/xorg-lib/libxcursor_cvs.bb
diff --git a/packages/xlibs/libxpm/.mtn2git_empty b/packages/xorg-lib/libxdamage-1.0.1/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libxpm/.mtn2git_empty
+++ b/packages/xorg-lib/libxdamage-1.0.1/.mtn2git_empty
diff --git a/packages/xlibs/libxdamage-1.0.1/autofoo.patch b/packages/xorg-lib/libxdamage-1.0.1/autofoo.patch
index 1e3ec45d4a..1e3ec45d4a 100644
--- a/packages/xlibs/libxdamage-1.0.1/autofoo.patch
+++ b/packages/xorg-lib/libxdamage-1.0.1/autofoo.patch
diff --git a/packages/xlibs/libxrandr-1.0.2/.mtn2git_empty b/packages/xorg-lib/libxdamage/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libxrandr-1.0.2/.mtn2git_empty
+++ b/packages/xorg-lib/libxdamage/.mtn2git_empty
diff --git a/packages/xlibs/libxdamage/m4.patch b/packages/xorg-lib/libxdamage/m4.patch
index 393f3d13d2..393f3d13d2 100644
--- a/packages/xlibs/libxdamage/m4.patch
+++ b/packages/xorg-lib/libxdamage/m4.patch
diff --git a/packages/xlibs/libxdamage_1.0.1.bb b/packages/xorg-lib/libxdamage_1.0.1.bb
index 040e863447..040e863447 100644
--- a/packages/xlibs/libxdamage_1.0.1.bb
+++ b/packages/xorg-lib/libxdamage_1.0.1.bb
diff --git a/packages/xlibs/libxdamage_1.0.2.2.bb b/packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb
index acea09c7bd..acea09c7bd 100644
--- a/packages/xlibs/libxdamage_1.0.2.2.bb
+++ b/packages/xorg-lib/libxdamage_X11R7.0-1.0.2.2.bb
diff --git a/packages/xlibs/libxdamage_1.0.3.bb b/packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb
index b97e01cfb0..b97e01cfb0 100644
--- a/packages/xlibs/libxdamage_1.0.3.bb
+++ b/packages/xorg-lib/libxdamage_X11R7.1-1.0.3.bb
diff --git a/packages/xlibs/libxdamage_cvs.bb b/packages/xorg-lib/libxdamage_cvs.bb
index ba8a68033a..ba8a68033a 100644
--- a/packages/xlibs/libxdamage_cvs.bb
+++ b/packages/xorg-lib/libxdamage_cvs.bb
diff --git a/packages/xlibs/libxdmcp-native_0.1.1.bb b/packages/xorg-lib/libxdmcp-native_0.1.1.bb
index bd6d990f53..bd6d990f53 100644
--- a/packages/xlibs/libxdmcp-native_0.1.1.bb
+++ b/packages/xorg-lib/libxdmcp-native_0.1.1.bb
diff --git a/packages/xlibs/libxdmcp-native_0.1.3.bb b/packages/xorg-lib/libxdmcp-native_0.1.3.bb
index 8d7162b351..8d7162b351 100644
--- a/packages/xlibs/libxdmcp-native_0.1.3.bb
+++ b/packages/xorg-lib/libxdmcp-native_0.1.3.bb
diff --git a/packages/xlibs/libxrandr/.mtn2git_empty b/packages/xorg-lib/libxdmcp/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libxrandr/.mtn2git_empty
+++ b/packages/xorg-lib/libxdmcp/.mtn2git_empty
diff --git a/packages/xlibs/libxdmcp/autofoo.patch b/packages/xorg-lib/libxdmcp/autofoo.patch
index ff1a76ad04..ff1a76ad04 100644
--- a/packages/xlibs/libxdmcp/autofoo.patch
+++ b/packages/xorg-lib/libxdmcp/autofoo.patch
diff --git a/packages/xlibs/libxdmcp_0.1.1.bb b/packages/xorg-lib/libxdmcp_0.1.1.bb
index 19fba1529e..19fba1529e 100644
--- a/packages/xlibs/libxdmcp_0.1.1.bb
+++ b/packages/xorg-lib/libxdmcp_0.1.1.bb
diff --git a/packages/xlibs/libxdmcp_0.1.3.bb b/packages/xorg-lib/libxdmcp_0.1.3.bb
index aa2736cdb2..aa2736cdb2 100644
--- a/packages/xlibs/libxdmcp_0.1.3.bb
+++ b/packages/xorg-lib/libxdmcp_0.1.3.bb
diff --git a/packages/xlibs/libxdmcp_1.0.0.bb b/packages/xorg-lib/libxdmcp_X11R7.0-1.0.0.bb
index 5ea8cdd513..5ea8cdd513 100644
--- a/packages/xlibs/libxdmcp_1.0.0.bb
+++ b/packages/xorg-lib/libxdmcp_X11R7.0-1.0.0.bb
diff --git a/packages/xlibs/libxdmcp_1.0.1.bb b/packages/xorg-lib/libxdmcp_X11R7.1-1.0.1.bb
index d9cfadbf7b..d9cfadbf7b 100644
--- a/packages/xlibs/libxdmcp_1.0.1.bb
+++ b/packages/xorg-lib/libxdmcp_X11R7.1-1.0.1.bb
diff --git a/packages/xlibs/libxdmcp_cvs.bb b/packages/xorg-lib/libxdmcp_cvs.bb
index 20b957b522..20b957b522 100644
--- a/packages/xlibs/libxdmcp_cvs.bb
+++ b/packages/xorg-lib/libxdmcp_cvs.bb
diff --git a/packages/xlibs/libxext-native_cvs.bb b/packages/xorg-lib/libxext-native_cvs.bb
index 9294b080b7..9294b080b7 100644
--- a/packages/xlibs/libxext-native_cvs.bb
+++ b/packages/xorg-lib/libxext-native_cvs.bb
diff --git a/packages/xlibs/libxrender/.mtn2git_empty b/packages/xorg-lib/libxext/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libxrender/.mtn2git_empty
+++ b/packages/xorg-lib/libxext/.mtn2git_empty
diff --git a/packages/xlibs/libxext/autofoo.patch b/packages/xorg-lib/libxext/autofoo.patch
index c006884526..c006884526 100644
--- a/packages/xlibs/libxext/autofoo.patch
+++ b/packages/xorg-lib/libxext/autofoo.patch
diff --git a/packages/xlibs/libxext_1.0.0.bb b/packages/xorg-lib/libxext_X11R7.0-1.0.0.bb
index 1c4a21280e..1c4a21280e 100644
--- a/packages/xlibs/libxext_1.0.0.bb
+++ b/packages/xorg-lib/libxext_X11R7.0-1.0.0.bb
diff --git a/packages/xlibs/libxext_1.0.1.bb b/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb
index 5ee1d82990..5ee1d82990 100644
--- a/packages/xlibs/libxext_1.0.1.bb
+++ b/packages/xorg-lib/libxext_X11R7.1-1.0.1.bb
diff --git a/packages/xlibs/libxext_cvs.bb b/packages/xorg-lib/libxext_cvs.bb
index 0ef675ca70..0ef675ca70 100644
--- a/packages/xlibs/libxext_cvs.bb
+++ b/packages/xorg-lib/libxext_cvs.bb
diff --git a/packages/xlibs/libxt/.mtn2git_empty b/packages/xorg-lib/libxfixes/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libxt/.mtn2git_empty
+++ b/packages/xorg-lib/libxfixes/.mtn2git_empty
diff --git a/packages/xlibs/libxfixes/autofoo.patch b/packages/xorg-lib/libxfixes/autofoo.patch
index 26803cf7f3..26803cf7f3 100644
--- a/packages/xlibs/libxfixes/autofoo.patch
+++ b/packages/xorg-lib/libxfixes/autofoo.patch
diff --git a/packages/xlibs/libxfixes_2.0.1.bb b/packages/xorg-lib/libxfixes_2.0.1.bb
index 710fa17454..710fa17454 100644
--- a/packages/xlibs/libxfixes_2.0.1.bb
+++ b/packages/xorg-lib/libxfixes_2.0.1.bb
diff --git a/packages/xlibs/libxfixes_3.0.1.2.bb b/packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb
index b22da223f5..b22da223f5 100644
--- a/packages/xlibs/libxfixes_3.0.1.2.bb
+++ b/packages/xorg-lib/libxfixes_X11R7.0-3.0.1.2.bb
diff --git a/packages/xlibs/libxfixes_4.0.1.bb b/packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb
index 5b8881e0b8..5b8881e0b8 100644
--- a/packages/xlibs/libxfixes_4.0.1.bb
+++ b/packages/xorg-lib/libxfixes_X11R7.1-4.0.1.bb
diff --git a/packages/xlibs/libxfixes_cvs.bb b/packages/xorg-lib/libxfixes_cvs.bb
index 4494dc9326..4494dc9326 100644
--- a/packages/xlibs/libxfixes_cvs.bb
+++ b/packages/xorg-lib/libxfixes_cvs.bb
diff --git a/packages/xlibs/libxvmc/.mtn2git_empty b/packages/xorg-lib/libxfont/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/libxvmc/.mtn2git_empty
+++ b/packages/xorg-lib/libxfont/.mtn2git_empty
diff --git a/packages/xlibs/libxfont/autofoo.patch b/packages/xorg-lib/libxfont/autofoo.patch
index 4998625c24..4998625c24 100644
--- a/packages/xlibs/libxfont/autofoo.patch
+++ b/packages/xorg-lib/libxfont/autofoo.patch
diff --git a/packages/xlibs/libxfont/scalable.patch b/packages/xorg-lib/libxfont/scalable.patch
index 7f97b9a8f6..7f97b9a8f6 100644
--- a/packages/xlibs/libxfont/scalable.patch
+++ b/packages/xorg-lib/libxfont/scalable.patch
diff --git a/packages/xlibs/libxfont_1.4.2.bb b/packages/xorg-lib/libxfont_1.4.2.bb
index 0cc45397fe..0cc45397fe 100644
--- a/packages/xlibs/libxfont_1.4.2.bb
+++ b/packages/xorg-lib/libxfont_1.4.2.bb
diff --git a/packages/xlibs/libxfont_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb
index aff0e55e21..aff0e55e21 100644
--- a/packages/xlibs/libxfont_X11R7.0-1.0.0.bb
+++ b/packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb
diff --git a/packages/xlibs/libxfont_X11R7.1-1.1.0.bb b/packages/xorg-lib/libxfont_X11R7.1-1.1.0.bb
index d17359dc29..d17359dc29 100644
--- a/packages/xlibs/libxfont_X11R7.1-1.1.0.bb
+++ b/packages/xorg-lib/libxfont_X11R7.1-1.1.0.bb
diff --git a/packages/xlibs/libxfont_X11R7.1-1.2.0.bb b/packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb
index 2701aef825..2701aef825 100644
--- a/packages/xlibs/libxfont_X11R7.1-1.2.0.bb
+++ b/packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb
diff --git a/packages/xlibs/libxfont_cvs.bb b/packages/xorg-lib/libxfont_cvs.bb
index bd21e0fd12..bd21e0fd12 100644
--- a/packages/xlibs/libxfont_cvs.bb
+++ b/packages/xorg-lib/libxfont_cvs.bb
diff --git a/packages/xmodmap/xmodmap/.mtn2git_empty b/packages/xorg-lib/libxft/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xmodmap/xmodmap/.mtn2git_empty
+++ b/packages/xorg-lib/libxft/.mtn2git_empty
diff --git a/packages/xlibs/libxft/autofoo.patch b/packages/xorg-lib/libxft/autofoo.patch
index 54120aa612..54120aa612 100644
--- a/packages/xlibs/libxft/autofoo.patch
+++ b/packages/xorg-lib/libxft/autofoo.patch
diff --git a/packages/xlibs/libxft_2.1.6.bb b/packages/xorg-lib/libxft_2.1.6.bb
index c3f1f74e40..c3f1f74e40 100644
--- a/packages/xlibs/libxft_2.1.6.bb
+++ b/packages/xorg-lib/libxft_2.1.6.bb
diff --git a/packages/xlibs/libxft_2.1.8.2.bb b/packages/xorg-lib/libxft_X11R7.0-2.1.8.2.bb
index f1b6456740..f1b6456740 100644
--- a/packages/xlibs/libxft_2.1.8.2.bb
+++ b/packages/xorg-lib/libxft_X11R7.0-2.1.8.2.bb
diff --git a/packages/xlibs/libxft_cvs.bb b/packages/xorg-lib/libxft_cvs.bb
index 6c1a5f5c32..6c1a5f5c32 100644
--- a/packages/xlibs/libxft_cvs.bb
+++ b/packages/xorg-lib/libxft_cvs.bb
diff --git a/packages/xprop/xprop/.mtn2git_empty b/packages/xorg-lib/libxi/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xprop/xprop/.mtn2git_empty
+++ b/packages/xorg-lib/libxi/.mtn2git_empty
diff --git a/packages/xlibs/libxi/autofoo.patch b/packages/xorg-lib/libxi/autofoo.patch
index f1bce9ed7a..f1bce9ed7a 100644
--- a/packages/xlibs/libxi/autofoo.patch
+++ b/packages/xorg-lib/libxi/autofoo.patch
diff --git a/packages/xlibs/libxi_6.0.1.bb b/packages/xorg-lib/libxi_6.0.1.bb
index 5c44d06df3..5c44d06df3 100644
--- a/packages/xlibs/libxi_6.0.1.bb
+++ b/packages/xorg-lib/libxi_6.0.1.bb
diff --git a/packages/xlibs/libxi_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxi_X11R7.0-1.0.0.bb
index 4e357cde7c..4e357cde7c 100644
--- a/packages/xlibs/libxi_X11R7.0-1.0.0.bb
+++ b/packages/xorg-lib/libxi_X11R7.0-1.0.0.bb
diff --git a/packages/xlibs/libxi_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxi_X11R7.1-1.0.1.bb
index d698f04ee1..d698f04ee1 100644
--- a/packages/xlibs/libxi_X11R7.1-1.0.1.bb
+++ b/packages/xorg-lib/libxi_X11R7.1-1.0.1.bb
diff --git a/packages/xlibs/libxi_cvs.bb b/packages/xorg-lib/libxi_cvs.bb
index 767c641a95..767c641a95 100644
--- a/packages/xlibs/libxi_cvs.bb
+++ b/packages/xorg-lib/libxi_cvs.bb
diff --git a/packages/xlibs/libxinerama_1.0.2+cvs20050505.bb b/packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb
index dc5d82b9b0..dc5d82b9b0 100644
--- a/packages/xlibs/libxinerama_1.0.2+cvs20050505.bb
+++ b/packages/xorg-lib/libxinerama_1.0.2+cvs20050505.bb
diff --git a/packages/xlibs/libxinerama_1.0.2.bb b/packages/xorg-lib/libxinerama_1.0.2.bb
index a267e6c2d9..a267e6c2d9 100644
--- a/packages/xlibs/libxinerama_1.0.2.bb
+++ b/packages/xorg-lib/libxinerama_1.0.2.bb
diff --git a/packages/xlibs/libxinerama_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb
index 09a4f564f5..09a4f564f5 100644
--- a/packages/xlibs/libxinerama_X11R7.0-1.0.1.bb
+++ b/packages/xorg-lib/libxinerama_X11R7.0-1.0.1.bb
diff --git a/packages/xlibs/libxinerama_cvs.bb b/packages/xorg-lib/libxinerama_cvs.bb
index 3e959df19e..3e959df19e 100644
--- a/packages/xlibs/libxinerama_cvs.bb
+++ b/packages/xorg-lib/libxinerama_cvs.bb
diff --git a/packages/xlibs/libxkbfile_1.0.1.bb b/packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb
index 5cbc9a1150..5cbc9a1150 100644
--- a/packages/xlibs/libxkbfile_1.0.1.bb
+++ b/packages/xorg-lib/libxkbfile_X11R7.0-1.0.1.bb
diff --git a/packages/xlibs/libxkbfile_1.0.3.bb b/packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb
index 36e3e5f600..36e3e5f600 100644
--- a/packages/xlibs/libxkbfile_1.0.3.bb
+++ b/packages/xorg-lib/libxkbfile_X11R7.1-1.0.3.bb
diff --git a/packages/xlibs/libxkbfile_cvs.bb b/packages/xorg-lib/libxkbfile_cvs.bb
index 1b433ef65f..1b433ef65f 100644
--- a/packages/xlibs/libxkbfile_cvs.bb
+++ b/packages/xorg-lib/libxkbfile_cvs.bb
diff --git a/packages/xlibs/libxkbui_1.0.1.bb b/packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb
index ded3da66f3..ded3da66f3 100644
--- a/packages/xlibs/libxkbui_1.0.1.bb
+++ b/packages/xorg-lib/libxkbui_X11R7.0-1.0.1.bb
diff --git a/packages/xlibs/libxkbui_1.0.2.bb b/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb
index a914f1e0ef..a914f1e0ef 100644
--- a/packages/xlibs/libxkbui_1.0.2.bb
+++ b/packages/xorg-lib/libxkbui_X11R7.1-1.0.2.bb
diff --git a/packages/xlibs/libxmu_1.0.0.bb b/packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb
index 1693e5d0d5..1693e5d0d5 100644
--- a/packages/xlibs/libxmu_1.0.0.bb
+++ b/packages/xorg-lib/libxmu_X11R7.0-1.0.0.bb
diff --git a/packages/xlibs/libxmu_1.0.1.bb b/packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb
index cc06d2a671..cc06d2a671 100644
--- a/packages/xlibs/libxmu_1.0.1.bb
+++ b/packages/xorg-lib/libxmu_X11R7.1-1.0.1.bb
diff --git a/packages/xlibs/libxmu_cvs.bb b/packages/xorg-lib/libxmu_cvs.bb
index 500b373c32..500b373c32 100644
--- a/packages/xlibs/libxmu_cvs.bb
+++ b/packages/xorg-lib/libxmu_cvs.bb
diff --git a/packages/xlibs/libxp_1.0.0.bb b/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb
index 15653f1390..15653f1390 100644
--- a/packages/xlibs/libxp_1.0.0.bb
+++ b/packages/xorg-lib/libxp_X11R7.0-1.0.0.bb
diff --git a/packages/xlibs/libxp_cvs.bb b/packages/xorg-lib/libxp_cvs.bb
index eaf6546d0e..eaf6546d0e 100644
--- a/packages/xlibs/libxp_cvs.bb
+++ b/packages/xorg-lib/libxp_cvs.bb
diff --git a/packages/xrdb/xrdb/.mtn2git_empty b/packages/xorg-lib/libxpm/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xrdb/xrdb/.mtn2git_empty
+++ b/packages/xorg-lib/libxpm/.mtn2git_empty
diff --git a/packages/xlibs/libxpm/autofoo.patch b/packages/xorg-lib/libxpm/autofoo.patch
index 6b2174bf02..6b2174bf02 100644
--- a/packages/xlibs/libxpm/autofoo.patch
+++ b/packages/xorg-lib/libxpm/autofoo.patch
diff --git a/packages/xlibs/libxpm_3.5.1.bb b/packages/xorg-lib/libxpm_3.5.1.bb
index 513261efd3..513261efd3 100644
--- a/packages/xlibs/libxpm_3.5.1.bb
+++ b/packages/xorg-lib/libxpm_3.5.1.bb
diff --git a/packages/xlibs/libxpm_3.5.4.2.bb b/packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb
index c88bd3f6bc..c88bd3f6bc 100644
--- a/packages/xlibs/libxpm_3.5.4.2.bb
+++ b/packages/xorg-lib/libxpm_X11R7.0-3.5.4.2.bb
diff --git a/packages/xlibs/libxpm_3.5.5.bb b/packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb
index 397be2faf4..397be2faf4 100644
--- a/packages/xlibs/libxpm_3.5.5.bb
+++ b/packages/xorg-lib/libxpm_X11R7.1-3.5.5.bb
diff --git a/packages/xlibs/libxpm_cvs.bb b/packages/xorg-lib/libxpm_cvs.bb
index 1b46855735..1b46855735 100644
--- a/packages/xlibs/libxpm_cvs.bb
+++ b/packages/xorg-lib/libxpm_cvs.bb
diff --git a/packages/xserver-common/files/.mtn2git_empty b/packages/xorg-lib/libxrandr-1.0.2/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xserver-common/files/.mtn2git_empty
+++ b/packages/xorg-lib/libxrandr-1.0.2/.mtn2git_empty
diff --git a/packages/xlibs/libxrandr-1.0.2/autofoo.patch b/packages/xorg-lib/libxrandr-1.0.2/autofoo.patch
index 21f6e7fd78..21f6e7fd78 100644
--- a/packages/xlibs/libxrandr-1.0.2/autofoo.patch
+++ b/packages/xorg-lib/libxrandr-1.0.2/autofoo.patch
diff --git a/packages/xserver/.mtn2git_empty b/packages/xorg-lib/libxrandr/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xserver/.mtn2git_empty
+++ b/packages/xorg-lib/libxrandr/.mtn2git_empty
diff --git a/packages/xlibs/libxrandr/autofoo.patch b/packages/xorg-lib/libxrandr/autofoo.patch
index 7b1db760f2..7b1db760f2 100644
--- a/packages/xlibs/libxrandr/autofoo.patch
+++ b/packages/xorg-lib/libxrandr/autofoo.patch
diff --git a/packages/xlibs/libxrandr_1.0.2.bb b/packages/xorg-lib/libxrandr_1.0.2.bb
index efd0505544..efd0505544 100644
--- a/packages/xlibs/libxrandr_1.0.2.bb
+++ b/packages/xorg-lib/libxrandr_1.0.2.bb
diff --git a/packages/xlibs/libxrandr_1.1.0.2.bb b/packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb
index 3081f4ab86..3081f4ab86 100644
--- a/packages/xlibs/libxrandr_1.1.0.2.bb
+++ b/packages/xorg-lib/libxrandr_X11R7.0-1.1.0.2.bb
diff --git a/packages/xlibs/libxrandr_1.1.1.bb b/packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb
index 0c7978945a..0c7978945a 100644
--- a/packages/xlibs/libxrandr_1.1.1.bb
+++ b/packages/xorg-lib/libxrandr_X11R7.1-1.1.1.bb
diff --git a/packages/xlibs/libxrandr_cvs.bb b/packages/xorg-lib/libxrandr_cvs.bb
index 3b6fd02de8..3b6fd02de8 100644
--- a/packages/xlibs/libxrandr_cvs.bb
+++ b/packages/xorg-lib/libxrandr_cvs.bb
diff --git a/packages/xserver/xserver-kdrive-omap/.mtn2git_empty b/packages/xorg-lib/libxrender/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xserver/xserver-kdrive-omap/.mtn2git_empty
+++ b/packages/xorg-lib/libxrender/.mtn2git_empty
diff --git a/packages/xlibs/libxrender/autofoo.patch b/packages/xorg-lib/libxrender/autofoo.patch
index eb21c766f8..eb21c766f8 100644
--- a/packages/xlibs/libxrender/autofoo.patch
+++ b/packages/xorg-lib/libxrender/autofoo.patch
diff --git a/packages/xlibs/libxrender_0.8.4.bb b/packages/xorg-lib/libxrender_0.8.4.bb
index b36c5701ba..b36c5701ba 100644
--- a/packages/xlibs/libxrender_0.8.4.bb
+++ b/packages/xorg-lib/libxrender_0.8.4.bb
diff --git a/packages/xlibs/libxrender_0.9.0.2.bb b/packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb
index 1cff60983a..1cff60983a 100644
--- a/packages/xlibs/libxrender_0.9.0.2.bb
+++ b/packages/xorg-lib/libxrender_X11R7.0-0.9.0.2.bb
diff --git a/packages/xlibs/libxrender_0.9.1.bb b/packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb
index 1ee518645b..1ee518645b 100644
--- a/packages/xlibs/libxrender_0.9.1.bb
+++ b/packages/xorg-lib/libxrender_X11R7.1-0.9.1.bb
diff --git a/packages/xlibs/libxrender_cvs.bb b/packages/xorg-lib/libxrender_cvs.bb
index ea6b1f4607..ea6b1f4607 100644
--- a/packages/xlibs/libxrender_cvs.bb
+++ b/packages/xorg-lib/libxrender_cvs.bb
diff --git a/packages/xlibs/libxres_1.0.1.bb b/packages/xorg-lib/libxres_1.0.1.bb
index c01731d37a..c01731d37a 100644
--- a/packages/xlibs/libxres_1.0.1.bb
+++ b/packages/xorg-lib/libxres_1.0.1.bb
diff --git a/packages/xlibs/libxres_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxres_X11R7.0-1.0.0.bb
index a9806f57b1..a9806f57b1 100644
--- a/packages/xlibs/libxres_X11R7.0-1.0.0.bb
+++ b/packages/xorg-lib/libxres_X11R7.0-1.0.0.bb
diff --git a/packages/xlibs/libxres_X11R7.1-1.0.1.bb b/packages/xorg-lib/libxres_X11R7.1-1.0.1.bb
index e2ac5aee7b..e2ac5aee7b 100644
--- a/packages/xlibs/libxres_X11R7.1-1.0.1.bb
+++ b/packages/xorg-lib/libxres_X11R7.1-1.0.1.bb
diff --git a/packages/xlibs/libxres_cvs.bb b/packages/xorg-lib/libxres_cvs.bb
index e3e5c6704c..e3e5c6704c 100644
--- a/packages/xlibs/libxres_cvs.bb
+++ b/packages/xorg-lib/libxres_cvs.bb
diff --git a/packages/xlibs/libxss_1.0.1.bb b/packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb
index 92dd4c82c4..92dd4c82c4 100644
--- a/packages/xlibs/libxss_1.0.1.bb
+++ b/packages/xorg-lib/libxscrnsaver_X11R7.0-1.0.1.bb
diff --git a/packages/xlibs/libxss_cvs.bb b/packages/xorg-lib/libxss_cvs.bb
index af064f5b4d..af064f5b4d 100644
--- a/packages/xlibs/libxss_cvs.bb
+++ b/packages/xorg-lib/libxss_cvs.bb
diff --git a/packages/xserver/xserver-kdrive/.mtn2git_empty b/packages/xorg-lib/libxt/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xserver/xserver-kdrive/.mtn2git_empty
+++ b/packages/xorg-lib/libxt/.mtn2git_empty
diff --git a/packages/xlibs/libxt/autofoo.patch b/packages/xorg-lib/libxt/autofoo.patch
index ff6dfdbbcc..ff6dfdbbcc 100644
--- a/packages/xlibs/libxt/autofoo.patch
+++ b/packages/xorg-lib/libxt/autofoo.patch
diff --git a/packages/xlibs/libxt_0.1.5.bb b/packages/xorg-lib/libxt_0.1.5.bb
index 00cbe9a3ad..00cbe9a3ad 100644
--- a/packages/xlibs/libxt_0.1.5.bb
+++ b/packages/xorg-lib/libxt_0.1.5.bb
diff --git a/packages/xlibs/libxt_1.0.0.bb b/packages/xorg-lib/libxt_X11R7.0-1.0.0.bb
index 606de5f31c..606de5f31c 100644
--- a/packages/xlibs/libxt_1.0.0.bb
+++ b/packages/xorg-lib/libxt_X11R7.0-1.0.0.bb
diff --git a/packages/xlibs/libxt_1.0.2.bb b/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb
index 69c74343a4..69c74343a4 100644
--- a/packages/xlibs/libxt_1.0.2.bb
+++ b/packages/xorg-lib/libxt_X11R7.1-1.0.2.bb
diff --git a/packages/xlibs/libxt_cvs.bb b/packages/xorg-lib/libxt_cvs.bb
index fdabe1d90f..fdabe1d90f 100644
--- a/packages/xlibs/libxt_cvs.bb
+++ b/packages/xorg-lib/libxt_cvs.bb
diff --git a/packages/xlibs/libxtst_1.0.1.bb b/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb
index 1355142ffd..1355142ffd 100644
--- a/packages/xlibs/libxtst_1.0.1.bb
+++ b/packages/xorg-lib/libxtst_X11R7.0-1.0.1.bb
diff --git a/packages/xlibs/libxtst_cvs.bb b/packages/xorg-lib/libxtst_cvs.bb
index c7c24d5d74..c7c24d5d74 100644
--- a/packages/xlibs/libxtst_cvs.bb
+++ b/packages/xorg-lib/libxtst_cvs.bb
diff --git a/packages/xlibs/libxv_2.2.2+cvs20040918.bb b/packages/xorg-lib/libxv_2.2.2+cvs20040918.bb
index e70ce9cee9..e70ce9cee9 100644
--- a/packages/xlibs/libxv_2.2.2+cvs20040918.bb
+++ b/packages/xorg-lib/libxv_2.2.2+cvs20040918.bb
diff --git a/packages/xlibs/libxv_2.2.2.bb b/packages/xorg-lib/libxv_2.2.2.bb
index 49e9670120..49e9670120 100644
--- a/packages/xlibs/libxv_2.2.2.bb
+++ b/packages/xorg-lib/libxv_2.2.2.bb
diff --git a/packages/xlibs/libxv_X11R7.0-1.0.1.bb b/packages/xorg-lib/libxv_X11R7.0-1.0.1.bb
index 2d5c6aeb17..2d5c6aeb17 100644
--- a/packages/xlibs/libxv_X11R7.0-1.0.1.bb
+++ b/packages/xorg-lib/libxv_X11R7.0-1.0.1.bb
diff --git a/packages/xserver/xserver-xorg/.mtn2git_empty b/packages/xorg-lib/libxvmc/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xserver/xserver-xorg/.mtn2git_empty
+++ b/packages/xorg-lib/libxvmc/.mtn2git_empty
diff --git a/packages/xlibs/libxvmc/drm.patch b/packages/xorg-lib/libxvmc/drm.patch
index d48cdb3d0b..d48cdb3d0b 100644
--- a/packages/xlibs/libxvmc/drm.patch
+++ b/packages/xorg-lib/libxvmc/drm.patch
diff --git a/packages/xlibs/libxvmc/true.patch b/packages/xorg-lib/libxvmc/true.patch
index 7059295007..7059295007 100644
--- a/packages/xlibs/libxvmc/true.patch
+++ b/packages/xorg-lib/libxvmc/true.patch
diff --git a/packages/xlibs/libxvmc/via.patch b/packages/xorg-lib/libxvmc/via.patch
index 21cdfbdd6b..21cdfbdd6b 100644
--- a/packages/xlibs/libxvmc/via.patch
+++ b/packages/xorg-lib/libxvmc/via.patch
diff --git a/packages/xlibs/libxvmc_20040919.bb b/packages/xorg-lib/libxvmc_20040919.bb
index b70c9f52e4..b70c9f52e4 100644
--- a/packages/xlibs/libxvmc_20040919.bb
+++ b/packages/xorg-lib/libxvmc_20040919.bb
diff --git a/packages/xlibs/libxvmc_20041025.bb b/packages/xorg-lib/libxvmc_20041025.bb
index 829a74d92b..829a74d92b 100644
--- a/packages/xlibs/libxvmc_20041025.bb
+++ b/packages/xorg-lib/libxvmc_20041025.bb
diff --git a/packages/xlibs/libxvmc_20050612.bb b/packages/xorg-lib/libxvmc_20050612.bb
index 18cd369acc..18cd369acc 100644
--- a/packages/xlibs/libxvmc_20050612.bb
+++ b/packages/xorg-lib/libxvmc_20050612.bb
diff --git a/packages/xlibs/libxxf86dga_1.0.0.bb b/packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb
index 82e784789f..82e784789f 100644
--- a/packages/xlibs/libxxf86dga_1.0.0.bb
+++ b/packages/xorg-lib/libxxf86dga_X11R7.0-1.0.0.bb
diff --git a/packages/xlibs/libxxf86dga_1.0.1.bb b/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb
index 2842c2c458..2842c2c458 100644
--- a/packages/xlibs/libxxf86dga_1.0.1.bb
+++ b/packages/xorg-lib/libxxf86dga_X11R7.1-1.0.1.bb
diff --git a/packages/xlibs/libxxf86dga_cvs.bb b/packages/xorg-lib/libxxf86dga_cvs.bb
index 96acce5d0e..96acce5d0e 100644
--- a/packages/xlibs/libxxf86dga_cvs.bb
+++ b/packages/xorg-lib/libxxf86dga_cvs.bb
diff --git a/packages/xlibs/libxxf86misc_1.0.0.bb b/packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb
index 5d5badb7a1..5d5badb7a1 100644
--- a/packages/xlibs/libxxf86misc_1.0.0.bb
+++ b/packages/xorg-lib/libxxf86misc_X11R7.0-1.0.0.bb
diff --git a/packages/xlibs/libxxf86misc_1.0.1.bb b/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb
index 2544f91ab1..2544f91ab1 100644
--- a/packages/xlibs/libxxf86misc_1.0.1.bb
+++ b/packages/xorg-lib/libxxf86misc_X11R7.1-1.0.1.bb
diff --git a/packages/xlibs/libxxf86vm_1.0.0.bb b/packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb
index 47a319c28e..47a319c28e 100644
--- a/packages/xlibs/libxxf86vm_1.0.0.bb
+++ b/packages/xorg-lib/libxxf86vm_X11R7.0-1.0.0.bb
diff --git a/packages/xlibs/libxxf86vm_1.0.1.bb b/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb
index 0ab206a0df..0ab206a0df 100644
--- a/packages/xlibs/libxxf86vm_1.0.1.bb
+++ b/packages/xorg-lib/libxxf86vm_X11R7.1-1.0.1.bb
diff --git a/packages/xlibs/libxxf86vm_cvs.bb b/packages/xorg-lib/libxxf86vm_cvs.bb
index 5eb48f930d..5eb48f930d 100644
--- a/packages/xlibs/libxxf86vm_cvs.bb
+++ b/packages/xorg-lib/libxxf86vm_cvs.bb
diff --git a/packages/xlibs/xorg-xlibs.inc b/packages/xorg-lib/xorg-lib-common.inc
index 8fb46777b0..8fb46777b0 100644
--- a/packages/xlibs/xorg-xlibs.inc
+++ b/packages/xorg-lib/xorg-lib-common.inc
diff --git a/packages/xlibs/xtrans-native_0.1.bb b/packages/xorg-lib/xtrans-native_0.1.bb
index 80de95c869..80de95c869 100644
--- a/packages/xlibs/xtrans-native_0.1.bb
+++ b/packages/xorg-lib/xtrans-native_0.1.bb
diff --git a/packages/xlibs/xtrans_0.1.bb b/packages/xorg-lib/xtrans_0.1.bb
index 8fee0d5089..8fee0d5089 100644
--- a/packages/xlibs/xtrans_0.1.bb
+++ b/packages/xorg-lib/xtrans_0.1.bb
diff --git a/packages/xlibs/xtrans_1.0.0.bb b/packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb
index b6933bf615..b6933bf615 100644
--- a/packages/xlibs/xtrans_1.0.0.bb
+++ b/packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb
diff --git a/packages/xlibs/xtrans_cvs.bb b/packages/xorg-lib/xtrans_cvs.bb
index 9714f4017b..9714f4017b 100644
--- a/packages/xlibs/xtrans_cvs.bb
+++ b/packages/xorg-lib/xtrans_cvs.bb
diff --git a/packages/xset/xset/.mtn2git_empty b/packages/xorg-proto/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xset/xset/.mtn2git_empty
+++ b/packages/xorg-proto/.mtn2git_empty
diff --git a/packages/xproto/applewmproto_1.0.3.bb b/packages/xorg-proto/applewmproto_X11R7.0-1.0.3.bb
index 66419fe87f..66419fe87f 100644
--- a/packages/xproto/applewmproto_1.0.3.bb
+++ b/packages/xorg-proto/applewmproto_X11R7.0-1.0.3.bb
diff --git a/packages/xproto/bigreqsproto_1.0.2.bb b/packages/xorg-proto/bigreqsproto_X11R7.0-1.0.2.bb
index 66419fe87f..66419fe87f 100644
--- a/packages/xproto/bigreqsproto_1.0.2.bb
+++ b/packages/xorg-proto/bigreqsproto_X11R7.0-1.0.2.bb
diff --git a/packages/xproto/compositeproto_0.2.2.bb b/packages/xorg-proto/compositeproto_X11R7.0-0.2.2.bb
index 0989abb63c..0989abb63c 100644
--- a/packages/xproto/compositeproto_0.2.2.bb
+++ b/packages/xorg-proto/compositeproto_X11R7.0-0.2.2.bb
diff --git a/packages/xproto/compositeproto_0.3.1.bb b/packages/xorg-proto/compositeproto_X11R7.1-0.3.1.bb
index bb55a2022e..bb55a2022e 100644
--- a/packages/xproto/compositeproto_0.3.1.bb
+++ b/packages/xorg-proto/compositeproto_X11R7.1-0.3.1.bb
diff --git a/packages/xproto/damageproto_1.0.3.bb b/packages/xorg-proto/damageproto_X11R7.0-1.0.3.bb
index cde80f0ffa..cde80f0ffa 100644
--- a/packages/xproto/damageproto_1.0.3.bb
+++ b/packages/xorg-proto/damageproto_X11R7.0-1.0.3.bb
diff --git a/packages/xproto/dmxproto_2.2.2.bb b/packages/xorg-proto/dmxproto_X11R7.0-2.2.2.bb
index 66419fe87f..66419fe87f 100644
--- a/packages/xproto/dmxproto_2.2.2.bb
+++ b/packages/xorg-proto/dmxproto_X11R7.0-2.2.2.bb
diff --git a/packages/xproto/evieext_1.0.2.bb b/packages/xorg-proto/evieext_X11R7.0-1.0.2.bb
index 66419fe87f..66419fe87f 100644
--- a/packages/xproto/evieext_1.0.2.bb
+++ b/packages/xorg-proto/evieext_X11R7.0-1.0.2.bb
diff --git a/packages/xproto/fixesproto_3.0.2.bb b/packages/xorg-proto/fixesproto_X11R7.0-3.0.2.bb
index 2be69994a8..2be69994a8 100644
--- a/packages/xproto/fixesproto_3.0.2.bb
+++ b/packages/xorg-proto/fixesproto_X11R7.0-3.0.2.bb
diff --git a/packages/xproto/fixesproto_4.0.bb b/packages/xorg-proto/fixesproto_X11R7.1-4.0.bb
index 8e552e6bc5..8e552e6bc5 100644
--- a/packages/xproto/fixesproto_4.0.bb
+++ b/packages/xorg-proto/fixesproto_X11R7.1-4.0.bb
diff --git a/packages/xproto/fontcacheproto_0.1.2.bb b/packages/xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb
index 66419fe87f..66419fe87f 100644
--- a/packages/xproto/fontcacheproto_0.1.2.bb
+++ b/packages/xorg-proto/fontcacheproto_X11R7.0-0.1.2.bb
diff --git a/packages/xproto/fontsproto_2.0.2.bb b/packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb
index 66419fe87f..66419fe87f 100644
--- a/packages/xproto/fontsproto_2.0.2.bb
+++ b/packages/xorg-proto/fontsproto_X11R7.0-2.0.2.bb
diff --git a/packages/xproto/glproto_1.4.3.bb b/packages/xorg-proto/glproto_X11R7.0-1.4.3.bb
index 66419fe87f..66419fe87f 100644
--- a/packages/xproto/glproto_1.4.3.bb
+++ b/packages/xorg-proto/glproto_X11R7.0-1.4.3.bb
diff --git a/packages/xproto/glproto_1.4.7.bb b/packages/xorg-proto/glproto_X11R7.1-1.4.7.bb
index 67c086e764..67c086e764 100644
--- a/packages/xproto/glproto_1.4.7.bb
+++ b/packages/xorg-proto/glproto_X11R7.1-1.4.7.bb
diff --git a/packages/xproto/inputproto_1.3.2.bb b/packages/xorg-proto/inputproto_X11R7.0-1.3.2.bb
index 66419fe87f..66419fe87f 100644
--- a/packages/xproto/inputproto_1.3.2.bb
+++ b/packages/xorg-proto/inputproto_X11R7.0-1.3.2.bb
diff --git a/packages/xproto/kbproto_1.0.2.bb b/packages/xorg-proto/kbproto_X11R7.0-1.0.2.bb
index 66419fe87f..66419fe87f 100644
--- a/packages/xproto/kbproto_1.0.2.bb
+++ b/packages/xorg-proto/kbproto_X11R7.0-1.0.2.bb
diff --git a/packages/xproto/printproto_1.0.3.bb b/packages/xorg-proto/printproto_X11R7.0-1.0.3.bb
index 66419fe87f..66419fe87f 100644
--- a/packages/xproto/printproto_1.0.3.bb
+++ b/packages/xorg-proto/printproto_X11R7.0-1.0.3.bb
diff --git a/packages/xproto/randrproto_1.1.2.bb b/packages/xorg-proto/randrproto_X11R7.0-1.1.2.bb
index fafe3d3bef..fafe3d3bef 100644
--- a/packages/xproto/randrproto_1.1.2.bb
+++ b/packages/xorg-proto/randrproto_X11R7.0-1.1.2.bb
diff --git a/packages/xproto/recordproto_1.13.2.bb b/packages/xorg-proto/recordproto_X11R7.0-1.13.2.bb
index 9e2cafceb8..9e2cafceb8 100644
--- a/packages/xproto/recordproto_1.13.2.bb
+++ b/packages/xorg-proto/recordproto_X11R7.0-1.13.2.bb
diff --git a/packages/xproto/renderproto_0.9.2.bb b/packages/xorg-proto/renderproto_X11R7.0-0.9.2.bb
index 7f9febd8fa..7f9febd8fa 100644
--- a/packages/xproto/renderproto_0.9.2.bb
+++ b/packages/xorg-proto/renderproto_X11R7.0-0.9.2.bb
diff --git a/packages/xproto/resourceproto_1.0.2.bb b/packages/xorg-proto/resourceproto_X11R7.0-1.0.2.bb
index e210b894ee..e210b894ee 100644
--- a/packages/xproto/resourceproto_1.0.2.bb
+++ b/packages/xorg-proto/resourceproto_X11R7.0-1.0.2.bb
diff --git a/packages/xproto/scrnsaverproto_1.0.2.bb b/packages/xorg-proto/scrnsaverproto_X11R7.0-1.0.2.bb
index 66419fe87f..66419fe87f 100644
--- a/packages/xproto/scrnsaverproto_1.0.2.bb
+++ b/packages/xorg-proto/scrnsaverproto_X11R7.0-1.0.2.bb
diff --git a/packages/xproto/scrnsaverproto_1.1.0.bb b/packages/xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb
index 67c086e764..67c086e764 100644
--- a/packages/xproto/scrnsaverproto_1.1.0.bb
+++ b/packages/xorg-proto/scrnsaverproto_X11R7.1-1.1.0.bb
diff --git a/packages/xproto/trapproto_3.4.3.bb b/packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb
index 66419fe87f..66419fe87f 100644
--- a/packages/xproto/trapproto_3.4.3.bb
+++ b/packages/xorg-proto/trapproto_X11R7.0-3.4.3.bb
diff --git a/packages/xproto/videoproto_2.2.2.bb b/packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb
index 66419fe87f..66419fe87f 100644
--- a/packages/xproto/videoproto_2.2.2.bb
+++ b/packages/xorg-proto/videoproto_X11R7.0-2.2.2.bb
diff --git a/packages/xproto/windowswmproto_1.0.3.bb b/packages/xorg-proto/windowswmproto_X11R7.0-1.0.3.bb
index 66419fe87f..66419fe87f 100644
--- a/packages/xproto/windowswmproto_1.0.3.bb
+++ b/packages/xorg-proto/windowswmproto_X11R7.0-1.0.3.bb
diff --git a/packages/xproto/xcmiscproto_1.1.2.bb b/packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb
index 66419fe87f..66419fe87f 100644
--- a/packages/xproto/xcmiscproto_1.1.2.bb
+++ b/packages/xorg-proto/xcmiscproto_X11R7.0-1.1.2.bb
diff --git a/packages/xproto/xextproto_7.0.2.bb b/packages/xorg-proto/xextproto_X11R7.0-7.0.2.bb
index 1ae2522d5f..1ae2522d5f 100644
--- a/packages/xproto/xextproto_7.0.2.bb
+++ b/packages/xorg-proto/xextproto_X11R7.0-7.0.2.bb
diff --git a/packages/xproto/xf86bigfontproto_1.1.2.bb b/packages/xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb
index 66419fe87f..66419fe87f 100644
--- a/packages/xproto/xf86bigfontproto_1.1.2.bb
+++ b/packages/xorg-proto/xf86bigfontproto_X11R7.0-1.1.2.bb
diff --git a/packages/xproto/xf86dgaproto_2.0.2.bb b/packages/xorg-proto/xf86dgaproto_X11R7.0-2.0.2.bb
index 3d7166c741..3d7166c741 100644
--- a/packages/xproto/xf86dgaproto_2.0.2.bb
+++ b/packages/xorg-proto/xf86dgaproto_X11R7.0-2.0.2.bb
diff --git a/packages/xproto/xf86driproto_2.0.3.bb b/packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb
index 66419fe87f..66419fe87f 100644
--- a/packages/xproto/xf86driproto_2.0.3.bb
+++ b/packages/xorg-proto/xf86driproto_X11R7.0-2.0.3.bb
diff --git a/packages/xproto/xf86miscproto_0.9.2.bb b/packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb
index 66419fe87f..66419fe87f 100644
--- a/packages/xproto/xf86miscproto_0.9.2.bb
+++ b/packages/xorg-proto/xf86miscproto_X11R7.0-0.9.2.bb
diff --git a/packages/xproto/xf86rushproto_1.1.2.bb b/packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb
index 66419fe87f..66419fe87f 100644
--- a/packages/xproto/xf86rushproto_1.1.2.bb
+++ b/packages/xorg-proto/xf86rushproto_X11R7.0-1.1.2.bb
diff --git a/packages/xproto/xf86vidmodeproto_2.2.2.bb b/packages/xorg-proto/xf86vidmodeproto_X11R7.0-2.2.2.bb
index 9ce9a207b8..9ce9a207b8 100644
--- a/packages/xproto/xf86vidmodeproto_2.2.2.bb
+++ b/packages/xorg-proto/xf86vidmodeproto_X11R7.0-2.2.2.bb
diff --git a/packages/xproto/xineramaproto_1.1.2.bb b/packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb
index 66419fe87f..66419fe87f 100644
--- a/packages/xproto/xineramaproto_1.1.2.bb
+++ b/packages/xorg-proto/xineramaproto_X11R7.0-1.1.2.bb
diff --git a/packages/xproto/proto-common.inc b/packages/xorg-proto/xorg-proto-common.inc
index 65dfd4207a..65dfd4207a 100644
--- a/packages/xproto/proto-common.inc
+++ b/packages/xorg-proto/xorg-proto-common.inc
diff --git a/packages/xproto/xproto-native_6.6.2.bb b/packages/xorg-proto/xproto-native_6.6.2.bb
index 44ccb5f035..44ccb5f035 100644
--- a/packages/xproto/xproto-native_6.6.2.bb
+++ b/packages/xorg-proto/xproto-native_6.6.2.bb
diff --git a/packages/xproto/xproto-native_cvs.bb b/packages/xorg-proto/xproto-native_cvs.bb
index 7b768a8079..7b768a8079 100644
--- a/packages/xproto/xproto-native_cvs.bb
+++ b/packages/xorg-proto/xproto-native_cvs.bb
diff --git a/packages/xproto/xproto_6.6.2+cvs20050226.bb b/packages/xorg-proto/xproto_6.6.2+cvs20050226.bb
index 594a351155..594a351155 100644
--- a/packages/xproto/xproto_6.6.2+cvs20050226.bb
+++ b/packages/xorg-proto/xproto_6.6.2+cvs20050226.bb
diff --git a/packages/xproto/xproto_6.6.2.bb b/packages/xorg-proto/xproto_6.6.2.bb
index b5cf751053..b5cf751053 100644
--- a/packages/xproto/xproto_6.6.2.bb
+++ b/packages/xorg-proto/xproto_6.6.2.bb
diff --git a/packages/xproto/xproto_7.0.4.bb b/packages/xorg-proto/xproto_X11R7.0-7.0.4.bb
index 66419fe87f..66419fe87f 100644
--- a/packages/xproto/xproto_7.0.4.bb
+++ b/packages/xorg-proto/xproto_X11R7.0-7.0.4.bb
diff --git a/packages/xproto/xproto_7.0.5.bb b/packages/xorg-proto/xproto_X11R7.1-7.0.5.bb
index 67c086e764..67c086e764 100644
--- a/packages/xproto/xproto_7.0.5.bb
+++ b/packages/xorg-proto/xproto_X11R7.1-7.0.5.bb
diff --git a/packages/xproto/xproto_cvs.bb b/packages/xorg-proto/xproto_cvs.bb
index 1d9c96c87d..1d9c96c87d 100644
--- a/packages/xproto/xproto_cvs.bb
+++ b/packages/xorg-proto/xproto_cvs.bb
diff --git a/packages/xproto/xproxymanagementprotocol_1.0.2.bb b/packages/xorg-proto/xproxymanagementprotocol_X11R7.0-1.0.2.bb
index 66419fe87f..66419fe87f 100644
--- a/packages/xproto/xproxymanagementprotocol_1.0.2.bb
+++ b/packages/xorg-proto/xproxymanagementprotocol_X11R7.0-1.0.2.bb
diff --git a/packages/xorg-util/.mtn2git_empty b/packages/xorg-util/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-util/.mtn2git_empty
diff --git a/packages/xlibs/util-macros_1.0.1.bb b/packages/xorg-util/util-macros_X11R7.0-1.0.1.bb
index 6b009a7ea7..6b009a7ea7 100644
--- a/packages/xlibs/util-macros_1.0.1.bb
+++ b/packages/xorg-util/util-macros_X11R7.0-1.0.1.bb
diff --git a/packages/xlibs/util-macros_1.0.2.bb b/packages/xorg-util/util-macros_X11R7.1-1.0.2.bb
index 76101b0345..76101b0345 100644
--- a/packages/xlibs/util-macros_1.0.2.bb
+++ b/packages/xorg-util/util-macros_X11R7.1-1.0.2.bb
diff --git a/packages/xorg-xserver/.mtn2git_empty b/packages/xorg-xserver/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-xserver/.mtn2git_empty
diff --git a/packages/xorg-xserver/files/.mtn2git_empty b/packages/xorg-xserver/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-xserver/files/.mtn2git_empty
diff --git a/packages/xserver-common/files/calibrate_zaurusd.patch b/packages/xorg-xserver/files/calibrate_zaurusd.patch
index 6a7e3b02b7..6a7e3b02b7 100644
--- a/packages/xserver-common/files/calibrate_zaurusd.patch
+++ b/packages/xorg-xserver/files/calibrate_zaurusd.patch
diff --git a/packages/xserver-common/files/poodle-xmodmap-2.6.patch b/packages/xorg-xserver/files/poodle-xmodmap-2.6.patch
index 73cf3f6ffb..73cf3f6ffb 100644
--- a/packages/xserver-common/files/poodle-xmodmap-2.6.patch
+++ b/packages/xorg-xserver/files/poodle-xmodmap-2.6.patch
diff --git a/packages/xserver-common/files/setDPI.sh b/packages/xorg-xserver/files/setDPI.sh
index 04a2edd6c6..04a2edd6c6 100644
--- a/packages/xserver-common/files/setDPI.sh
+++ b/packages/xorg-xserver/files/setDPI.sh
diff --git a/packages/xserver-common/xserver-common_1.10.bb b/packages/xorg-xserver/xserver-common_1.10.bb
index de81537f99..de81537f99 100644
--- a/packages/xserver-common/xserver-common_1.10.bb
+++ b/packages/xorg-xserver/xserver-common_1.10.bb
diff --git a/packages/xserver-common/xserver-common_1.3.bb b/packages/xorg-xserver/xserver-common_1.3.bb
index ea3fab6654..ea3fab6654 100644
--- a/packages/xserver-common/xserver-common_1.3.bb
+++ b/packages/xorg-xserver/xserver-common_1.3.bb
diff --git a/packages/xserver-common/xserver-common_1.8.bb b/packages/xorg-xserver/xserver-common_1.8.bb
index b7b3f554f3..b7b3f554f3 100644
--- a/packages/xserver-common/xserver-common_1.8.bb
+++ b/packages/xorg-xserver/xserver-common_1.8.bb
diff --git a/packages/xserver-common/xserver-common_1.9.bb b/packages/xorg-xserver/xserver-common_1.9.bb
index de81537f99..de81537f99 100644
--- a/packages/xserver-common/xserver-common_1.9.bb
+++ b/packages/xorg-xserver/xserver-common_1.9.bb
diff --git a/packages/xorg-xserver/xserver-kdrive-omap/.mtn2git_empty b/packages/xorg-xserver/xserver-kdrive-omap/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-xserver/xserver-kdrive-omap/.mtn2git_empty
diff --git a/packages/xserver/xserver-kdrive-omap/configure-tslib.patch b/packages/xorg-xserver/xserver-kdrive-omap/configure-tslib.patch
index 0c0b64bf14..0c0b64bf14 100644
--- a/packages/xserver/xserver-kdrive-omap/configure-tslib.patch
+++ b/packages/xorg-xserver/xserver-kdrive-omap/configure-tslib.patch
diff --git a/packages/xserver/xserver-kdrive-omap/fbdev-not-fix.patch b/packages/xorg-xserver/xserver-kdrive-omap/fbdev-not-fix.patch
index f87e7cc2cd..f87e7cc2cd 100644
--- a/packages/xserver/xserver-kdrive-omap/fbdev-not-fix.patch
+++ b/packages/xorg-xserver/xserver-kdrive-omap/fbdev-not-fix.patch
diff --git a/packages/xserver/xserver-kdrive-omap/kmode.patch b/packages/xorg-xserver/xserver-kdrive-omap/kmode.patch
index 22ad51c5ad..22ad51c5ad 100644
--- a/packages/xserver/xserver-kdrive-omap/kmode.patch
+++ b/packages/xorg-xserver/xserver-kdrive-omap/kmode.patch
diff --git a/packages/xserver/xserver-kdrive-omap_6.6.3.bb b/packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb
index 31bcb0c273..31bcb0c273 100644
--- a/packages/xserver/xserver-kdrive-omap_6.6.3.bb
+++ b/packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb
diff --git a/packages/xorg-xserver/xserver-kdrive/.mtn2git_empty b/packages/xorg-xserver/xserver-kdrive/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-xserver/xserver-kdrive/.mtn2git_empty
diff --git a/packages/xserver/xserver-kdrive/build-20050207-against-X11R7.diff b/packages/xorg-xserver/xserver-kdrive/build-20050207-against-X11R7.diff
index 596e498b80..596e498b80 100644
--- a/packages/xserver/xserver-kdrive/build-20050207-against-X11R7.diff
+++ b/packages/xorg-xserver/xserver-kdrive/build-20050207-against-X11R7.diff
diff --git a/packages/xserver/xserver-kdrive/devfs.patch b/packages/xorg-xserver/xserver-kdrive/devfs.patch
index a6238126c0..a6238126c0 100644
--- a/packages/xserver/xserver-kdrive/devfs.patch
+++ b/packages/xorg-xserver/xserver-kdrive/devfs.patch
diff --git a/packages/xserver/xserver-kdrive/disable-apm.patch b/packages/xorg-xserver/xserver-kdrive/disable-apm.patch
index bd8842721b..bd8842721b 100644
--- a/packages/xserver/xserver-kdrive/disable-apm.patch
+++ b/packages/xorg-xserver/xserver-kdrive/disable-apm.patch
diff --git a/packages/xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch b/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch
index 9c43e52ead..9c43e52ead 100644
--- a/packages/xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch
+++ b/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch
diff --git a/packages/xserver/xserver-kdrive/enable-builtin-fonts.patch b/packages/xorg-xserver/xserver-kdrive/enable-builtin-fonts.patch
index 13a6c2c954..13a6c2c954 100644
--- a/packages/xserver/xserver-kdrive/enable-builtin-fonts.patch
+++ b/packages/xorg-xserver/xserver-kdrive/enable-builtin-fonts.patch
diff --git a/packages/xserver/xserver-kdrive/enable-tslib.patch b/packages/xorg-xserver/xserver-kdrive/enable-tslib.patch
index e488657b74..e488657b74 100644
--- a/packages/xserver/xserver-kdrive/enable-tslib.patch
+++ b/packages/xorg-xserver/xserver-kdrive/enable-tslib.patch
diff --git a/packages/xserver/xserver-kdrive/epson.patch b/packages/xorg-xserver/xserver-kdrive/epson.patch
index 07009bdc40..07009bdc40 100644
--- a/packages/xserver/xserver-kdrive/epson.patch
+++ b/packages/xorg-xserver/xserver-kdrive/epson.patch
diff --git a/packages/xserver/xserver-kdrive/faster-rotated.patch b/packages/xorg-xserver/xserver-kdrive/faster-rotated.patch
index eaf7ddec36..eaf7ddec36 100644
--- a/packages/xserver/xserver-kdrive/faster-rotated.patch
+++ b/packages/xorg-xserver/xserver-kdrive/faster-rotated.patch
diff --git a/packages/xserver/xserver-kdrive/fbdev-not-fix.patch b/packages/xorg-xserver/xserver-kdrive/fbdev-not-fix.patch
index f87e7cc2cd..f87e7cc2cd 100644
--- a/packages/xserver/xserver-kdrive/fbdev-not-fix.patch
+++ b/packages/xorg-xserver/xserver-kdrive/fbdev-not-fix.patch
diff --git a/packages/xserver/xserver-kdrive/kdrive-evdev.patch b/packages/xorg-xserver/xserver-kdrive/kdrive-evdev.patch
index 2dc22bf50e..2dc22bf50e 100644
--- a/packages/xserver/xserver-kdrive/kdrive-evdev.patch
+++ b/packages/xorg-xserver/xserver-kdrive/kdrive-evdev.patch
diff --git a/packages/xserver/xserver-kdrive/kdrive-use-evdev.patch b/packages/xorg-xserver/xserver-kdrive/kdrive-use-evdev.patch
index d4f885ee26..d4f885ee26 100644
--- a/packages/xserver/xserver-kdrive/kdrive-use-evdev.patch
+++ b/packages/xorg-xserver/xserver-kdrive/kdrive-use-evdev.patch
diff --git a/packages/xserver/xserver-kdrive/kmode.patch b/packages/xorg-xserver/xserver-kdrive/kmode.patch
index 5ad3e4e277..5ad3e4e277 100644
--- a/packages/xserver/xserver-kdrive/kmode.patch
+++ b/packages/xorg-xserver/xserver-kdrive/kmode.patch
diff --git a/packages/xserver/xserver-kdrive/no-serial-probing.patch b/packages/xorg-xserver/xserver-kdrive/no-serial-probing.patch
index 35ccadaa8d..35ccadaa8d 100644
--- a/packages/xserver/xserver-kdrive/no-serial-probing.patch
+++ b/packages/xorg-xserver/xserver-kdrive/no-serial-probing.patch
diff --git a/packages/xserver/xserver-kdrive/onlyfb.patch b/packages/xorg-xserver/xserver-kdrive/onlyfb.patch
index e773324981..e773324981 100644
--- a/packages/xserver/xserver-kdrive/onlyfb.patch
+++ b/packages/xorg-xserver/xserver-kdrive/onlyfb.patch
diff --git a/packages/xserver/xserver-kdrive/optional-xkb.patch b/packages/xorg-xserver/xserver-kdrive/optional-xkb.patch
index d9ef51c5ba..d9ef51c5ba 100644
--- a/packages/xserver/xserver-kdrive/optional-xkb.patch
+++ b/packages/xorg-xserver/xserver-kdrive/optional-xkb.patch
diff --git a/packages/xserver/xserver-kdrive/xcalibrate.patch b/packages/xorg-xserver/xserver-kdrive/xcalibrate.patch
index 3f8cd4ea5c..3f8cd4ea5c 100644
--- a/packages/xserver/xserver-kdrive/xcalibrate.patch
+++ b/packages/xorg-xserver/xserver-kdrive/xcalibrate.patch
diff --git a/packages/xserver/xserver-kdrive/xserver-kdrive-poodle.patch b/packages/xorg-xserver/xserver-kdrive/xserver-kdrive-poodle.patch
index ce80a7e389..ce80a7e389 100644
--- a/packages/xserver/xserver-kdrive/xserver-kdrive-poodle.patch
+++ b/packages/xorg-xserver/xserver-kdrive/xserver-kdrive-poodle.patch
diff --git a/packages/xserver/xserver-kdrive_20050207.bb b/packages/xorg-xserver/xserver-kdrive_20050207.bb
index 21529a69d9..21529a69d9 100644
--- a/packages/xserver/xserver-kdrive_20050207.bb
+++ b/packages/xorg-xserver/xserver-kdrive_20050207.bb
diff --git a/packages/xserver/xserver-kdrive_20050624.bb b/packages/xorg-xserver/xserver-kdrive_20050624.bb
index c2e44f7837..c2e44f7837 100644
--- a/packages/xserver/xserver-kdrive_20050624.bb
+++ b/packages/xorg-xserver/xserver-kdrive_20050624.bb
diff --git a/packages/xserver/xserver-kdrive_20060312.bb b/packages/xorg-xserver/xserver-kdrive_20060312.bb
index e5101a3579..e5101a3579 100644
--- a/packages/xserver/xserver-kdrive_20060312.bb
+++ b/packages/xorg-xserver/xserver-kdrive_20060312.bb
diff --git a/packages/xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb
index 103185289c..103185289c 100644
--- a/packages/xserver/xserver-kdrive_X11R7.1-1.1.0.bb
+++ b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb
diff --git a/packages/xserver/xserver-kdrive_cvs.bb b/packages/xorg-xserver/xserver-kdrive_cvs.bb
index 1c841cabf7..1c841cabf7 100644
--- a/packages/xserver/xserver-kdrive_cvs.bb
+++ b/packages/xorg-xserver/xserver-kdrive_cvs.bb
diff --git a/packages/xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb
index 1f42cc159c..1f42cc159c 100644
--- a/packages/xserver/xserver-kdrive_git.bb
+++ b/packages/xorg-xserver/xserver-kdrive_git.bb
diff --git a/packages/xorg-xserver/xserver-xorg/.mtn2git_empty b/packages/xorg-xserver/xserver-xorg/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-xserver/xserver-xorg/.mtn2git_empty
diff --git a/packages/xserver/xserver-xorg/dri.patch b/packages/xorg-xserver/xserver-xorg/dri.patch
index 37d0407fe4..37d0407fe4 100644
--- a/packages/xserver/xserver-xorg/dri.patch
+++ b/packages/xorg-xserver/xserver-xorg/dri.patch
diff --git a/packages/xserver/xserver-xorg/fontfile.patch b/packages/xorg-xserver/xserver-xorg/fontfile.patch
index ed39bf45d0..ed39bf45d0 100644
--- a/packages/xserver/xserver-xorg/fontfile.patch
+++ b/packages/xorg-xserver/xserver-xorg/fontfile.patch
diff --git a/packages/xserver/xserver-xorg/freetype.patch b/packages/xorg-xserver/xserver-xorg/freetype.patch
index 0ba3dd5627..0ba3dd5627 100644
--- a/packages/xserver/xserver-xorg/freetype.patch
+++ b/packages/xorg-xserver/xserver-xorg/freetype.patch
diff --git a/packages/xserver/xserver-xorg/imake-installed.patch b/packages/xorg-xserver/xserver-xorg/imake-installed.patch
index 57821075ef..57821075ef 100644
--- a/packages/xserver/xserver-xorg/imake-installed.patch
+++ b/packages/xorg-xserver/xserver-xorg/imake-installed.patch
diff --git a/packages/xserver/xserver-xorg/imake-staging.patch b/packages/xorg-xserver/xserver-xorg/imake-staging.patch
index bf2e350830..bf2e350830 100644
--- a/packages/xserver/xserver-xorg/imake-staging.patch
+++ b/packages/xorg-xserver/xserver-xorg/imake-staging.patch
diff --git a/packages/xserver/xserver-xorg_6.8.99.10.bb b/packages/xorg-xserver/xserver-xorg_6.8.99.10.bb
index 37546fe1ee..37546fe1ee 100644
--- a/packages/xserver/xserver-xorg_6.8.99.10.bb
+++ b/packages/xorg-xserver/xserver-xorg_6.8.99.10.bb
diff --git a/packages/xserver/xserver-xorg_6.8.99.11.bb b/packages/xorg-xserver/xserver-xorg_6.8.99.11.bb
index e60f62ef57..e60f62ef57 100644
--- a/packages/xserver/xserver-xorg_6.8.99.11.bb
+++ b/packages/xorg-xserver/xserver-xorg_6.8.99.11.bb
diff --git a/packages/xserver/xserver-xorg_cvs.bb b/packages/xorg-xserver/xserver-xorg_cvs.bb
index e410581e17..e410581e17 100644
--- a/packages/xserver/xserver-xorg_cvs.bb
+++ b/packages/xorg-xserver/xserver-xorg_cvs.bb