distro: remove web and gtkhtml2 from distro tracking

(From meta-yocto rev: 92dd130f179dfe2f0fbc663055bf1ee99e2d101a)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta-yocto/conf/distro/include/distro_alias.inc b/meta-yocto/conf/distro/include/distro_alias.inc
index 6cccee3e5ed0ed80e3164c78bbbb35a04588b922..2246097cdbe2f05b1518cea3ed4f38df9824aac4 100644 (file)
--- a/meta-yocto/conf/distro/include/distro_alias.inc
+++ b/meta-yocto/conf/distro/include/distro_alias.inc
@@ -132,7 +132,6 @@ DISTRO_PN_ALIAS_pn-gst-plugins-good = "Meego=gst-plugins-good Fedora=gstreamer-p
 DISTRO_PN_ALIAS_pn-gst-plugins-ugly = "OpenSuSE=gstreamer-plugins-ugly Mandriva=gstreamer0.10-plugins-ugly Debian=gst-plugins-ugly0.10"
 DISTRO_PN_ALIAS_pn-gtk-doc-stub = "Fedora=gtk-doc Ubuntu=gtk-doc"
 DISTRO_PN_ALIAS_pn-gtk-engines = "Fedora=gtk2-engines OpenSuSE=gtk2-engines Ubuntu=gtk2-engines Mandriva=gtk-engines2 Debian=gtk2-engines"
-DISTRO_PN_ALIAS_pn-gtkhtml2 = "Debian=libgtkhtml2-0 Fedora=gtkhtml2"
 DISTRO_PN_ALIAS_pn-gtk+ = "Meego=gtk2 Fedora=gtk2 OpenSuSE=gtk2 Ubuntu=gtk+2.0 Mandriva=gtk+2.0 Debian=gtk+2.0"
 DISTRO_PN_ALIAS_pn-gtk-sato-engine = "OpenedHand"
 DISTRO_PN_ALIAS_pn-gtk-theme-torturer = "OSPDT upstream=http://wiki.laptop.org/go/GTK_for_OLPC"
@@ -390,7 +389,6 @@ DISTRO_PN_ALIAS_pn-v86d = "Debian=v86d Ubuntu=v86d"
 DISTRO_PN_ALIAS_pn-videoproto = "Meego=xorg-x11-proto-videoproto"
 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-web = "OpenedHand"
 DISTRO_PN_ALIAS_pn-web-webkit = "OpenedHand"
 DISTRO_PN_ALIAS_pn-which = "Mandriva=which Fedora=which"
 DISTRO_PN_ALIAS_pn-wpa-supplicant = "Meego=wpa_supplicant Fedora=wpa_supplicant OpenSuSE=wpa_supplicant Ubuntu=wpasupplicant Mandriva=wpa_supplicant Debian=wpasupplicant"

diff --git a/meta-yocto/conf/distro/include/maintainers.inc b/meta-yocto/conf/distro/include/maintainers.inc
index 9bd9069c705f695095684a00b8219fa6776009ef..0f7a8722be4bde09ecc9a5a609370623711847d6 100644 (file)
--- a/meta-yocto/conf/distro/include/maintainers.inc
+++ b/meta-yocto/conf/distro/include/maintainers.inc
@@ -253,7 +253,6 @@ RECIPE_MAINTAINER_pn-gtk-doc-stub-native = "Saul Wold <sgw@linux.intel.com>"
 RECIPE_MAINTAINER_pn-gtk-doc-stub = "Saul Wold <sgw@linux.intel.com>"
 RECIPE_MAINTAINER_pn-gtk-doc = "Constantin Musca <constantinx.musca@intel.com>"
 RECIPE_MAINTAINER_pn-gtk-engines = "Constantin Musca <constantinx.musca@intel.com>"
-RECIPE_MAINTAINER_pn-gtkhtml2 = "Constantin Musca <constantinx.musca@intel.com>"
 RECIPE_MAINTAINER_pn-gtk-sato-engine = "Constantin Musca <constantinx.musca@intel.com>"
 RECIPE_MAINTAINER_pn-gtk-theme-torturer = "Constantin Musca <constantinx.musca@intel.com>"
 RECIPE_MAINTAINER_pn-gtk+ = "Constantin Musca <constantinx.musca@intel.com>"
