summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-02-18 16:49:36 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-19 16:47:36 (GMT)
commit7ca6e975e2d2a9dcd6a1dffd6d472bce85cf498c (patch)
tree94e4e54f96ae0b50dfa4b94d781621e91bf13ad3
parent325410e2b20920a9903d0cafcb992b3452dcdb15 (diff)
downloadpoky-7ca6e975e2d2a9dcd6a1dffd6d472bce85cf498c.tar.gz
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>
-rw-r--r--meta-yocto/conf/distro/include/distro_alias.inc2
-rw-r--r--meta-yocto/conf/distro/include/maintainers.inc2
-rw-r--r--meta-yocto/conf/distro/include/poky-floating-revisions.inc2
-rw-r--r--meta-yocto/conf/distro/include/recipe_color.inc1
-rw-r--r--meta-yocto/conf/distro/include/upstream_tracking.inc2
5 files changed, 0 insertions, 9 deletions
diff --git a/meta-yocto/conf/distro/include/distro_alias.inc b/meta-yocto/conf/distro/include/distro_alias.inc
index 6cccee3..2246097 100644
--- 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
132DISTRO_PN_ALIAS_pn-gst-plugins-ugly = "OpenSuSE=gstreamer-plugins-ugly Mandriva=gstreamer0.10-plugins-ugly Debian=gst-plugins-ugly0.10" 132DISTRO_PN_ALIAS_pn-gst-plugins-ugly = "OpenSuSE=gstreamer-plugins-ugly Mandriva=gstreamer0.10-plugins-ugly Debian=gst-plugins-ugly0.10"
133DISTRO_PN_ALIAS_pn-gtk-doc-stub = "Fedora=gtk-doc Ubuntu=gtk-doc" 133DISTRO_PN_ALIAS_pn-gtk-doc-stub = "Fedora=gtk-doc Ubuntu=gtk-doc"
134DISTRO_PN_ALIAS_pn-gtk-engines = "Fedora=gtk2-engines OpenSuSE=gtk2-engines Ubuntu=gtk2-engines Mandriva=gtk-engines2 Debian=gtk2-engines" 134DISTRO_PN_ALIAS_pn-gtk-engines = "Fedora=gtk2-engines OpenSuSE=gtk2-engines Ubuntu=gtk2-engines Mandriva=gtk-engines2 Debian=gtk2-engines"
135DISTRO_PN_ALIAS_pn-gtkhtml2 = "Debian=libgtkhtml2-0 Fedora=gtkhtml2"
136DISTRO_PN_ALIAS_pn-gtk+ = "Meego=gtk2 Fedora=gtk2 OpenSuSE=gtk2 Ubuntu=gtk+2.0 Mandriva=gtk+2.0 Debian=gtk+2.0" 135DISTRO_PN_ALIAS_pn-gtk+ = "Meego=gtk2 Fedora=gtk2 OpenSuSE=gtk2 Ubuntu=gtk+2.0 Mandriva=gtk+2.0 Debian=gtk+2.0"
137DISTRO_PN_ALIAS_pn-gtk-sato-engine = "OpenedHand" 136DISTRO_PN_ALIAS_pn-gtk-sato-engine = "OpenedHand"
138DISTRO_PN_ALIAS_pn-gtk-theme-torturer = "OSPDT upstream=http://wiki.laptop.org/go/GTK_for_OLPC" 137DISTRO_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"
390DISTRO_PN_ALIAS_pn-videoproto = "Meego=xorg-x11-proto-videoproto" 389DISTRO_PN_ALIAS_pn-videoproto = "Meego=xorg-x11-proto-videoproto"
391DISTRO_PN_ALIAS_pn-watchdog = "Debian=watchdog Ubuntu=watchdog Mandriva=watchdog" 390DISTRO_PN_ALIAS_pn-watchdog = "Debian=watchdog Ubuntu=watchdog Mandriva=watchdog"
392DISTRO_PN_ALIAS_pn-webkit-gtk = "Fedora=webkitgtk Ubuntu=libwebkit" 391DISTRO_PN_ALIAS_pn-webkit-gtk = "Fedora=webkitgtk Ubuntu=libwebkit"
393DISTRO_PN_ALIAS_pn-web = "OpenedHand"
394DISTRO_PN_ALIAS_pn-web-webkit = "OpenedHand" 392DISTRO_PN_ALIAS_pn-web-webkit = "OpenedHand"
395DISTRO_PN_ALIAS_pn-which = "Mandriva=which Fedora=which" 393DISTRO_PN_ALIAS_pn-which = "Mandriva=which Fedora=which"
396DISTRO_PN_ALIAS_pn-wpa-supplicant = "Meego=wpa_supplicant Fedora=wpa_supplicant OpenSuSE=wpa_supplicant Ubuntu=wpasupplicant Mandriva=wpa_supplicant Debian=wpasupplicant" 394DISTRO_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 9bd9069..0f7a872 100644
--- 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>"
253RECIPE_MAINTAINER_pn-gtk-doc-stub = "Saul Wold <sgw@linux.intel.com>" 253RECIPE_MAINTAINER_pn-gtk-doc-stub = "Saul Wold <sgw@linux.intel.com>"
254RECIPE_MAINTAINER_pn-gtk-doc = "Constantin Musca <constantinx.musca@intel.com>" 254RECIPE_MAINTAINER_pn-gtk-doc = "Constantin Musca <constantinx.musca@intel.com>"
255RECIPE_MAINTAINER_pn-gtk-engines = "Constantin Musca <constantinx.musca@intel.com>" 255RECIPE_MAINTAINER_pn-gtk-engines = "Constantin Musca <constantinx.musca@intel.com>"
256RECIPE_MAINTAINER_pn-gtkhtml2 = "Constantin Musca <constantinx.musca@intel.com>"
257RECIPE_MAINTAINER_pn-gtk-sato-engine = "Constantin Musca <constantinx.musca@intel.com>" 256RECIPE_MAINTAINER_pn-gtk-sato-engine = "Constantin Musca <constantinx.musca@intel.com>"
258RECIPE_MAINTAINER_pn-gtk-theme-torturer = "Constantin Musca <constantinx.musca@intel.com>" 257RECIPE_MAINTAINER_pn-gtk-theme-torturer = "Constantin Musca <constantinx.musca@intel.com>"
259RECIPE_MAINTAINER_pn-gtk+ = "Constantin Musca <constantinx.musca@intel.com>" 258RECIPE_MAINTAINER_pn-gtk+ = "Constantin Musca <constantinx.musca@intel.com>"
@@ -798,7 +797,6 @@ RECIPE_MAINTAINER_pn-vte ="Saul Wold <sgw@linux.intel.com>"
798RECIPE_MAINTAINER_pn-watchdog = "Radu Moisan <radu.moisan@intel.com>" 797RECIPE_MAINTAINER_pn-watchdog = "Radu Moisan <radu.moisan@intel.com>"
799RECIPE_MAINTAINER_pn-wbxml2 = "Saul Wold <sgw@linux.intel.com>" 798RECIPE_MAINTAINER_pn-wbxml2 = "Saul Wold <sgw@linux.intel.com>"
800RECIPE_MAINTAINER_pn-webkit-gtk = "Constantin Musca <constantinx.musca@intel.com>" 799RECIPE_MAINTAINER_pn-webkit-gtk = "Constantin Musca <constantinx.musca@intel.com>"
801RECIPE_MAINTAINER_pn-web = "Constantin Musca <constantinx.musca@intel.com>"
802RECIPE_MAINTAINER_pn-web-webkit = "Constantin Musca <constantinx.musca@intel.com>" 800RECIPE_MAINTAINER_pn-web-webkit = "Constantin Musca <constantinx.musca@intel.com>"
803RECIPE_MAINTAINER_pn-wget = "Saul Wold <sgw@linux.intel.com>" 801RECIPE_MAINTAINER_pn-wget = "Saul Wold <sgw@linux.intel.com>"
804RECIPE_MAINTAINER_pn-which = "Radu Moisan <radu.moisan@intel.com>" 802RECIPE_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 f1b3a0e..ab55f39 100644
--- 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}"
9#SRCREV_pn-opkg-utils-naitve ?= "${AUTOREV}" 9#SRCREV_pn-opkg-utils-naitve ?= "${AUTOREV}"
10#SRCREV_pn-opkg-utils ?= "${AUTOREV}" 10#SRCREV_pn-opkg-utils ?= "${AUTOREV}"
11SRCREV_pn-gconf-dbus ?= "${AUTOREV}" 11SRCREV_pn-gconf-dbus ?= "${AUTOREV}"
12#SRCREV_pn-gtkhtml2 ?= "${AUTOREV}"
13SRCREV_pn-web ?= "${AUTOREV}"
14SRCREV_pn-matchbox-common ?= "${AUTOREV}" 12SRCREV_pn-matchbox-common ?= "${AUTOREV}"
15SRCREV_pn-matchbox-config-gtk ?= "${AUTOREV}" 13SRCREV_pn-matchbox-config-gtk ?= "${AUTOREV}"
16SRCREV_pn-matchbox-desktop ?= "${AUTOREV}" 14SRCREV_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 c301037..70871f1 100644
--- 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"
115RECIPE_COLOR_pn-groff = "red" 115RECIPE_COLOR_pn-groff = "red"
116RECIPE_COLOR_pn-gtk+ = "yellow" 116RECIPE_COLOR_pn-gtk+ = "yellow"
117RECIPE_COLOR_pn-gtk-doc = "red" 117RECIPE_COLOR_pn-gtk-doc = "red"
118RECIPE_COLOR_pn-gtkhtml2 = "red"
119RECIPE_COLOR_pn-gtk-sato-engine = "yellow" 118RECIPE_COLOR_pn-gtk-sato-engine = "yellow"
120RECIPE_COLOR_pn-gtk-theme-torturer = "red" 119RECIPE_COLOR_pn-gtk-theme-torturer = "red"
121RECIPE_COLOR_pn-guilt-native = "red" 120RECIPE_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 0ca6e5e..a984722 100644
--- 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
83RECIPE_NO_UPDATE_REASON_pn-gst-plugins-ugly = "not compatible with gst-fluendo 0.10.x" 83RECIPE_NO_UPDATE_REASON_pn-gst-plugins-ugly = "not compatible with gst-fluendo 0.10.x"
84RECIPE_NO_UPDATE_REASON_pn-gstreamer=" not compatible with gst-fluendo 0.10.x " 84RECIPE_NO_UPDATE_REASON_pn-gstreamer=" not compatible with gst-fluendo 0.10.x "
85RECIPE_NO_UPDATE_REASON_pn-gtk+ = "Do not upgrade to version: 2.99.2 because prefer stable tree" 85RECIPE_NO_UPDATE_REASON_pn-gtk+ = "Do not upgrade to version: 2.99.2 because prefer stable tree"
86RECIPE_UPSTREAM_VERSION_pn-gtkhtml2 = "2.11.1"
87CHECK_DATE_pn-gtkhtml2 = "Aug 29, 2012"
88RECIPE_UPSTREAM_VERSION_pn-icu = "4.8.1.1" 86RECIPE_UPSTREAM_VERSION_pn-icu = "4.8.1.1"
89RECIPE_UPSTREAM_DATE_pn-icu = "Oct 10, 2011" 87RECIPE_UPSTREAM_DATE_pn-icu = "Oct 10, 2011"
90CHECK_DATE_pn-icu = "Aug 29, 2012" 88CHECK_DATE_pn-icu = "Aug 29, 2012"