From 34db4ff998f2ca4831b0213f7d9eba9a81af2a90 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 1 Mar 2006 17:59:53 +0000 Subject: [PATCH] xlibs: move X libraries to a common folder and unify naming to tarball names --- packages/libxvmc/files/.mtn2git_empty | 0 packages/libxxf86dga/.mtn2git_empty | 0 packages/libxxf86vm/.mtn2git_empty | 0 packages/x11/.mtn2git_empty | 0 packages/x11/files/.mtn2git_empty | 0 packages/xau/.mtn2git_empty | 0 packages/xau/files/.mtn2git_empty | 0 packages/xaw/.mtn2git_empty | 0 packages/xaw/files/.mtn2git_empty | 0 packages/xcomposite/.mtn2git_empty | 0 packages/xcomposite/xcomposite-1.0.1/.mtn2git_empty | 0 packages/xdamage/.mtn2git_empty | 0 packages/xdamage/xdamage-1.0.1/.mtn2git_empty | 0 packages/xdamage/xdamage/.mtn2git_empty | 0 packages/xdmcp/.mtn2git_empty | 0 packages/xdmcp/files/.mtn2git_empty | 0 packages/xext/.mtn2git_empty | 0 packages/xext/files/.mtn2git_empty | 0 packages/xfont/.mtn2git_empty | 0 packages/xfont/files/.mtn2git_empty | 0 packages/xinerama/.mtn2git_empty | 0 packages/{ice => xlibs}/.mtn2git_empty | 0 packages/{x11 => xlibs}/diet-x11_20050226.bb | 2 +- packages/{x11 => xlibs}/diet-x11_6.2.1.bb | 2 +- packages/{x11 => xlibs}/diet-x11_cvs.bb | 2 +- packages/{ice/files => xlibs/libice}/.mtn2git_empty | 0 packages/{ice/files => xlibs/libice}/autofoo.patch | 0 packages/{ice/ice_6.3.3.bb => xlibs/libice_6.3.3.bb} | 3 ++- packages/{ice/ice_cvs.bb => xlibs/libice_cvs.bb} | 4 ++-- packages/{ => xlibs}/libsm/.mtn2git_empty | 0 packages/{libsm/files => xlibs/libsm}/autofoo.patch | 0 packages/{libsm => xlibs}/libsm_6.0.3.bb | 2 +- packages/{libsm => xlibs}/libsm_cvs.bb | 2 +- .../{x11/x11-native_cvs.bb => xlibs/libx11-native_6.2.1.bb} | 2 +- .../{x11/x11-native_6.2.1.bb => xlibs/libx11-native_cvs.bb} | 2 +- packages/{libsm/files => xlibs/libx11}/.mtn2git_empty | 0 packages/{x11/files => xlibs/libx11}/autofoo.patch | 0 .../files => xlibs/libx11}/errordb-keysymdb-path-fix.patch | 0 .../{x11/files => xlibs/libx11}/fix-utf8-wrong-define.patch | 0 packages/{x11/files => xlibs/libx11}/xim.patch | 0 packages/{x11/x11_20050226.bb => xlibs/libx11_20050226.bb} | 2 +- packages/{x11/x11_6.2.1.bb => xlibs/libx11_6.2.1.bb} | 5 +++-- packages/{x11/x11_cvs.bb => xlibs/libx11_cvs.bb} | 5 +++-- .../{xau/xau-native_cvs.bb => xlibs/libxau-native_0.1.1.bb} | 2 +- .../{xau/xau-native_0.1.1.bb => xlibs/libxau-native_cvs.bb} | 2 +- packages/{libxcursor => xlibs/libxau}/.mtn2git_empty | 0 packages/{xau/files => xlibs/libxau}/autofoo.patch | 0 packages/{xau/xau_0.1.1.bb => xlibs/libxau_0.1.1.bb} | 1 + packages/{xau/xau_cvs.bb => xlibs/libxau_cvs.bb} | 1 + packages/{libxcursor/files => xlibs/libxaw}/.mtn2git_empty | 0 packages/{xaw/files => xlibs/libxaw}/auxdir.patch | 0 packages/{xaw/xaw_7.0.2.bb => xlibs/libxaw_7.0.2.bb} | 3 ++- packages/{xaw/xaw_cvs.bb => xlibs/libxaw_cvs.bb} | 4 ++-- .../libxcomposite-1.0.1}/.mtn2git_empty | 0 .../libxcomposite-1.0.1}/autofoo.patch | 0 .../xcomposite_1.0.1.bb => xlibs/libxcomposite_1.0.1.bb} | 3 ++- .../xcomposite_cvs.bb => xlibs/libxcomposite_cvs.bb} | 3 ++- .../{libxfixes => xlibs/libxcursor-1.1.2}/.mtn2git_empty | 0 .../{libxcursor => xlibs}/libxcursor-1.1.2/autofoo.patch | 0 .../{libxfixes/files => xlibs/libxcursor}/.mtn2git_empty | 0 .../{libxcursor/files => xlibs/libxcursor}/autofoo.patch | 0 packages/{libxcursor => xlibs}/libxcursor_1.1.2.bb | 0 packages/{libxcursor => xlibs}/libxcursor_cvs.bb | 0 packages/{libxft => xlibs/libxdamage-1.0.1}/.mtn2git_empty | 0 .../xdamage-1.0.1 => xlibs/libxdamage-1.0.1}/autofoo.patch | 0 packages/{libxft/files => xlibs/libxdamage}/.mtn2git_empty | 0 packages/{xdamage/xdamage => xlibs/libxdamage}/m4.patch | 0 .../{xdamage/xdamage_1.0.1.bb => xlibs/libxdamage_1.0.1.bb} | 3 ++- packages/{xdamage/xdamage_cvs.bb => xlibs/libxdamage_cvs.bb} | 3 ++- packages/{xdmcp => xlibs}/libxdmcp-native_0.1.1.bb | 0 packages/{xdmcp => xlibs}/libxdmcp-native_0.1.3.bb | 0 packages/{libxi => xlibs/libxdmcp}/.mtn2git_empty | 0 packages/{xdmcp/files => xlibs/libxdmcp}/autofoo.patch | 0 packages/{xdmcp => xlibs}/libxdmcp_0.1.1.bb | 0 packages/{xdmcp => xlibs}/libxdmcp_0.1.3.bb | 0 packages/{xdmcp => xlibs}/libxdmcp_cvs.bb | 0 .../{xext/xext-native_cvs.bb => xlibs/libxext-native_cvs.bb} | 2 +- packages/{libxi/files => xlibs/libxext}/.mtn2git_empty | 0 packages/{xext/files => xlibs/libxext}/autofoo.patch | 0 packages/{xext/xext_cvs.bb => xlibs/libxext_cvs.bb} | 3 ++- packages/{libxkbfile => xlibs/libxfixes}/.mtn2git_empty | 0 packages/{libxfixes/files => xlibs/libxfixes}/autofoo.patch | 0 packages/{libxfixes => xlibs}/libxfixes_2.0.1.bb | 2 +- packages/{libxfixes => xlibs}/libxfixes_cvs.bb | 2 +- packages/{libxp => xlibs/libxfont}/.mtn2git_empty | 0 packages/{xfont/files => xlibs/libxfont}/autofoo.patch | 0 packages/{xfont/files => xlibs/libxfont}/scalable.patch | 0 packages/{xfont/xfont_1.4.2.bb => xlibs/libxfont_1.4.2.bb} | 1 + packages/{xfont/xfont_cvs.bb => xlibs/libxfont_cvs.bb} | 1 + packages/{libxrandr => xlibs/libxft}/.mtn2git_empty | 0 packages/{libxft/files => xlibs/libxft}/autofoo.patch | 0 packages/{libxft => xlibs}/libxft_2.1.6.bb | 2 +- packages/{libxft => xlibs}/libxft_cvs.bb | 2 +- packages/{libxrandr/files => xlibs/libxi}/.mtn2git_empty | 0 packages/{libxi/files => xlibs/libxi}/autofoo.patch | 0 packages/{libxi => xlibs}/libxi_6.0.1.bb | 2 +- packages/{libxi => xlibs}/libxi_cvs.bb | 2 +- .../libxinerama_1.0.2+cvs20050505.bb} | 3 ++- .../xinerama_1.0.2.bb => xlibs/libxinerama_1.0.2.bb} | 3 ++- .../{xinerama/xinerama_cvs.bb => xlibs/libxinerama_cvs.bb} | 3 ++- packages/{libxkbfile => xlibs}/libxkbfile_cvs.bb | 2 +- packages/{xmu/xmu_cvs.bb => xlibs/libxmu_cvs.bb} | 3 ++- packages/{libxp => xlibs}/libxp_cvs.bb | 2 +- .../libxrandr-1.0.2 => xlibs/libxpm}/.mtn2git_empty | 0 packages/{xpm/files => xlibs/libxpm}/autofoo.patch | 0 packages/{xpm/xpm_3.5.1.bb => xlibs/libxpm_3.5.1.bb} | 3 ++- packages/{xpm/xpm_cvs.bb => xlibs/libxpm_cvs.bb} | 3 ++- .../{libxrender => xlibs/libxrandr-1.0.2}/.mtn2git_empty | 0 packages/{libxrandr => xlibs}/libxrandr-1.0.2/autofoo.patch | 0 .../{libxrender/files => xlibs/libxrandr}/.mtn2git_empty | 0 packages/{libxrandr/files => xlibs/libxrandr}/autofoo.patch | 0 packages/{libxrandr => xlibs}/libxrandr_1.0.2.bb | 2 +- packages/{libxrandr => xlibs}/libxrandr_cvs.bb | 2 +- packages/{libxss => xlibs/libxrender}/.mtn2git_empty | 0 .../{libxrender/files => xlibs/libxrender}/autofoo.patch | 0 packages/{libxrender => xlibs}/libxrender_0.8.4.bb | 2 +- packages/{libxrender => xlibs}/libxrender_cvs.bb | 2 +- packages/{xres/xres_1.0.1.bb => xlibs/libxres_1.0.1.bb} | 3 ++- packages/{xres/xres_cvs.bb => xlibs/libxres_cvs.bb} | 3 ++- packages/{libxss => xlibs}/libxss_cvs.bb | 2 +- packages/{libxv => xlibs/libxt}/.mtn2git_empty | 0 packages/{xt/files => xlibs/libxt}/autofoo.patch | 0 packages/{xt/xt_0.1.5.bb => xlibs/libxt_0.1.5.bb} | 3 ++- packages/{xt/xt_cvs.bb => xlibs/libxt_cvs.bb} | 4 ++-- packages/{xtst/xtst_cvs.bb => xlibs/libxtst_cvs.bb} | 3 ++- packages/{libxv => xlibs}/libxv_2.2.2+cvs20040918.bb | 2 +- packages/{libxv => xlibs}/libxv_2.2.2.bb | 2 +- packages/{ => xlibs}/libxvmc/.mtn2git_empty | 0 packages/{libxvmc/files => xlibs/libxvmc}/drm.patch | 0 packages/{libxvmc/files => xlibs/libxvmc}/true.patch | 0 packages/{libxvmc/files => xlibs/libxvmc}/via.patch | 0 packages/{libxvmc => xlibs}/libxvmc_20040919.bb | 2 +- packages/{libxvmc => xlibs}/libxvmc_20041025.bb | 2 +- packages/{libxvmc => xlibs}/libxvmc_20050612.bb | 2 +- packages/{libxxf86dga => xlibs}/libxxf86dga_cvs.bb | 2 +- packages/{libxxf86vm => xlibs}/libxxf86vm_cvs.bb | 2 +- packages/{xtrans => xlibs}/xtrans-native_0.1.bb | 0 packages/{xtrans => xlibs}/xtrans_0.1.bb | 0 packages/{xtrans => xlibs}/xtrans_cvs.bb | 0 packages/xmu/.mtn2git_empty | 0 packages/xpm/.mtn2git_empty | 0 packages/xpm/files/.mtn2git_empty | 0 packages/xres/.mtn2git_empty | 0 packages/xt/.mtn2git_empty | 0 packages/xt/files/.mtn2git_empty | 0 packages/xtrans/.mtn2git_empty | 0 packages/xtst/.mtn2git_empty | 0 147 files changed, 81 insertions(+), 58 deletions(-) delete mode 100644 packages/libxvmc/files/.mtn2git_empty delete mode 100644 packages/libxxf86dga/.mtn2git_empty delete mode 100644 packages/libxxf86vm/.mtn2git_empty delete mode 100644 packages/x11/.mtn2git_empty delete mode 100644 packages/x11/files/.mtn2git_empty delete mode 100644 packages/xau/.mtn2git_empty delete mode 100644 packages/xau/files/.mtn2git_empty delete mode 100644 packages/xaw/.mtn2git_empty delete mode 100644 packages/xaw/files/.mtn2git_empty delete mode 100644 packages/xcomposite/.mtn2git_empty delete mode 100644 packages/xcomposite/xcomposite-1.0.1/.mtn2git_empty delete mode 100644 packages/xdamage/.mtn2git_empty delete mode 100644 packages/xdamage/xdamage-1.0.1/.mtn2git_empty delete mode 100644 packages/xdamage/xdamage/.mtn2git_empty delete mode 100644 packages/xdmcp/.mtn2git_empty delete mode 100644 packages/xdmcp/files/.mtn2git_empty delete mode 100644 packages/xext/.mtn2git_empty delete mode 100644 packages/xext/files/.mtn2git_empty delete mode 100644 packages/xfont/.mtn2git_empty delete mode 100644 packages/xfont/files/.mtn2git_empty delete mode 100644 packages/xinerama/.mtn2git_empty rename packages/{ice => xlibs}/.mtn2git_empty (100%) rename packages/{x11 => xlibs}/diet-x11_20050226.bb (85%) rename packages/{x11 => xlibs}/diet-x11_6.2.1.bb (89%) rename packages/{x11 => xlibs}/diet-x11_cvs.bb (88%) rename packages/{ice/files => xlibs/libice}/.mtn2git_empty (100%) rename packages/{ice/files => xlibs/libice}/autofoo.patch (100%) rename packages/{ice/ice_6.3.3.bb => xlibs/libice_6.3.3.bb} (90%) rename packages/{ice/ice_cvs.bb => xlibs/libice_cvs.bb} (80%) rename packages/{ => xlibs}/libsm/.mtn2git_empty (100%) rename packages/{libsm/files => xlibs/libsm}/autofoo.patch (100%) rename packages/{libsm => xlibs}/libsm_6.0.3.bb (92%) rename packages/{libsm => xlibs}/libsm_cvs.bb (91%) rename packages/{x11/x11-native_cvs.bb => xlibs/libx11-native_6.2.1.bb} (85%) rename packages/{x11/x11-native_6.2.1.bb => xlibs/libx11-native_cvs.bb} (86%) rename packages/{libsm/files => xlibs/libx11}/.mtn2git_empty (100%) rename packages/{x11/files => xlibs/libx11}/autofoo.patch (100%) rename packages/{x11/files => xlibs/libx11}/errordb-keysymdb-path-fix.patch (100%) rename packages/{x11/files => xlibs/libx11}/fix-utf8-wrong-define.patch (100%) rename packages/{x11/files => xlibs/libx11}/xim.patch (100%) rename packages/{x11/x11_20050226.bb => xlibs/libx11_20050226.bb} (69%) rename packages/{x11/x11_6.2.1.bb => xlibs/libx11_6.2.1.bb} (95%) rename packages/{x11/x11_cvs.bb => xlibs/libx11_cvs.bb} (95%) rename packages/{xau/xau-native_cvs.bb => xlibs/libxau-native_0.1.1.bb} (76%) rename packages/{xau/xau-native_0.1.1.bb => xlibs/libxau-native_cvs.bb} (77%) rename packages/{libxcursor => xlibs/libxau}/.mtn2git_empty (100%) rename packages/{xau/files => xlibs/libxau}/autofoo.patch (100%) rename packages/{xau/xau_0.1.1.bb => xlibs/libxau_0.1.1.bb} (95%) rename packages/{xau/xau_cvs.bb => xlibs/libxau_cvs.bb} (95%) rename packages/{libxcursor/files => xlibs/libxaw}/.mtn2git_empty (100%) rename packages/{xaw/files => xlibs/libxaw}/auxdir.patch (100%) rename packages/{xaw/xaw_7.0.2.bb => xlibs/libxaw_7.0.2.bb} (86%) rename packages/{xaw/xaw_cvs.bb => xlibs/libxaw_cvs.bb} (84%) rename packages/{libxcursor/libxcursor-1.1.2 => xlibs/libxcomposite-1.0.1}/.mtn2git_empty (100%) rename packages/{xcomposite/xcomposite-1.0.1 => xlibs/libxcomposite-1.0.1}/autofoo.patch (100%) rename packages/{xcomposite/xcomposite_1.0.1.bb => xlibs/libxcomposite_1.0.1.bb} (78%) rename packages/{xcomposite/xcomposite_cvs.bb => xlibs/libxcomposite_cvs.bb} (76%) rename packages/{libxfixes => xlibs/libxcursor-1.1.2}/.mtn2git_empty (100%) rename packages/{libxcursor => xlibs}/libxcursor-1.1.2/autofoo.patch (100%) rename packages/{libxfixes/files => xlibs/libxcursor}/.mtn2git_empty (100%) rename packages/{libxcursor/files => xlibs/libxcursor}/autofoo.patch (100%) rename packages/{libxcursor => xlibs}/libxcursor_1.1.2.bb (100%) rename packages/{libxcursor => xlibs}/libxcursor_cvs.bb (100%) rename packages/{libxft => xlibs/libxdamage-1.0.1}/.mtn2git_empty (100%) rename packages/{xdamage/xdamage-1.0.1 => xlibs/libxdamage-1.0.1}/autofoo.patch (100%) rename packages/{libxft/files => xlibs/libxdamage}/.mtn2git_empty (100%) rename packages/{xdamage/xdamage => xlibs/libxdamage}/m4.patch (100%) rename packages/{xdamage/xdamage_1.0.1.bb => xlibs/libxdamage_1.0.1.bb} (82%) rename packages/{xdamage/xdamage_cvs.bb => xlibs/libxdamage_cvs.bb} (80%) rename packages/{xdmcp => xlibs}/libxdmcp-native_0.1.1.bb (100%) rename packages/{xdmcp => xlibs}/libxdmcp-native_0.1.3.bb (100%) rename packages/{libxi => xlibs/libxdmcp}/.mtn2git_empty (100%) rename packages/{xdmcp/files => xlibs/libxdmcp}/autofoo.patch (100%) rename packages/{xdmcp => xlibs}/libxdmcp_0.1.1.bb (100%) rename packages/{xdmcp => xlibs}/libxdmcp_0.1.3.bb (100%) rename packages/{xdmcp => xlibs}/libxdmcp_cvs.bb (100%) rename packages/{xext/xext-native_cvs.bb => xlibs/libxext-native_cvs.bb} (75%) rename packages/{libxi/files => xlibs/libxext}/.mtn2git_empty (100%) rename packages/{xext/files => xlibs/libxext}/autofoo.patch (100%) rename packages/{xext/xext_cvs.bb => xlibs/libxext_cvs.bb} (83%) rename packages/{libxkbfile => xlibs/libxfixes}/.mtn2git_empty (100%) rename packages/{libxfixes/files => xlibs/libxfixes}/autofoo.patch (100%) rename packages/{libxfixes => xlibs}/libxfixes_2.0.1.bb (90%) rename packages/{libxfixes => xlibs}/libxfixes_cvs.bb (89%) rename packages/{libxp => xlibs/libxfont}/.mtn2git_empty (100%) rename packages/{xfont/files => xlibs/libxfont}/autofoo.patch (100%) rename packages/{xfont/files => xlibs/libxfont}/scalable.patch (100%) rename packages/{xfont/xfont_1.4.2.bb => xlibs/libxfont_1.4.2.bb} (95%) rename packages/{xfont/xfont_cvs.bb => xlibs/libxfont_cvs.bb} (95%) rename packages/{libxrandr => xlibs/libxft}/.mtn2git_empty (100%) rename packages/{libxft/files => xlibs/libxft}/autofoo.patch (100%) rename packages/{libxft => xlibs}/libxft_2.1.6.bb (92%) rename packages/{libxft => xlibs}/libxft_cvs.bb (91%) rename packages/{libxrandr/files => xlibs/libxi}/.mtn2git_empty (100%) rename packages/{libxi/files => xlibs/libxi}/autofoo.patch (100%) rename packages/{libxi => xlibs}/libxi_6.0.1.bb (87%) rename packages/{libxi => xlibs}/libxi_cvs.bb (88%) rename packages/{xinerama/xinerama_1.0.2+cvs20050505.bb => xlibs/libxinerama_1.0.2+cvs20050505.bb} (81%) rename packages/{xinerama/xinerama_1.0.2.bb => xlibs/libxinerama_1.0.2.bb} (81%) rename packages/{xinerama/xinerama_cvs.bb => xlibs/libxinerama_cvs.bb} (79%) rename packages/{libxkbfile => xlibs}/libxkbfile_cvs.bb (93%) rename packages/{xmu/xmu_cvs.bb => xlibs/libxmu_cvs.bb} (88%) rename packages/{libxp => xlibs}/libxp_cvs.bb (92%) rename packages/{libxrandr/libxrandr-1.0.2 => xlibs/libxpm}/.mtn2git_empty (100%) rename packages/{xpm/files => xlibs/libxpm}/autofoo.patch (100%) rename packages/{xpm/xpm_3.5.1.bb => xlibs/libxpm_3.5.1.bb} (90%) rename packages/{xpm/xpm_cvs.bb => xlibs/libxpm_cvs.bb} (90%) rename packages/{libxrender => xlibs/libxrandr-1.0.2}/.mtn2git_empty (100%) rename packages/{libxrandr => xlibs}/libxrandr-1.0.2/autofoo.patch (100%) rename packages/{libxrender/files => xlibs/libxrandr}/.mtn2git_empty (100%) rename packages/{libxrandr/files => xlibs/libxrandr}/autofoo.patch (100%) rename packages/{libxrandr => xlibs}/libxrandr_1.0.2.bb (86%) rename packages/{libxrandr => xlibs}/libxrandr_cvs.bb (85%) rename packages/{libxss => xlibs/libxrender}/.mtn2git_empty (100%) rename packages/{libxrender/files => xlibs/libxrender}/autofoo.patch (100%) rename packages/{libxrender => xlibs}/libxrender_0.8.4.bb (90%) rename packages/{libxrender => xlibs}/libxrender_cvs.bb (89%) rename packages/{xres/xres_1.0.1.bb => xlibs/libxres_1.0.1.bb} (79%) rename packages/{xres/xres_cvs.bb => xlibs/libxres_cvs.bb} (80%) rename packages/{libxss => xlibs}/libxss_cvs.bb (92%) rename packages/{libxv => xlibs/libxt}/.mtn2git_empty (100%) rename packages/{xt/files => xlibs/libxt}/autofoo.patch (100%) rename packages/{xt/xt_0.1.5.bb => xlibs/libxt_0.1.5.bb} (93%) rename packages/{xt/xt_cvs.bb => xlibs/libxt_cvs.bb} (86%) rename packages/{xtst/xtst_cvs.bb => xlibs/libxtst_cvs.bb} (83%) rename packages/{libxv => xlibs}/libxv_2.2.2+cvs20040918.bb (90%) rename packages/{libxv => xlibs}/libxv_2.2.2.bb (89%) rename packages/{ => xlibs}/libxvmc/.mtn2git_empty (100%) rename packages/{libxvmc/files => xlibs/libxvmc}/drm.patch (100%) rename packages/{libxvmc/files => xlibs/libxvmc}/true.patch (100%) rename packages/{libxvmc/files => xlibs/libxvmc}/via.patch (100%) rename packages/{libxvmc => xlibs}/libxvmc_20040919.bb (95%) rename packages/{libxvmc => xlibs}/libxvmc_20041025.bb (94%) rename packages/{libxvmc => xlibs}/libxvmc_20050612.bb (95%) rename packages/{libxxf86dga => xlibs}/libxxf86dga_cvs.bb (88%) rename packages/{libxxf86vm => xlibs}/libxxf86vm_cvs.bb (86%) rename packages/{xtrans => xlibs}/xtrans-native_0.1.bb (100%) rename packages/{xtrans => xlibs}/xtrans_0.1.bb (100%) rename packages/{xtrans => xlibs}/xtrans_cvs.bb (100%) delete mode 100644 packages/xmu/.mtn2git_empty delete mode 100644 packages/xpm/.mtn2git_empty delete mode 100644 packages/xpm/files/.mtn2git_empty delete mode 100644 packages/xres/.mtn2git_empty delete mode 100644 packages/xt/.mtn2git_empty delete mode 100644 packages/xt/files/.mtn2git_empty delete mode 100644 packages/xtrans/.mtn2git_empty delete mode 100644 packages/xtst/.mtn2git_empty diff --git a/packages/libxvmc/files/.mtn2git_empty b/packages/libxvmc/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/libxxf86dga/.mtn2git_empty b/packages/libxxf86dga/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/libxxf86vm/.mtn2git_empty b/packages/libxxf86vm/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/x11/.mtn2git_empty b/packages/x11/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/x11/files/.mtn2git_empty b/packages/x11/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xau/.mtn2git_empty b/packages/xau/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xau/files/.mtn2git_empty b/packages/xau/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xaw/.mtn2git_empty b/packages/xaw/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xaw/files/.mtn2git_empty b/packages/xaw/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xcomposite/.mtn2git_empty b/packages/xcomposite/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xcomposite/xcomposite-1.0.1/.mtn2git_empty b/packages/xcomposite/xcomposite-1.0.1/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xdamage/.mtn2git_empty b/packages/xdamage/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xdamage/xdamage-1.0.1/.mtn2git_empty b/packages/xdamage/xdamage-1.0.1/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xdamage/xdamage/.mtn2git_empty b/packages/xdamage/xdamage/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xdmcp/.mtn2git_empty b/packages/xdmcp/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xdmcp/files/.mtn2git_empty b/packages/xdmcp/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xext/.mtn2git_empty b/packages/xext/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xext/files/.mtn2git_empty b/packages/xext/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xfont/.mtn2git_empty b/packages/xfont/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xfont/files/.mtn2git_empty b/packages/xfont/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xinerama/.mtn2git_empty b/packages/xinerama/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/ice/.mtn2git_empty b/packages/xlibs/.mtn2git_empty similarity index 100% rename from packages/ice/.mtn2git_empty rename to packages/xlibs/.mtn2git_empty diff --git a/packages/x11/diet-x11_20050226.bb b/packages/xlibs/diet-x11_20050226.bb similarity index 85% rename from packages/x11/diet-x11_20050226.bb rename to packages/xlibs/diet-x11_20050226.bb index acb6fc330b..cab8c5d570 100644 --- a/packages/x11/diet-x11_20050226.bb +++ b/packages/xlibs/diet-x11_20050226.bb @@ -1,5 +1,5 @@ SECTION = "x11/base" -include x11_${PV}.bb +include libx11_${PV}.bb EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb" diff --git a/packages/x11/diet-x11_6.2.1.bb b/packages/xlibs/diet-x11_6.2.1.bb similarity index 89% rename from packages/x11/diet-x11_6.2.1.bb rename to packages/xlibs/diet-x11_6.2.1.bb index b63bfa041a..643e658412 100644 --- a/packages/x11/diet-x11_6.2.1.bb +++ b/packages/xlibs/diet-x11_6.2.1.bb @@ -1,5 +1,5 @@ SECTION = "x11/base" -include x11_${PV}.bb +include libx11_${PV}.bb EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb" CFLAGS += "-D_GNU_SOURCE" diff --git a/packages/x11/diet-x11_cvs.bb b/packages/xlibs/diet-x11_cvs.bb similarity index 88% rename from packages/x11/diet-x11_cvs.bb rename to packages/xlibs/diet-x11_cvs.bb index 0adf717f17..eea73f0964 100644 --- a/packages/x11/diet-x11_cvs.bb +++ b/packages/xlibs/diet-x11_cvs.bb @@ -1,5 +1,5 @@ SECTION = "x11/base" -include x11_cvs.bb +include libx11_cvs.bb EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb" diff --git a/packages/ice/files/.mtn2git_empty b/packages/xlibs/libice/.mtn2git_empty similarity index 100% rename from packages/ice/files/.mtn2git_empty rename to packages/xlibs/libice/.mtn2git_empty diff --git a/packages/ice/files/autofoo.patch b/packages/xlibs/libice/autofoo.patch similarity index 100% rename from packages/ice/files/autofoo.patch rename to packages/xlibs/libice/autofoo.patch diff --git a/packages/ice/ice_6.3.3.bb b/packages/xlibs/libice_6.3.3.bb similarity index 90% rename from packages/ice/ice_6.3.3.bb rename to packages/xlibs/libice_6.3.3.bb index 7722bc4ae5..1311145334 100644 --- a/packages/ice/ice_6.3.3.bb +++ b/packages/xlibs/libice_6.3.3.bb @@ -2,7 +2,8 @@ SECTION = "libs" LICENSE= "MIT" PRIORITY = "optional" MAINTAINER = "Phil Blundell " -DEPENDS = "x11" +DEPENDS = "libx11" +PROVIDES = "ice" DESCRIPTION = "X11 ICE library" PR = "r1" diff --git a/packages/ice/ice_cvs.bb b/packages/xlibs/libice_cvs.bb similarity index 80% rename from packages/ice/ice_cvs.bb rename to packages/xlibs/libice_cvs.bb index fa49ee76b9..90c98d594a 100644 --- a/packages/ice/ice_cvs.bb +++ b/packages/xlibs/libice_cvs.bb @@ -2,8 +2,8 @@ PV = "0.0+cvs${SRCDATE}" LICENSE= "MIT" SECTION = "libs" PRIORITY = "optional" -MAINTAINER = "Phil Blundell " -DEPENDS = "x11" +DEPENDS = "libx11" +PROVIDES = "ice" DESCRIPTION = "X11 ICE library" PR = "r1" diff --git a/packages/libsm/.mtn2git_empty b/packages/xlibs/libsm/.mtn2git_empty similarity index 100% rename from packages/libsm/.mtn2git_empty rename to packages/xlibs/libsm/.mtn2git_empty diff --git a/packages/libsm/files/autofoo.patch b/packages/xlibs/libsm/autofoo.patch similarity index 100% rename from packages/libsm/files/autofoo.patch rename to packages/xlibs/libsm/autofoo.patch diff --git a/packages/libsm/libsm_6.0.3.bb b/packages/xlibs/libsm_6.0.3.bb similarity index 92% rename from packages/libsm/libsm_6.0.3.bb rename to packages/xlibs/libsm_6.0.3.bb index 2d78d3decb..08f9597045 100644 --- a/packages/libsm/libsm_6.0.3.bb +++ b/packages/xlibs/libsm_6.0.3.bb @@ -2,7 +2,7 @@ SECTION = "libs" LICENSE = "MIT-X" PRIORITY = "optional" MAINTAINER = "Phil Blundell " -DEPENDS = "x11 ice" +DEPENDS = "libx11 libice" DESCRIPTION = "Session management library" PR = "r1" diff --git a/packages/libsm/libsm_cvs.bb b/packages/xlibs/libsm_cvs.bb similarity index 91% rename from packages/libsm/libsm_cvs.bb rename to packages/xlibs/libsm_cvs.bb index 0c121f72d0..22b316cf57 100644 --- a/packages/libsm/libsm_cvs.bb +++ b/packages/xlibs/libsm_cvs.bb @@ -2,7 +2,7 @@ PV = "6.0.3+cvs${SRCDATE}" LICENSE = "MIT-X" SECTION = "libs" PRIORITY = "optional" -DEPENDS = "x11 ice" +DEPENDS = "libx11 libice" DESCRIPTION = "Session management library" PR = "r1" diff --git a/packages/x11/x11-native_cvs.bb b/packages/xlibs/libx11-native_6.2.1.bb similarity index 85% rename from packages/x11/x11-native_cvs.bb rename to packages/xlibs/libx11-native_6.2.1.bb index 30a31ebf9b..b1fd2aa0db 100644 --- a/packages/x11/x11-native_cvs.bb +++ b/packages/xlibs/libx11-native_6.2.1.bb @@ -1,5 +1,5 @@ SECTION = "x11/base" -include x11_cvs.bb +include libx11_${PV}.bb inherit native DEPENDS = "xproto-native xextensions-native xau-native xtrans-native libxdmcp-native" PROVIDES = "" diff --git a/packages/x11/x11-native_6.2.1.bb b/packages/xlibs/libx11-native_cvs.bb similarity index 86% rename from packages/x11/x11-native_6.2.1.bb rename to packages/xlibs/libx11-native_cvs.bb index cb44531b87..161c070899 100644 --- a/packages/x11/x11-native_6.2.1.bb +++ b/packages/xlibs/libx11-native_cvs.bb @@ -1,5 +1,5 @@ SECTION = "x11/base" -include x11_${PV}.bb +include libx11_cvs.bb inherit native DEPENDS = "xproto-native xextensions-native xau-native xtrans-native libxdmcp-native" PROVIDES = "" diff --git a/packages/libsm/files/.mtn2git_empty b/packages/xlibs/libx11/.mtn2git_empty similarity index 100% rename from packages/libsm/files/.mtn2git_empty rename to packages/xlibs/libx11/.mtn2git_empty diff --git a/packages/x11/files/autofoo.patch b/packages/xlibs/libx11/autofoo.patch similarity index 100% rename from packages/x11/files/autofoo.patch rename to packages/xlibs/libx11/autofoo.patch diff --git a/packages/x11/files/errordb-keysymdb-path-fix.patch b/packages/xlibs/libx11/errordb-keysymdb-path-fix.patch similarity index 100% rename from packages/x11/files/errordb-keysymdb-path-fix.patch rename to packages/xlibs/libx11/errordb-keysymdb-path-fix.patch diff --git a/packages/x11/files/fix-utf8-wrong-define.patch b/packages/xlibs/libx11/fix-utf8-wrong-define.patch similarity index 100% rename from packages/x11/files/fix-utf8-wrong-define.patch rename to packages/xlibs/libx11/fix-utf8-wrong-define.patch diff --git a/packages/x11/files/xim.patch b/packages/xlibs/libx11/xim.patch similarity index 100% rename from packages/x11/files/xim.patch rename to packages/xlibs/libx11/xim.patch diff --git a/packages/x11/x11_20050226.bb b/packages/xlibs/libx11_20050226.bb similarity index 69% rename from packages/x11/x11_20050226.bb rename to packages/xlibs/libx11_20050226.bb index b8206c29df..0bc30a42cc 100644 --- a/packages/x11/x11_20050226.bb +++ b/packages/xlibs/libx11_20050226.bb @@ -1,6 +1,6 @@ SRCDATE = "20050226" -include x11_cvs.bb +include libx11_cvs.bb DEFAULT_PREFERENCE = "0" diff --git a/packages/x11/x11_6.2.1.bb b/packages/xlibs/libx11_6.2.1.bb similarity index 95% rename from packages/x11/x11_6.2.1.bb rename to packages/xlibs/libx11_6.2.1.bb index b1de21c383..0cb75ac0b0 100644 --- a/packages/x11/x11_6.2.1.bb +++ b/packages/xlibs/libx11_6.2.1.bb @@ -2,11 +2,12 @@ SECTION = "x11/libs" LICENSE = "XFree86" PRIORITY = "optional" MAINTAINER = "Greg Gilbert " -DEPENDS = "xproto xextensions xau xtrans xdmcp" +DEPENDS = "xproto xextensions libxau xtrans xdmcp" +PROVIDES = "x11" DESCRIPTION = "Base X libs." FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" FILES_${PN}-locale += "${datadir}/X11/locale" -PROVIDES = "x11" +PROVIDES = "libx11" PR = "r4" SRC_URI = "${XLIBS_MIRROR}/libX11-${PV}.tar.bz2 \ diff --git a/packages/x11/x11_cvs.bb b/packages/xlibs/libx11_cvs.bb similarity index 95% rename from packages/x11/x11_cvs.bb rename to packages/xlibs/libx11_cvs.bb index 5cc568de58..a8d07811d5 100644 --- a/packages/x11/x11_cvs.bb +++ b/packages/xlibs/libx11_cvs.bb @@ -4,11 +4,12 @@ PR = "r6" SECTION = "x11/libs" PRIORITY = "optional" MAINTAINER = "Greg Gilbert " -DEPENDS = "xproto xextensions xau xtrans xdmcp" +DEPENDS = "xproto xextensions libxau xtrans xdmcp" +PROVIDES = "x11" DESCRIPTION = "Base X libs." FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" FILES_${PN}-locale += "${datadir}/X11/locale" -PROVIDES = "x11" +PROVIDES = "libx11" SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=X11 \ file://errordb-keysymdb-path-fix.patch;patch=1" diff --git a/packages/xau/xau-native_cvs.bb b/packages/xlibs/libxau-native_0.1.1.bb similarity index 76% rename from packages/xau/xau-native_cvs.bb rename to packages/xlibs/libxau-native_0.1.1.bb index 8c8bbb4dd1..3897fa6afe 100644 --- a/packages/xau/xau-native_cvs.bb +++ b/packages/xlibs/libxau-native_0.1.1.bb @@ -1,5 +1,5 @@ SECTION = "x11/base" -include xau_cvs.bb +include libxau_${PV}.bb inherit native DEPENDS = "xproto-native" PROVIDES = "" diff --git a/packages/xau/xau-native_0.1.1.bb b/packages/xlibs/libxau-native_cvs.bb similarity index 77% rename from packages/xau/xau-native_0.1.1.bb rename to packages/xlibs/libxau-native_cvs.bb index 251749dc45..eee93dd44c 100644 --- a/packages/xau/xau-native_0.1.1.bb +++ b/packages/xlibs/libxau-native_cvs.bb @@ -1,5 +1,5 @@ SECTION = "x11/base" -include xau_${PV}.bb +include libxau_cvs.bb inherit native DEPENDS = "xproto-native" PROVIDES = "" diff --git a/packages/libxcursor/.mtn2git_empty b/packages/xlibs/libxau/.mtn2git_empty similarity index 100% rename from packages/libxcursor/.mtn2git_empty rename to packages/xlibs/libxau/.mtn2git_empty diff --git a/packages/xau/files/autofoo.patch b/packages/xlibs/libxau/autofoo.patch similarity index 100% rename from packages/xau/files/autofoo.patch rename to packages/xlibs/libxau/autofoo.patch diff --git a/packages/xau/xau_0.1.1.bb b/packages/xlibs/libxau_0.1.1.bb similarity index 95% rename from packages/xau/xau_0.1.1.bb rename to packages/xlibs/libxau_0.1.1.bb index 3c8b4a030b..dc1a28171b 100644 --- a/packages/xau/xau_0.1.1.bb +++ b/packages/xlibs/libxau_0.1.1.bb @@ -3,6 +3,7 @@ LICENSE= "MIT" PRIORITY = "optional" MAINTAINER = "Greg Gilbert " DEPENDS = "xproto" +PROVIDES = "xau" DESCRIPTION = "Authorization Protocol for X." PR = "r1" diff --git a/packages/xau/xau_cvs.bb b/packages/xlibs/libxau_cvs.bb similarity index 95% rename from packages/xau/xau_cvs.bb rename to packages/xlibs/libxau_cvs.bb index a0e2bd312f..518744816d 100644 --- a/packages/xau/xau_cvs.bb +++ b/packages/xlibs/libxau_cvs.bb @@ -5,6 +5,7 @@ SECTION = "x11/libs" PRIORITY = "optional" MAINTAINER = "Greg Gilbert " DEPENDS = "xproto" +PROVIDES = "xau" DESCRIPTION = "Authorization Protocol for X." SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xau" diff --git a/packages/libxcursor/files/.mtn2git_empty b/packages/xlibs/libxaw/.mtn2git_empty similarity index 100% rename from packages/libxcursor/files/.mtn2git_empty rename to packages/xlibs/libxaw/.mtn2git_empty diff --git a/packages/xaw/files/auxdir.patch b/packages/xlibs/libxaw/auxdir.patch similarity index 100% rename from packages/xaw/files/auxdir.patch rename to packages/xlibs/libxaw/auxdir.patch diff --git a/packages/xaw/xaw_7.0.2.bb b/packages/xlibs/libxaw_7.0.2.bb similarity index 86% rename from packages/xaw/xaw_7.0.2.bb rename to packages/xlibs/libxaw_7.0.2.bb index d75cefbdbb..929b54a127 100644 --- a/packages/xaw/xaw_7.0.2.bb +++ b/packages/xlibs/libxaw_7.0.2.bb @@ -2,7 +2,8 @@ SECTION = "x11/libs" LICENSE = "MIT" PRIORITY = "optional" MAINTAINER = "Phil Blundell " -DEPENDS = "xproto x11 xt xmu xpm" +DEPENDS = "xproto libx11 libxt libxmu libxpm" +PROVIDES = "xaw" DESCRIPTION = "X Athena Widgets library" SRC_URI = "${XLIBS_MIRROR}/libXaw-${PV}.tar.bz2 \ diff --git a/packages/xaw/xaw_cvs.bb b/packages/xlibs/libxaw_cvs.bb similarity index 84% rename from packages/xaw/xaw_cvs.bb rename to packages/xlibs/libxaw_cvs.bb index 71d4f915ee..7860f6e6b1 100644 --- a/packages/xaw/xaw_cvs.bb +++ b/packages/xlibs/libxaw_cvs.bb @@ -2,8 +2,8 @@ PV = "0.0+cvs${SRCDATE}" LICENSE = "MIT" SECTION = "x11/libs" PRIORITY = "optional" -MAINTAINER = "Phil Blundell " -DEPENDS = "xproto x11 xt xmu xpm" +DEPENDS = "xproto libx11 libxt libxmu libxpm" +PROVIDES = "xaw" DESCRIPTION = "X Athena Widgets library" SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xaw" diff --git a/packages/libxcursor/libxcursor-1.1.2/.mtn2git_empty b/packages/xlibs/libxcomposite-1.0.1/.mtn2git_empty similarity index 100% rename from packages/libxcursor/libxcursor-1.1.2/.mtn2git_empty rename to packages/xlibs/libxcomposite-1.0.1/.mtn2git_empty diff --git a/packages/xcomposite/xcomposite-1.0.1/autofoo.patch b/packages/xlibs/libxcomposite-1.0.1/autofoo.patch similarity index 100% rename from packages/xcomposite/xcomposite-1.0.1/autofoo.patch rename to packages/xlibs/libxcomposite-1.0.1/autofoo.patch diff --git a/packages/xcomposite/xcomposite_1.0.1.bb b/packages/xlibs/libxcomposite_1.0.1.bb similarity index 78% rename from packages/xcomposite/xcomposite_1.0.1.bb rename to packages/xlibs/libxcomposite_1.0.1.bb index d31ec4dad7..e2ca3bbc7b 100644 --- a/packages/xcomposite/xcomposite_1.0.1.bb +++ b/packages/xlibs/libxcomposite_1.0.1.bb @@ -1,6 +1,7 @@ SECTION = "x11/libs" LICENSE= "BSD-X" -DEPENDS = "x11 compositeext xextensions libxfixes" +DEPENDS = "libx11 compositeext xextensions libxfixes" +PROVIDES = "xcomposite" DESCRIPTION = "X Composite extension library." PR = "r1" diff --git a/packages/xcomposite/xcomposite_cvs.bb b/packages/xlibs/libxcomposite_cvs.bb similarity index 76% rename from packages/xcomposite/xcomposite_cvs.bb rename to packages/xlibs/libxcomposite_cvs.bb index c2ec718cd6..1d8b69c8c6 100644 --- a/packages/xcomposite/xcomposite_cvs.bb +++ b/packages/xlibs/libxcomposite_cvs.bb @@ -1,7 +1,8 @@ PV = "0.0+cvs${SRCDATE}" LICENSE= "BSD-X" SECTION = "x11/libs" -DEPENDS = "x11 compositeext xextensions libxfixes" +DEPENDS = "libx11 compositeext xextensions libxfixes" +PROVIDES = "xcomposite" DESCRIPTION = "X Composite extension library." SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xcomposite" diff --git a/packages/libxfixes/.mtn2git_empty b/packages/xlibs/libxcursor-1.1.2/.mtn2git_empty similarity index 100% rename from packages/libxfixes/.mtn2git_empty rename to packages/xlibs/libxcursor-1.1.2/.mtn2git_empty diff --git a/packages/libxcursor/libxcursor-1.1.2/autofoo.patch b/packages/xlibs/libxcursor-1.1.2/autofoo.patch similarity index 100% rename from packages/libxcursor/libxcursor-1.1.2/autofoo.patch rename to packages/xlibs/libxcursor-1.1.2/autofoo.patch diff --git a/packages/libxfixes/files/.mtn2git_empty b/packages/xlibs/libxcursor/.mtn2git_empty similarity index 100% rename from packages/libxfixes/files/.mtn2git_empty rename to packages/xlibs/libxcursor/.mtn2git_empty diff --git a/packages/libxcursor/files/autofoo.patch b/packages/xlibs/libxcursor/autofoo.patch similarity index 100% rename from packages/libxcursor/files/autofoo.patch rename to packages/xlibs/libxcursor/autofoo.patch diff --git a/packages/libxcursor/libxcursor_1.1.2.bb b/packages/xlibs/libxcursor_1.1.2.bb similarity index 100% rename from packages/libxcursor/libxcursor_1.1.2.bb rename to packages/xlibs/libxcursor_1.1.2.bb diff --git a/packages/libxcursor/libxcursor_cvs.bb b/packages/xlibs/libxcursor_cvs.bb similarity index 100% rename from packages/libxcursor/libxcursor_cvs.bb rename to packages/xlibs/libxcursor_cvs.bb diff --git a/packages/libxft/.mtn2git_empty b/packages/xlibs/libxdamage-1.0.1/.mtn2git_empty similarity index 100% rename from packages/libxft/.mtn2git_empty rename to packages/xlibs/libxdamage-1.0.1/.mtn2git_empty diff --git a/packages/xdamage/xdamage-1.0.1/autofoo.patch b/packages/xlibs/libxdamage-1.0.1/autofoo.patch similarity index 100% rename from packages/xdamage/xdamage-1.0.1/autofoo.patch rename to packages/xlibs/libxdamage-1.0.1/autofoo.patch diff --git a/packages/libxft/files/.mtn2git_empty b/packages/xlibs/libxdamage/.mtn2git_empty similarity index 100% rename from packages/libxft/files/.mtn2git_empty rename to packages/xlibs/libxdamage/.mtn2git_empty diff --git a/packages/xdamage/xdamage/m4.patch b/packages/xlibs/libxdamage/m4.patch similarity index 100% rename from packages/xdamage/xdamage/m4.patch rename to packages/xlibs/libxdamage/m4.patch diff --git a/packages/xdamage/xdamage_1.0.1.bb b/packages/xlibs/libxdamage_1.0.1.bb similarity index 82% rename from packages/xdamage/xdamage_1.0.1.bb rename to packages/xlibs/libxdamage_1.0.1.bb index 5b6c301374..040e863447 100644 --- a/packages/xdamage/xdamage_1.0.1.bb +++ b/packages/xlibs/libxdamage_1.0.1.bb @@ -1,6 +1,7 @@ SECTION = "x11/libs" LICENSE= "BSD-X" -DEPENDS = "x11 damageext libxfixes xproto" +DEPENDS = "libx11 damageext libxfixes xproto" +PROVIDES = "xdamage" DESCRIPTION = "X Damage extension library." PR = "r1" diff --git a/packages/xdamage/xdamage_cvs.bb b/packages/xlibs/libxdamage_cvs.bb similarity index 80% rename from packages/xdamage/xdamage_cvs.bb rename to packages/xlibs/libxdamage_cvs.bb index d7d9e33f8d..ba8a68033a 100644 --- a/packages/xdamage/xdamage_cvs.bb +++ b/packages/xlibs/libxdamage_cvs.bb @@ -1,7 +1,8 @@ PV = "0.0+cvs${SRCDATE}" LICENSE= "BSD-X" SECTION = "x11/libs" -DEPENDS = "x11 damageext libxfixes xproto" +DEPENDS = "libx11 damageext libxfixes xproto" +PROVIDES = "xdamage" DESCRIPTION = "X Damage extension library." SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xdamage \ diff --git a/packages/xdmcp/libxdmcp-native_0.1.1.bb b/packages/xlibs/libxdmcp-native_0.1.1.bb similarity index 100% rename from packages/xdmcp/libxdmcp-native_0.1.1.bb rename to packages/xlibs/libxdmcp-native_0.1.1.bb diff --git a/packages/xdmcp/libxdmcp-native_0.1.3.bb b/packages/xlibs/libxdmcp-native_0.1.3.bb similarity index 100% rename from packages/xdmcp/libxdmcp-native_0.1.3.bb rename to packages/xlibs/libxdmcp-native_0.1.3.bb diff --git a/packages/libxi/.mtn2git_empty b/packages/xlibs/libxdmcp/.mtn2git_empty similarity index 100% rename from packages/libxi/.mtn2git_empty rename to packages/xlibs/libxdmcp/.mtn2git_empty diff --git a/packages/xdmcp/files/autofoo.patch b/packages/xlibs/libxdmcp/autofoo.patch similarity index 100% rename from packages/xdmcp/files/autofoo.patch rename to packages/xlibs/libxdmcp/autofoo.patch diff --git a/packages/xdmcp/libxdmcp_0.1.1.bb b/packages/xlibs/libxdmcp_0.1.1.bb similarity index 100% rename from packages/xdmcp/libxdmcp_0.1.1.bb rename to packages/xlibs/libxdmcp_0.1.1.bb diff --git a/packages/xdmcp/libxdmcp_0.1.3.bb b/packages/xlibs/libxdmcp_0.1.3.bb similarity index 100% rename from packages/xdmcp/libxdmcp_0.1.3.bb rename to packages/xlibs/libxdmcp_0.1.3.bb diff --git a/packages/xdmcp/libxdmcp_cvs.bb b/packages/xlibs/libxdmcp_cvs.bb similarity index 100% rename from packages/xdmcp/libxdmcp_cvs.bb rename to packages/xlibs/libxdmcp_cvs.bb diff --git a/packages/xext/xext-native_cvs.bb b/packages/xlibs/libxext-native_cvs.bb similarity index 75% rename from packages/xext/xext-native_cvs.bb rename to packages/xlibs/libxext-native_cvs.bb index 6be231f154..dfc439a9f6 100644 --- a/packages/xext/xext-native_cvs.bb +++ b/packages/xlibs/libxext-native_cvs.bb @@ -1,4 +1,4 @@ SECTION = "unknown" -include xext_${PV}.bb +include libxext_${PV}.bb inherit native DEPENDS = "x11-native xextensions-native" diff --git a/packages/libxi/files/.mtn2git_empty b/packages/xlibs/libxext/.mtn2git_empty similarity index 100% rename from packages/libxi/files/.mtn2git_empty rename to packages/xlibs/libxext/.mtn2git_empty diff --git a/packages/xext/files/autofoo.patch b/packages/xlibs/libxext/autofoo.patch similarity index 100% rename from packages/xext/files/autofoo.patch rename to packages/xlibs/libxext/autofoo.patch diff --git a/packages/xext/xext_cvs.bb b/packages/xlibs/libxext_cvs.bb similarity index 83% rename from packages/xext/xext_cvs.bb rename to packages/xlibs/libxext_cvs.bb index 4ea5061264..0ef675ca70 100644 --- a/packages/xext/xext_cvs.bb +++ b/packages/xlibs/libxext_cvs.bb @@ -4,7 +4,8 @@ LICENSE= "MIT" DESCRIPTION = "X Server Extension library" SECTION = "x11/libs" PRIORITY = "optional" -DEPENDS = "xproto x11 xextensions" +DEPENDS = "xproto libx11 xextensions" +PROVIDES = "xext" SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xext" S = "${WORKDIR}/Xext" diff --git a/packages/libxkbfile/.mtn2git_empty b/packages/xlibs/libxfixes/.mtn2git_empty similarity index 100% rename from packages/libxkbfile/.mtn2git_empty rename to packages/xlibs/libxfixes/.mtn2git_empty diff --git a/packages/libxfixes/files/autofoo.patch b/packages/xlibs/libxfixes/autofoo.patch similarity index 100% rename from packages/libxfixes/files/autofoo.patch rename to packages/xlibs/libxfixes/autofoo.patch diff --git a/packages/libxfixes/libxfixes_2.0.1.bb b/packages/xlibs/libxfixes_2.0.1.bb similarity index 90% rename from packages/libxfixes/libxfixes_2.0.1.bb rename to packages/xlibs/libxfixes_2.0.1.bb index 29e23e379d..710fa17454 100644 --- a/packages/libxfixes/libxfixes_2.0.1.bb +++ b/packages/xlibs/libxfixes_2.0.1.bb @@ -1,6 +1,6 @@ SECTION = "x11/libs" LICENSE= "BSD-X" -DEPENDS = "x11 fixesext" +DEPENDS = "libx11 fixesext" DESCRIPTION = "X Fixes extension library." PR = "r1" diff --git a/packages/libxfixes/libxfixes_cvs.bb b/packages/xlibs/libxfixes_cvs.bb similarity index 89% rename from packages/libxfixes/libxfixes_cvs.bb rename to packages/xlibs/libxfixes_cvs.bb index f02f9518cf..4494dc9326 100644 --- a/packages/libxfixes/libxfixes_cvs.bb +++ b/packages/xlibs/libxfixes_cvs.bb @@ -1,7 +1,7 @@ PV = "0.0+cvs${SRCDATE}" LICENSE= "BSD-X" SECTION = "x11/libs" -DEPENDS = "x11 fixesext" +DEPENDS = "libx11 fixesext" DESCRIPTION = "X Fixes extension library." SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xfixes" diff --git a/packages/libxp/.mtn2git_empty b/packages/xlibs/libxfont/.mtn2git_empty similarity index 100% rename from packages/libxp/.mtn2git_empty rename to packages/xlibs/libxfont/.mtn2git_empty diff --git a/packages/xfont/files/autofoo.patch b/packages/xlibs/libxfont/autofoo.patch similarity index 100% rename from packages/xfont/files/autofoo.patch rename to packages/xlibs/libxfont/autofoo.patch diff --git a/packages/xfont/files/scalable.patch b/packages/xlibs/libxfont/scalable.patch similarity index 100% rename from packages/xfont/files/scalable.patch rename to packages/xlibs/libxfont/scalable.patch diff --git a/packages/xfont/xfont_1.4.2.bb b/packages/xlibs/libxfont_1.4.2.bb similarity index 95% rename from packages/xfont/xfont_1.4.2.bb rename to packages/xlibs/libxfont_1.4.2.bb index 7ef1d2b17f..0cc45397fe 100644 --- a/packages/xfont/xfont_1.4.2.bb +++ b/packages/xlibs/libxfont_1.4.2.bb @@ -3,6 +3,7 @@ LICENSE = "BSD-X" PRIORITY = "optional" MAINTAINER = "Greg Gilbert " DEPENDS = "xproto xtrans zlib" +PROVIDES = "xfont" DESCRIPTION = "X font library (used by the X server)." PR = "r2" diff --git a/packages/xfont/xfont_cvs.bb b/packages/xlibs/libxfont_cvs.bb similarity index 95% rename from packages/xfont/xfont_cvs.bb rename to packages/xlibs/libxfont_cvs.bb index 49896ecd83..bd21e0fd12 100644 --- a/packages/xfont/xfont_cvs.bb +++ b/packages/xlibs/libxfont_cvs.bb @@ -4,6 +4,7 @@ SECTION = "x11/libs" PRIORITY = "optional" MAINTAINER = "Greg Gilbert " DEPENDS = "xproto xtrans zlib" +PROVIDES = "xfont" DESCRIPTION = "X font library (used by the X server)." SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xfont \ diff --git a/packages/libxrandr/.mtn2git_empty b/packages/xlibs/libxft/.mtn2git_empty similarity index 100% rename from packages/libxrandr/.mtn2git_empty rename to packages/xlibs/libxft/.mtn2git_empty diff --git a/packages/libxft/files/autofoo.patch b/packages/xlibs/libxft/autofoo.patch similarity index 100% rename from packages/libxft/files/autofoo.patch rename to packages/xlibs/libxft/autofoo.patch diff --git a/packages/libxft/libxft_2.1.6.bb b/packages/xlibs/libxft_2.1.6.bb similarity index 92% rename from packages/libxft/libxft_2.1.6.bb rename to packages/xlibs/libxft_2.1.6.bb index 12c8bdfb62..c3f1f74e40 100644 --- a/packages/libxft/libxft_2.1.6.bb +++ b/packages/xlibs/libxft_2.1.6.bb @@ -1,6 +1,6 @@ SECTION = "x11/libs" LICENSE = "MIT-X" -DEPENDS = "x11 xproto libxrender freetype fontconfig" +DEPENDS = "libx11 xproto libxrender freetype fontconfig" DESCRIPTION = "X FreeType library. Client-side fonts with FreeType." PROVIDES = "xft" PR = "r1" diff --git a/packages/libxft/libxft_cvs.bb b/packages/xlibs/libxft_cvs.bb similarity index 91% rename from packages/libxft/libxft_cvs.bb rename to packages/xlibs/libxft_cvs.bb index 01c53b47d5..6c1a5f5c32 100644 --- a/packages/libxft/libxft_cvs.bb +++ b/packages/xlibs/libxft_cvs.bb @@ -1,7 +1,7 @@ PV = "0.0+cvs${SRCDATE}" LICENSE = "MIT-X" SECTION = "x11/libs" -DEPENDS = "x11 xproto libxrender freetype fontconfig" +DEPENDS = "libx11 xproto libxrender freetype fontconfig" DESCRIPTION = "X FreeType library. Client-side fonts with FreeType." PROVIDES = "xft" diff --git a/packages/libxrandr/files/.mtn2git_empty b/packages/xlibs/libxi/.mtn2git_empty similarity index 100% rename from packages/libxrandr/files/.mtn2git_empty rename to packages/xlibs/libxi/.mtn2git_empty diff --git a/packages/libxi/files/autofoo.patch b/packages/xlibs/libxi/autofoo.patch similarity index 100% rename from packages/libxi/files/autofoo.patch rename to packages/xlibs/libxi/autofoo.patch diff --git a/packages/libxi/libxi_6.0.1.bb b/packages/xlibs/libxi_6.0.1.bb similarity index 87% rename from packages/libxi/libxi_6.0.1.bb rename to packages/xlibs/libxi_6.0.1.bb index 05ad22989f..5c44d06df3 100644 --- a/packages/libxi/libxi_6.0.1.bb +++ b/packages/xlibs/libxi_6.0.1.bb @@ -1,7 +1,7 @@ DESCRIPTION = "X Input Extension library" LICENSE = "MIT-X" SECTION = "x11/libs" -DEPENDS = "xproto x11 xextensions" +DEPENDS = "xproto libx11 xextensions" PR = "r1" SRC_URI = "${XLIBS_MIRROR}/libXi-${PV}.tar.bz2 \ diff --git a/packages/libxi/libxi_cvs.bb b/packages/xlibs/libxi_cvs.bb similarity index 88% rename from packages/libxi/libxi_cvs.bb rename to packages/xlibs/libxi_cvs.bb index 5b221d9b36..767c641a95 100644 --- a/packages/libxi/libxi_cvs.bb +++ b/packages/xlibs/libxi_cvs.bb @@ -1,7 +1,7 @@ PV = "0.0+cvs${SRCDATE}" LICENSE = "MIT-X" SECTION = "x11/libs" -DEPENDS = "xproto x11 xextensions" +DEPENDS = "xproto libx11 xextensions" DESCRIPTION = "X Input extension library." PR = "r1" diff --git a/packages/xinerama/xinerama_1.0.2+cvs20050505.bb b/packages/xlibs/libxinerama_1.0.2+cvs20050505.bb similarity index 81% rename from packages/xinerama/xinerama_1.0.2+cvs20050505.bb rename to packages/xlibs/libxinerama_1.0.2+cvs20050505.bb index 48a6416b36..dc5d82b9b0 100644 --- a/packages/xinerama/xinerama_1.0.2+cvs20050505.bb +++ b/packages/xlibs/libxinerama_1.0.2+cvs20050505.bb @@ -3,7 +3,8 @@ LICENSE = "MIT" SECTION = "x11/libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell " -DEPENDS = "panoramixext xproto x11 xext" +DEPENDS = "panoramixext xproto libx11 libxext" +PROVIDES = "xinerama" SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xinerama;date=20050505" S = "${WORKDIR}/Xinerama" diff --git a/packages/xinerama/xinerama_1.0.2.bb b/packages/xlibs/libxinerama_1.0.2.bb similarity index 81% rename from packages/xinerama/xinerama_1.0.2.bb rename to packages/xlibs/libxinerama_1.0.2.bb index d67d750f46..a267e6c2d9 100644 --- a/packages/xinerama/xinerama_1.0.2.bb +++ b/packages/xlibs/libxinerama_1.0.2.bb @@ -3,7 +3,8 @@ DESCRIPTION = "Xinerama library" SECTION = "x11/libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell " -DEPENDS = "panoramixext xproto x11 xext" +DEPENDS = "panoramixext xproto libx11 libxext" +PROVIDES = "xinerama" PR = "r1" SRC_URI = "${XLIBS_MIRROR}/libXinerama-${PV}.tar.bz2" diff --git a/packages/xinerama/xinerama_cvs.bb b/packages/xlibs/libxinerama_cvs.bb similarity index 79% rename from packages/xinerama/xinerama_cvs.bb rename to packages/xlibs/libxinerama_cvs.bb index a22e151917..3e959df19e 100644 --- a/packages/xinerama/xinerama_cvs.bb +++ b/packages/xlibs/libxinerama_cvs.bb @@ -2,7 +2,8 @@ DESCRIPTION = "Xinerama library" LICENSE = "MIT" SECTION = "x11/libs" PRIORITY = "optional" -DEPENDS = "panoramixext xproto x11 xext" +DEPENDS = "panoramixext xproto libx11 libxext" +PROVIDES = "xinerama" PV = "0.0+cvs${SRCDATE}" SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xinerama" diff --git a/packages/libxkbfile/libxkbfile_cvs.bb b/packages/xlibs/libxkbfile_cvs.bb similarity index 93% rename from packages/libxkbfile/libxkbfile_cvs.bb rename to packages/xlibs/libxkbfile_cvs.bb index 381e76383e..1b433ef65f 100644 --- a/packages/libxkbfile/libxkbfile_cvs.bb +++ b/packages/xlibs/libxkbfile_cvs.bb @@ -2,7 +2,7 @@ LICENSE = "GPL" PV = "0.0+cvs${SRCDATE}" SECTION = "libs" PRIORITY = "optional" -DEPENDS = "x11" +DEPENDS = "libx11" DESCRIPTION = "X11 keyboard library" SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=xkbfile" diff --git a/packages/xmu/xmu_cvs.bb b/packages/xlibs/libxmu_cvs.bb similarity index 88% rename from packages/xmu/xmu_cvs.bb rename to packages/xlibs/libxmu_cvs.bb index 9420280adc..500b373c32 100644 --- a/packages/xmu/xmu_cvs.bb +++ b/packages/xlibs/libxmu_cvs.bb @@ -2,7 +2,8 @@ PV = "0.0+cvs${SRCDATE}" LICENSE = "MIT" SECTION = "x11/libs" PRIORITY = "optional" -DEPENDS = "xt xext" +DEPENDS = "libxt libxext" +PROVIDES = "xmu" PR = "r2" SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xmu" diff --git a/packages/libxp/libxp_cvs.bb b/packages/xlibs/libxp_cvs.bb similarity index 92% rename from packages/libxp/libxp_cvs.bb rename to packages/xlibs/libxp_cvs.bb index a09e9cb79c..eaf6546d0e 100644 --- a/packages/libxp/libxp_cvs.bb +++ b/packages/xlibs/libxp_cvs.bb @@ -3,7 +3,7 @@ LICENSE = "MIT" PV = "0.0+cvs${SRCDATE}" SECTION = "libs" -DEPENDS = "x11 xext" +DEPENDS = "libx11 libxext" DESCRIPTION = "X print extension library." SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xp" diff --git a/packages/libxrandr/libxrandr-1.0.2/.mtn2git_empty b/packages/xlibs/libxpm/.mtn2git_empty similarity index 100% rename from packages/libxrandr/libxrandr-1.0.2/.mtn2git_empty rename to packages/xlibs/libxpm/.mtn2git_empty diff --git a/packages/xpm/files/autofoo.patch b/packages/xlibs/libxpm/autofoo.patch similarity index 100% rename from packages/xpm/files/autofoo.patch rename to packages/xlibs/libxpm/autofoo.patch diff --git a/packages/xpm/xpm_3.5.1.bb b/packages/xlibs/libxpm_3.5.1.bb similarity index 90% rename from packages/xpm/xpm_3.5.1.bb rename to packages/xlibs/libxpm_3.5.1.bb index ea863f1eb6..513261efd3 100644 --- a/packages/xpm/xpm_3.5.1.bb +++ b/packages/xlibs/libxpm_3.5.1.bb @@ -2,7 +2,8 @@ SECTION = "x11/libs" LICENSE = "X-BSD" PRIORITY = "optional" MAINTAINER = "Greg Gilbert " -DEPENDS = "xproto x11" +DEPENDS = "xproto libx11" +PROVIDES = "xpm" DESCRIPTION = "X Pixmap library." PR = "r1" diff --git a/packages/xpm/xpm_cvs.bb b/packages/xlibs/libxpm_cvs.bb similarity index 90% rename from packages/xpm/xpm_cvs.bb rename to packages/xlibs/libxpm_cvs.bb index 78e44b3f9b..1b46855735 100644 --- a/packages/xpm/xpm_cvs.bb +++ b/packages/xlibs/libxpm_cvs.bb @@ -3,7 +3,8 @@ LICENSE = "X-BSD" SECTION = "x11/libs" PRIORITY = "optional" MAINTAINER = "Greg Gilbert " -DEPENDS = "xproto x11" +DEPENDS = "xproto libx11" +PROVIDES = "xpm" DESCRIPTION = "X Pixmap library." PR = "r1" diff --git a/packages/libxrender/.mtn2git_empty b/packages/xlibs/libxrandr-1.0.2/.mtn2git_empty similarity index 100% rename from packages/libxrender/.mtn2git_empty rename to packages/xlibs/libxrandr-1.0.2/.mtn2git_empty diff --git a/packages/libxrandr/libxrandr-1.0.2/autofoo.patch b/packages/xlibs/libxrandr-1.0.2/autofoo.patch similarity index 100% rename from packages/libxrandr/libxrandr-1.0.2/autofoo.patch rename to packages/xlibs/libxrandr-1.0.2/autofoo.patch diff --git a/packages/libxrender/files/.mtn2git_empty b/packages/xlibs/libxrandr/.mtn2git_empty similarity index 100% rename from packages/libxrender/files/.mtn2git_empty rename to packages/xlibs/libxrandr/.mtn2git_empty diff --git a/packages/libxrandr/files/autofoo.patch b/packages/xlibs/libxrandr/autofoo.patch similarity index 100% rename from packages/libxrandr/files/autofoo.patch rename to packages/xlibs/libxrandr/autofoo.patch diff --git a/packages/libxrandr/libxrandr_1.0.2.bb b/packages/xlibs/libxrandr_1.0.2.bb similarity index 86% rename from packages/libxrandr/libxrandr_1.0.2.bb rename to packages/xlibs/libxrandr_1.0.2.bb index ff32e0aa35..efd0505544 100644 --- a/packages/libxrandr/libxrandr_1.0.2.bb +++ b/packages/xlibs/libxrandr_1.0.2.bb @@ -1,6 +1,6 @@ SECTION = "x11/libs" LICENSE = "BSD-X" -DEPENDS = "randrext x11 libxrender xext" +DEPENDS = "randrext libx11 libxrender libxext" DESCRIPTION = "X Resize and Rotate extension library." PR = "r1" diff --git a/packages/libxrandr/libxrandr_cvs.bb b/packages/xlibs/libxrandr_cvs.bb similarity index 85% rename from packages/libxrandr/libxrandr_cvs.bb rename to packages/xlibs/libxrandr_cvs.bb index 5ff10a3118..3b6fd02de8 100644 --- a/packages/libxrandr/libxrandr_cvs.bb +++ b/packages/xlibs/libxrandr_cvs.bb @@ -1,7 +1,7 @@ PV = "0.0+cvs${SRCDATE}" LICENSE = "BSD-X" SECTION = "x11/libs" -DEPENDS = "randrext x11 libxrender xext" +DEPENDS = "randrext libx11 libxrender libxext" DESCRIPTION = "X Resize and Rotate extension library." PR = "r1" diff --git a/packages/libxss/.mtn2git_empty b/packages/xlibs/libxrender/.mtn2git_empty similarity index 100% rename from packages/libxss/.mtn2git_empty rename to packages/xlibs/libxrender/.mtn2git_empty diff --git a/packages/libxrender/files/autofoo.patch b/packages/xlibs/libxrender/autofoo.patch similarity index 100% rename from packages/libxrender/files/autofoo.patch rename to packages/xlibs/libxrender/autofoo.patch diff --git a/packages/libxrender/libxrender_0.8.4.bb b/packages/xlibs/libxrender_0.8.4.bb similarity index 90% rename from packages/libxrender/libxrender_0.8.4.bb rename to packages/xlibs/libxrender_0.8.4.bb index 7c357b4c22..b36c5701ba 100644 --- a/packages/libxrender/libxrender_0.8.4.bb +++ b/packages/xlibs/libxrender_0.8.4.bb @@ -1,5 +1,5 @@ SECTION = "libs" -DEPENDS = "renderext x11" +DEPENDS = "renderext libx11" DESCRIPTION = "X Render extension library." LICENSE = "BSD" PR = "r1" diff --git a/packages/libxrender/libxrender_cvs.bb b/packages/xlibs/libxrender_cvs.bb similarity index 89% rename from packages/libxrender/libxrender_cvs.bb rename to packages/xlibs/libxrender_cvs.bb index 76c4af5bbc..ea6b1f4607 100644 --- a/packages/libxrender/libxrender_cvs.bb +++ b/packages/xlibs/libxrender_cvs.bb @@ -1,7 +1,7 @@ PV = "0.0+cvs${SRCDATE}" PR = "r1" SECTION = "libs" -DEPENDS = "renderext x11" +DEPENDS = "renderext libx11" DESCRIPTION = "X Render extension library." LICENSE = "BSD" diff --git a/packages/xres/xres_1.0.1.bb b/packages/xlibs/libxres_1.0.1.bb similarity index 79% rename from packages/xres/xres_1.0.1.bb rename to packages/xlibs/libxres_1.0.1.bb index 06226eb100..c01731d37a 100644 --- a/packages/xres/xres_1.0.1.bb +++ b/packages/xlibs/libxres_1.0.1.bb @@ -1,6 +1,7 @@ SECTION = "x11/libs" MAINTAINER = "Greg Gilbert " -DEPENDS = "x11 xextensions xext resourceext" +DEPENDS = "libx11 xextensions libxext resourceext" +PROVIDES = "xres" DESCRIPTION = "X Resource usage library." LICENSE = "X-MIT" SRC_URI = "${XLIBS_MIRROR}/libXres-${PV}.tar.bz2" diff --git a/packages/xres/xres_cvs.bb b/packages/xlibs/libxres_cvs.bb similarity index 80% rename from packages/xres/xres_cvs.bb rename to packages/xlibs/libxres_cvs.bb index 7fe8f4aa60..e3e5c6704c 100644 --- a/packages/xres/xres_cvs.bb +++ b/packages/xlibs/libxres_cvs.bb @@ -1,7 +1,8 @@ PV = "0.0+cvs${SRCDATE}" SECTION = "x11/libs" MAINTAINER = "Greg Gilbert " -DEPENDS = "x11 xextensions xext resourceext" +DEPENDS = "libx11 xextensions libxext resourceext" +PROVIDES = "xres" DESCRIPTION = "X Resource usage library." LICENSE = "X-MIT" SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XRes" diff --git a/packages/libxss/libxss_cvs.bb b/packages/xlibs/libxss_cvs.bb similarity index 92% rename from packages/libxss/libxss_cvs.bb rename to packages/xlibs/libxss_cvs.bb index ff766757fb..af064f5b4d 100644 --- a/packages/libxss/libxss_cvs.bb +++ b/packages/xlibs/libxss_cvs.bb @@ -4,7 +4,7 @@ PV = "0.0+cvs${SRCDATE}" PR = "r2" SECTION = "libs" -DEPENDS = "x11 xext" +DEPENDS = "libx11 libxext" DESCRIPTION = "X screen saver extension library." SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xss" diff --git a/packages/libxv/.mtn2git_empty b/packages/xlibs/libxt/.mtn2git_empty similarity index 100% rename from packages/libxv/.mtn2git_empty rename to packages/xlibs/libxt/.mtn2git_empty diff --git a/packages/xt/files/autofoo.patch b/packages/xlibs/libxt/autofoo.patch similarity index 100% rename from packages/xt/files/autofoo.patch rename to packages/xlibs/libxt/autofoo.patch diff --git a/packages/xt/xt_0.1.5.bb b/packages/xlibs/libxt_0.1.5.bb similarity index 93% rename from packages/xt/xt_0.1.5.bb rename to packages/xlibs/libxt_0.1.5.bb index 52235e2d97..00cbe9a3ad 100644 --- a/packages/xt/xt_0.1.5.bb +++ b/packages/xlibs/libxt_0.1.5.bb @@ -1,7 +1,8 @@ SECTION = "x11/libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell " -DEPENDS = "x11 libsm" +DEPENDS = "libx11 libsm" +PROVIDES = "xt" DESCRIPTION = "X Toolkit Intrinsics" LICENSE = "X-MIT" PR = "r1" diff --git a/packages/xt/xt_cvs.bb b/packages/xlibs/libxt_cvs.bb similarity index 86% rename from packages/xt/xt_cvs.bb rename to packages/xlibs/libxt_cvs.bb index 3434a63565..fdabe1d90f 100644 --- a/packages/xt/xt_cvs.bb +++ b/packages/xlibs/libxt_cvs.bb @@ -1,8 +1,8 @@ PV = "0.0+cvs${SRCDATE}" SECTION = "x11/libs" PRIORITY = "optional" -MAINTAINER = "Phil Blundell " -DEPENDS = "x11 libsm" +DEPENDS = "libx11 libsm" +PROVIDES = "xt" DESCRIPTION = "X Toolkit Intrinsics" LICENSE = "X-MIT" PR = "r1" diff --git a/packages/xtst/xtst_cvs.bb b/packages/xlibs/libxtst_cvs.bb similarity index 83% rename from packages/xtst/xtst_cvs.bb rename to packages/xlibs/libxtst_cvs.bb index 1662d3983a..c7c24d5d74 100644 --- a/packages/xtst/xtst_cvs.bb +++ b/packages/xlibs/libxtst_cvs.bb @@ -2,7 +2,8 @@ LICENSE = "GPL" PV = "0.0+cvs${SRCDATE}" SECTION = "x11/libs" PRIORITY = "optional" -DEPENDS = "x11 recordext xext" +DEPENDS = "libx11 recordext libxext" +PROVIDES = "xtst" DESCRIPTION = "X Test Extension: client side library" PR = "r3" diff --git a/packages/libxv/libxv_2.2.2+cvs20040918.bb b/packages/xlibs/libxv_2.2.2+cvs20040918.bb similarity index 90% rename from packages/libxv/libxv_2.2.2+cvs20040918.bb rename to packages/xlibs/libxv_2.2.2+cvs20040918.bb index e5e4240672..e70ce9cee9 100644 --- a/packages/libxv/libxv_2.2.2+cvs20040918.bb +++ b/packages/xlibs/libxv_2.2.2+cvs20040918.bb @@ -1,6 +1,6 @@ LICENSE = "GPL" SECTION = "x11/libs" -DEPENDS = "x11 xext" +DEPENDS = "libx11 libxext" DESCRIPTION = "X Video extension library." SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xv;date=20040918;method=pserver" diff --git a/packages/libxv/libxv_2.2.2.bb b/packages/xlibs/libxv_2.2.2.bb similarity index 89% rename from packages/libxv/libxv_2.2.2.bb rename to packages/xlibs/libxv_2.2.2.bb index d52f3ef76c..49e9670120 100644 --- a/packages/libxv/libxv_2.2.2.bb +++ b/packages/xlibs/libxv_2.2.2.bb @@ -1,6 +1,6 @@ LICENSE = "GPL" SECTION = "x11/libs" -DEPENDS = "x11 xext" +DEPENDS = "libx11 libxext" DESCRIPTION = "X Video extension library." SRC_URI = "${XLIBS_MIRROR}/libXv-${PV}.tar.bz2" diff --git a/packages/libxvmc/.mtn2git_empty b/packages/xlibs/libxvmc/.mtn2git_empty similarity index 100% rename from packages/libxvmc/.mtn2git_empty rename to packages/xlibs/libxvmc/.mtn2git_empty diff --git a/packages/libxvmc/files/drm.patch b/packages/xlibs/libxvmc/drm.patch similarity index 100% rename from packages/libxvmc/files/drm.patch rename to packages/xlibs/libxvmc/drm.patch diff --git a/packages/libxvmc/files/true.patch b/packages/xlibs/libxvmc/true.patch similarity index 100% rename from packages/libxvmc/files/true.patch rename to packages/xlibs/libxvmc/true.patch diff --git a/packages/libxvmc/files/via.patch b/packages/xlibs/libxvmc/via.patch similarity index 100% rename from packages/libxvmc/files/via.patch rename to packages/xlibs/libxvmc/via.patch diff --git a/packages/libxvmc/libxvmc_20040919.bb b/packages/xlibs/libxvmc_20040919.bb similarity index 95% rename from packages/libxvmc/libxvmc_20040919.bb rename to packages/xlibs/libxvmc_20040919.bb index f88f667d3e..b70c9f52e4 100644 --- a/packages/libxvmc/libxvmc_20040919.bb +++ b/packages/xlibs/libxvmc_20040919.bb @@ -1,6 +1,6 @@ DESCRIPTION = "X Video Motion Compensation extension library." SECTION = "x11/libs" -DEPENDS = "x11 xext libxv drm xserver-xorg" +DEPENDS = "libx11 libxext libxv drm xserver-xorg" PR = "r2" SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XvMC;date=${PV};method=pserver \ diff --git a/packages/libxvmc/libxvmc_20041025.bb b/packages/xlibs/libxvmc_20041025.bb similarity index 94% rename from packages/libxvmc/libxvmc_20041025.bb rename to packages/xlibs/libxvmc_20041025.bb index 311f65de61..829a74d92b 100644 --- a/packages/libxvmc/libxvmc_20041025.bb +++ b/packages/xlibs/libxvmc_20041025.bb @@ -1,6 +1,6 @@ DESCRIPTION = "X Video Motion Compensation extension library." SECTION = "x11/libs" -DEPENDS = "x11 xext libxv drm xserver-xorg" +DEPENDS = "libx11 libxext libxv drm xserver-xorg" PR = "r2" SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XvMC;date=${PV};method=pserver \ diff --git a/packages/libxvmc/libxvmc_20050612.bb b/packages/xlibs/libxvmc_20050612.bb similarity index 95% rename from packages/libxvmc/libxvmc_20050612.bb rename to packages/xlibs/libxvmc_20050612.bb index 49e8b57585..18cd369acc 100644 --- a/packages/libxvmc/libxvmc_20050612.bb +++ b/packages/xlibs/libxvmc_20050612.bb @@ -1,6 +1,6 @@ DESCRIPTION = "X Video Motion Compensation extension library." SECTION = "x11/libs" -DEPENDS = "x11 xext libxv drm xserver-xorg" +DEPENDS = "libx11 libxext libxv drm xserver-xorg" PR = "r0" SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XvMC;date=${PV};method=pserver \ diff --git a/packages/libxxf86dga/libxxf86dga_cvs.bb b/packages/xlibs/libxxf86dga_cvs.bb similarity index 88% rename from packages/libxxf86dga/libxxf86dga_cvs.bb rename to packages/xlibs/libxxf86dga_cvs.bb index 6111b343a2..96acce5d0e 100644 --- a/packages/libxxf86dga/libxxf86dga_cvs.bb +++ b/packages/xlibs/libxxf86dga_cvs.bb @@ -2,7 +2,7 @@ PV = "0.0+cvs${SRCDATE}" LICENSE = "XFree86" SECTION = "x11/libs" -DEPENDS = "x11 xext xxf86dgaext" +DEPENDS = "libx11 libxext xxf86dgaext" DESCRIPTION = "Xxf86dga extension library." SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xxf86dga" diff --git a/packages/libxxf86vm/libxxf86vm_cvs.bb b/packages/xlibs/libxxf86vm_cvs.bb similarity index 86% rename from packages/libxxf86vm/libxxf86vm_cvs.bb rename to packages/xlibs/libxxf86vm_cvs.bb index d0c342e3f3..5eb48f930d 100644 --- a/packages/libxxf86vm/libxxf86vm_cvs.bb +++ b/packages/xlibs/libxxf86vm_cvs.bb @@ -2,7 +2,7 @@ PV = "0.0+cvs${SRCDATE}" LICENSE = "MIT" SECTION = "x11/libs" -DEPENDS = "x11 xext xxf86vmext" +DEPENDS = "libx11 libxext xxf86vmext" DESCRIPTION = "Xxf86vm extension library." SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xxf86vm" diff --git a/packages/xtrans/xtrans-native_0.1.bb b/packages/xlibs/xtrans-native_0.1.bb similarity index 100% rename from packages/xtrans/xtrans-native_0.1.bb rename to packages/xlibs/xtrans-native_0.1.bb diff --git a/packages/xtrans/xtrans_0.1.bb b/packages/xlibs/xtrans_0.1.bb similarity index 100% rename from packages/xtrans/xtrans_0.1.bb rename to packages/xlibs/xtrans_0.1.bb diff --git a/packages/xtrans/xtrans_cvs.bb b/packages/xlibs/xtrans_cvs.bb similarity index 100% rename from packages/xtrans/xtrans_cvs.bb rename to packages/xlibs/xtrans_cvs.bb diff --git a/packages/xmu/.mtn2git_empty b/packages/xmu/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xpm/.mtn2git_empty b/packages/xpm/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xpm/files/.mtn2git_empty b/packages/xpm/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xres/.mtn2git_empty b/packages/xres/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xt/.mtn2git_empty b/packages/xt/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xt/files/.mtn2git_empty b/packages/xt/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xtrans/.mtn2git_empty b/packages/xtrans/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xtst/.mtn2git_empty b/packages/xtst/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 -- 2.39.5