@@ -798,7 +797,6 @@ RECIPE_MAINTAINER_pn-vte ="Saul Wold <sgw@linux.intel.com>"
 RECIPE_MAINTAINER_pn-watchdog = "Radu Moisan <radu.moisan@intel.com>"
 RECIPE_MAINTAINER_pn-wbxml2 = "Saul Wold <sgw@linux.intel.com>"
 RECIPE_MAINTAINER_pn-webkit-gtk = "Constantin Musca <constantinx.musca@intel.com>"
-RECIPE_MAINTAINER_pn-web = "Constantin Musca <constantinx.musca@intel.com>"
 RECIPE_MAINTAINER_pn-web-webkit = "Constantin Musca <constantinx.musca@intel.com>"
 RECIPE_MAINTAINER_pn-wget = "Saul Wold <sgw@linux.intel.com>"
 RECIPE_MAINTAINER_pn-which = "Radu Moisan <radu.moisan@intel.com>"

diff --git a/meta-yocto/conf/distro/include/poky-floating-revisions.inc b/meta-yocto/conf/distro/include/poky-floating-revisions.inc
index f1b3a0eabccf4646d46bd9f49af1f6b3ce35fcbd..ab55f39bd44e0193b376e2f194323b77f822d242 100644 (file)
--- a/meta-yocto/conf/distro/include/poky-floating-revisions.inc
+++ b/meta-yocto/conf/distro/include/poky-floating-revisions.inc
@@ -9,8 +9,6 @@ SRCREV_pn-exmap-console ?= "${AUTOREV}"
 #SRCREV_pn-opkg-utils-naitve ?= "${AUTOREV}"
 #SRCREV_pn-opkg-utils ?= "${AUTOREV}"
 SRCREV_pn-gconf-dbus ?= "${AUTOREV}"
-#SRCREV_pn-gtkhtml2 ?= "${AUTOREV}"
-SRCREV_pn-web ?= "${AUTOREV}"
 SRCREV_pn-matchbox-common ?= "${AUTOREV}"
 SRCREV_pn-matchbox-config-gtk ?= "${AUTOREV}"
 SRCREV_pn-matchbox-desktop ?= "${AUTOREV}"

diff --git a/meta-yocto/conf/distro/include/recipe_color.inc b/meta-yocto/conf/distro/include/recipe_color.inc
index c301037e0c9fe0db9a3f7298e193602304b67fcf..70871f137b1b861fdbb65b5c97a1fec2351094bc 100644 (file)
--- a/meta-yocto/conf/distro/include/recipe_color.inc
+++ b/meta-yocto/conf/distro/include/recipe_color.inc
@@ -115,7 +115,6 @@ RECIPE_COLOR_pn-grep = "yellow"
 RECIPE_COLOR_pn-groff = "red"
 RECIPE_COLOR_pn-gtk+ = "yellow"
 RECIPE_COLOR_pn-gtk-doc = "red"
-RECIPE_COLOR_pn-gtkhtml2 = "red"
 RECIPE_COLOR_pn-gtk-sato-engine = "yellow"
 RECIPE_COLOR_pn-gtk-theme-torturer = "red"
 RECIPE_COLOR_pn-guilt-native = "red"

diff --git a/meta-yocto/conf/distro/include/upstream_tracking.inc b/meta-yocto/conf/distro/include/upstream_tracking.inc
index 0ca6e5e40c343ae2714a20e4db2916e36290980d..a984722966f6a80d65892ca63313e2529f1e7c6d 100644 (file)
--- a/meta-yocto/conf/distro/include/upstream_tracking.inc
+++ b/meta-yocto/conf/distro/include/upstream_tracking.inc
@@ -83,8 +83,6 @@ RECIPE_NO_UPDATE_REASON_pn-gst-plugins-good = "not compatible with gst-fluendo 0
 RECIPE_NO_UPDATE_REASON_pn-gst-plugins-ugly = "not compatible with gst-fluendo 0.10.x"
 RECIPE_NO_UPDATE_REASON_pn-gstreamer=" not compatible with gst-fluendo 0.10.x "
 RECIPE_NO_UPDATE_REASON_pn-gtk+ = "Do not upgrade to version: 2.99.2 because prefer stable tree"
-RECIPE_UPSTREAM_VERSION_pn-gtkhtml2 = "2.11.1"
-CHECK_DATE_pn-gtkhtml2 = "Aug 29, 2012"
 RECIPE_UPSTREAM_VERSION_pn-icu = "4.8.1.1"
 RECIPE_UPSTREAM_DATE_pn-icu = "Oct 10, 2011"
 CHECK_DATE_pn-icu = "Aug 29, 2012"