From e0144f21f03b130697332ca562701604243dca87 Mon Sep 17 00:00:00 2001 From: Laurentiu Palcu Date: Tue, 19 Mar 2013 18:29:51 +0200 Subject: (distro-alias|maintainers|package-regex).inc: mesa-dri -> mesa [YOCTO #3385] (From meta-yocto rev: b9c2f3ad5696ef0756bfec20770d76c649ee5e2a) Signed-off-by: Laurentiu Palcu Signed-off-by: Richard Purdie --- meta-yocto/conf/distro/include/distro_alias.inc | 4 ++-- meta-yocto/conf/distro/include/maintainers.inc | 4 ++-- meta-yocto/conf/distro/include/package_regex.inc | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'meta-yocto') diff --git a/meta-yocto/conf/distro/include/distro_alias.inc b/meta-yocto/conf/distro/include/distro_alias.inc index 2246097cdb..043c26218e 100644 --- a/meta-yocto/conf/distro/include/distro_alias.inc +++ b/meta-yocto/conf/distro/include/distro_alias.inc @@ -237,8 +237,8 @@ DISTRO_PN_ALIAS_pn-matchbox-themes-gtk = "OpenedHand" DISTRO_PN_ALIAS_pn-matchbox-wm-2 = "Mandriva=matchbox-window-manager Debian=matchbox-window-manager" DISTRO_PN_ALIAS_pn-matchbox-wm = "OpenedHand" DISTRO_PN_ALIAS_pn-menu-cache = "OSPDT" -DISTRO_PN_ALIAS_pn-mesa-dri = "Fedora=mesa Ubuntu=libgl1-mesa-dri" -DISTRO_PN_ALIAS_pn-mesa-dri-glsl-native = "Fedora=mesa Ubuntu=libgl1-mesa-dri" +DISTRO_PN_ALIAS_pn-mesa = "Fedora=mesa Ubuntu=libgl1-mesa-dri" +DISTRO_PN_ALIAS_pn-mesa-glsl-native = "Fedora=mesa Ubuntu=libgl1-mesa-dri" DISTRO_PN_ALIAS_pn-meta-environment-i586 = "OE-Core" DISTRO_PN_ALIAS_pn-meta-ide-support = "OE-Core" DISTRO_PN_ALIAS_pn-meta-toolchain-gmae = "OE-Core" diff --git a/meta-yocto/conf/distro/include/maintainers.inc b/meta-yocto/conf/distro/include/maintainers.inc index 0f7241e630..db5053101e 100644 --- a/meta-yocto/conf/distro/include/maintainers.inc +++ b/meta-yocto/conf/distro/include/maintainers.inc @@ -514,8 +514,8 @@ RECIPE_MAINTAINER_pn-mc = "Saul Wold " RECIPE_MAINTAINER_pn-mdadm = "Laurentiu Palcu " RECIPE_MAINTAINER_pn-menu-cache = "Constantin Musca " RECIPE_MAINTAINER_pn-mesa-demos = "Saul Wold " -RECIPE_MAINTAINER_pn-mesa-dri-glsl-native = "Constantin Musca " -RECIPE_MAINTAINER_pn-mesa-dri = "Constantin Musca " +RECIPE_MAINTAINER_pn-mesa-glsl-native = "Constantin Musca " +RECIPE_MAINTAINER_pn-mesa = "Constantin Musca " RECIPE_MAINTAINER_pn-metacity = "Constantin Musca " RECIPE_MAINTAINER_pn-meta-environment-i586 = "Jessica Zhang " RECIPE_MAINTAINER_pn-meta-ide-support = "Jessica Zhang " diff --git a/meta-yocto/conf/distro/include/package_regex.inc b/meta-yocto/conf/distro/include/package_regex.inc index 7765580427..e313729c80 100644 --- a/meta-yocto/conf/distro/include/package_regex.inc +++ b/meta-yocto/conf/distro/include/package_regex.inc @@ -262,10 +262,10 @@ REGEX_URI_pn-bind = "ftp://ftp.isc.org/isc/bind9/" REGEX_pn-bind = "[hH][rR][eE][fF]=\"ftp://ftp.isc.org:21/isc/bind9/(?P((P?\d+[\.\-_]*)+))/\"" REGEX_URI_pn-dhcp = "ftp://ftp.isc.org/isc/dhcp/" REGEX_pn-dhcp = "[hH][rR][eE][fF]=\"ftp://ftp.isc.org:21/isc/dhcp/(dhcp\-)?(?P((P?\d+[\.\-_]*)+))/\"" -REGEX_URI_pn-mesa-dri = "ftp://ftp.freedesktop.org/pub/mesa/" -REGEX_pn-mesa-dri = "[hH][rR][eE][fF]=\"ftp://ftp.freedesktop.org:21/pub/mesa/(?P((\d+[\.\-_]*)+))/\"" -REGEX_URI_pn-mesa-dri-glsl-native = "ftp://ftp.freedesktop.org/pub/mesa/" -REGEX_pn-mesa-dri-glsl-native = "[hH][rR][eE][fF]=\"ftp://ftp.freedesktop.org:21/pub/mesa/(?P((\d+[\.\-_]*)+))/\"" +REGEX_URI_pn-mesa = "ftp://ftp.freedesktop.org/pub/mesa/" +REGEX_pn-mesa = "[hH][rR][eE][fF]=\"ftp://ftp.freedesktop.org:21/pub/mesa/(?P((\d+[\.\-_]*)+))/\"" +REGEX_URI_pn-mesa-glsl-native = "ftp://ftp.freedesktop.org/pub/mesa/" +REGEX_pn-mesa-glsl-native = "[hH][rR][eE][fF]=\"ftp://ftp.freedesktop.org:21/pub/mesa/(?P((\d+[\.\-_]*)+))/\"" REGEX_URI_pn-nspr = "ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/" REGEX_pn-nspr = "[hH][rR][eE][fF]=\"ftp://ftp.mozilla.org:21/pub/mozilla.org/nspr/releases/v(?P((\d+[\.\-_]*)+))/\"" REGEX_URI_pn-createrepo = "http://createrepo.baseurl.org/download/" -- cgit v1.2.3-54-g00ecf