From 1902645cb0a5eb11a19126a8b22fbbfee13e0c40 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 14 Aug 2015 11:34:37 +0300 Subject: distro: update include files related to webkitgtk and epiphany addition This commit fixes recipe metadata in distro_alias, package_regex and upstream_tracking includes. (From OE-Core rev: 3fe3df9ea152d6ec39e114d831be24e1aa529165) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/conf/distro/include/distro_alias.inc | 2 +- meta/conf/distro/include/package_regex.inc | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc index ec8570d631..bd3da9ce90 100644 --- a/meta/conf/distro/include/distro_alias.inc +++ b/meta/conf/distro/include/distro_alias.inc @@ -472,7 +472,7 @@ DISTRO_PN_ALIAS_pn-v86d = "Debian=v86d Ubuntu=v86d" DISTRO_PN_ALIAS_pn-videoproto = "Meego=xorg-x11-proto-videoproto" DISTRO_PN_ALIAS_pn-waffle = "OE-Core" DISTRO_PN_ALIAS_pn-watchdog = "Debian=watchdog Ubuntu=watchdog Mandriva=watchdog" -DISTRO_PN_ALIAS_pn-webkit-gtk = "Fedora=webkitgtk Ubuntu=libwebkit" +DISTRO_PN_ALIAS_pn-webkitgtk = "Fedora=webkitgtk Ubuntu=libwebkit" DISTRO_PN_ALIAS_pn-web-webkit = "OpenedHand" DISTRO_PN_ALIAS_pn-weston = "Fedora=weston OpenSuSE=weston" DISTRO_PN_ALIAS_pn-weston-init = "OE-Core" diff --git a/meta/conf/distro/include/package_regex.inc b/meta/conf/distro/include/package_regex.inc index 8fc112c61f..d12999b155 100644 --- a/meta/conf/distro/include/package_regex.inc +++ b/meta/conf/distro/include/package_regex.inc @@ -25,9 +25,6 @@ COMMON_REGEX = "(?P(\d+[\.\-_]*)+)" REGEX_URI_pn-wireless-tools = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html" REGEX_pn-wireless-tools = "wireless_tools\.(?P(\d+)(\..*|))\.tar\.gz" -REGEX_URI_pn-midori="http://midori-browser.org/download/source/" -REGEX_pn-midori="midori_(?P((\d+[\.\-_]*)+))_all_\.tar\.bz2" - REGEX_URI_pn-sqlite3="http://www.sqlite.org/" REGEX_pn-sqlite3="releaselog/${COMMON_REGEX}.html" @@ -97,6 +94,7 @@ REGEX_URI_pn-python-smartpm="https://launchpad.net/smart/trunk/" REGEX_URI_pn-lsof = "ftp://sunsite.ualberta.ca/pub/Mirror/lsof/" REGEX_URI_pn-pbzip2 = "http://compression.ca/pbzip2/" REGEX_URI_pn-quicky = "http://qt-apps.org/content/download.php?content=80325&id=1&tan=10417482" +REGEX_URI_pn-libwebp = "http://downloads.webmproject.org/releases/webp/index.html" # The engine tries to use directory versioning but is a false-positive REGEX_URI_pn-intltool = "https://launchpad.net/intltool/trunk/" @@ -237,6 +235,10 @@ REGEX_pn-clutter-gst-3.0 = "${GNOME_STABLE}" REGEX_pn-cogl-1.0 = "${GNOME_STABLE}" REGEX_pn-adwaita-icon-theme = "${GNOME_STABLE}" REGEX_pn-vte = "${GNOME_STABLE}" +REGEX_pn-epiphany = "${GNOME_STABLE}" +REGEX_pn-webkitgtk = "${GNOME_STABLE}" +REGEX_pn-p11-kit = "${GNOME_STABLE}" +REGEX_pn-gnome-desktop3 = "${GNOME_STABLE}" # not GNOME related but uses same even-minor-release-is-stable logic REGEX_pn-dbus = "${GNOME_STABLE}" -- cgit 1.2.3-korg