distro: Remove Pimlico from distro-tracking

(From meta-yocto rev: 62822ea2141345552ab59bb6e673103f1efb6639)

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 0c0684bd7e8e5339d69b338a3e71b26e22751e28..30ec2f622371fd3302a59b363ef70b040fb82668 100644 (file)
--- a/meta-yocto/conf/distro/include/distro_alias.inc
+++ b/meta-yocto/conf/distro/include/distro_alias.inc
@@ -39,7 +39,6 @@ DISTRO_PN_ALIAS_pn-compositeproto = "Meego=xorg-x11-proto-compositeproto"
 DISTRO_PN_ALIAS_pn-connman-gnome = "Intel"
 DISTRO_PN_ALIAS_pn-connman = "Meego=connman"
 DISTRO_PN_ALIAS_pn-console-tools = "Debian=console-tools Ubuntu=console-tools"
-DISTRO_PN_ALIAS_pn-contacts = "Debian=contacts Fedora=contacts"
 DISTRO_PN_ALIAS_pn-core-console = "OE-Core"
 DISTRO_PN_ALIAS_pn-core-image-base = "OE-Core"
 DISTRO_PN_ALIAS_pn-core-image-basic = "OE-Core"
@@ -69,7 +68,6 @@ DISTRO_PN_ALIAS_pn-core-x11 = "OE-Core"
 DISTRO_PN_ALIAS_pn-cross-localedef = "OSPDT"
 DISTRO_PN_ALIAS_pn-cwautomacros= "OSPDT upstream=http://cwautomacros.berlios.de/"
 DISTRO_PN_ALIAS_pn-damageproto = "Meego=xorg-x11-proto-damageproto"
-DISTRO_PN_ALIAS_pn-dates = "Debian=dates Fedora=dates"
 DISTRO_PN_ALIAS_pn-db = "Debian=db5.1 Ubuntu=db5.1"
 DISTRO_PN_ALIAS_pn-dbus-wait = "OpenedHand"
 DISTRO_PN_ALIAS_pn-directfb-examples = "Debian=directfb Fedora=directfb"
@@ -316,7 +314,6 @@ DISTRO_PN_ALIAS_pn-sysvinit-inittab = "OE-Core"
 DISTRO_PN_ALIAS_pn-table = "Intel"
 DISTRO_PN_ALIAS_pn-tar-replacement-native = "OE-Core"
 DISTRO_PN_ALIAS_pn-task-base = "OE-Core"
-DISTRO_PN_ALIAS_pn-task-core-apps-x11-pimlico = "OE-Core"
 DISTRO_PN_ALIAS_pn-task-core-basic = "OE-Core"
 DISTRO_PN_ALIAS_pn-task-core-boot = "OE-Core"
 DISTRO_PN_ALIAS_pn-task-core-clutter = "OE-Core"
@@ -344,7 +341,6 @@ DISTRO_PN_ALIAS_pn-task-qt4e = "OE-Core"
 DISTRO_PN_ALIAS_pn-task-qte-toolchain-host-nativesdk = "OE-Core"
 DISTRO_PN_ALIAS_pn-task-qte-toolchain-host-natives = "OE-Core"
 DISTRO_PN_ALIAS_pn-task-qte-toolchain-target = "Intel"
-DISTRO_PN_ALIAS_pn-tasks = "Debian=tasks Fedora=tasks"
 DISTRO_PN_ALIAS_pn-task-sdk-host = "OE-Core"
 DISTRO_PN_ALIAS_pn-task-self-hosted = "OE-Core"
 DISTRO_PN_ALIAS_pn-tcf-agent = "Windriver upstream=http://www.eclipse.org/dsdp/tm/"

diff --git a/meta-yocto/conf/distro/include/maintainers.inc b/meta-yocto/conf/distro/include/maintainers.inc
index 0f34d64d189e125fe7e9598d64008e8802a8722c..fe78b3ecf134baea5433e39c4bd804e54e817601 100644 (file)
--- a/meta-yocto/conf/distro/include/maintainers.inc
+++ b/meta-yocto/conf/distro/include/maintainers.inc
@@ -92,7 +92,6 @@ RECIPE_MAINTAINER_pn-compositeproto = "Valentin Popa <valentin.popa@intel.com>"
 RECIPE_MAINTAINER_pn-connman = "Cristian Iorga <cristian.iorga@intel.com>"
 RECIPE_MAINTAINER_pn-connman-gnome = "Cristian Iorga <cristian.iorga@intel.com>"
 RECIPE_MAINTAINER_pn-console-tools = "Saul Wold <sgw@linux.intel.com>"
-RECIPE_MAINTAINER_pn-contacts = "Valentin Popa <valentin.popa@intel.com>"
 RECIPE_MAINTAINER_pn-core-image-base = "Saul Wold <sgw@linux.intel.com>"
 RECIPE_MAINTAINER_pn-core-image-basic = "Saul Wold <sgw@linux.intel.com>"
 RECIPE_MAINTAINER_pn-core-image-core = "Saul Wold <sgw@linux.intel.com>"
@@ -116,7 +115,6 @@ RECIPE_MAINTAINER_pn-cronie = "Radu Moisan <radu.moisan@intel.com>"
 RECIPE_MAINTAINER_pn-curl = "Radu Moisan <radu.moisan@intel.com>"
 RECIPE_MAINTAINER_pn-cwautomacros = "Cristian Iorga <cristian.iorga@intel.com>"
 RECIPE_MAINTAINER_pn-damageproto = "Valentin Popa <valentin.popa@intel.com>"
-RECIPE_MAINTAINER_pn-dates = "Valentin Popa <valentin.popa@intel.com>"
 RECIPE_MAINTAINER_pn-db = "Cristian Iorga <cristian.iorga@intel.com>"
 RECIPE_MAINTAINER_pn-dbus = "Cristian Iorga <cristian.iorga@intel.com>"
 RECIPE_MAINTAINER_pn-dbus-glib = "Scott Garman <scott.a.garman@intel.com>"
@@ -606,7 +604,6 @@ RECIPE_MAINTAINER_pn-sysvinit = "Saul Wold <sgw@linux.intel.com>"
 RECIPE_MAINTAINER_pn-taglib = "Cristian Iorga <cristian.iorga@intel.com>"
 RECIPE_MAINTAINER_pn-tar = "Scott Garman <scott.a.garman@intel.com>"
 RECIPE_MAINTAINER_pn-task-base = "Saul Wold <sgw@linux.intel.com>"
-RECIPE_MAINTAINER_pn-task-core-apps-x11-pimlico = "Cristian Iorga <cristian.iorga@intel.com>"
 RECIPE_MAINTAINER_pn-task-core-basic = "Saul Wold <sgw@linux.intel.com>"
 RECIPE_MAINTAINER_pn-task-core-boot = "Saul Wold <sgw@linux.intel.com>"
 RECIPE_MAINTAINER_pn-task-core-clutter = "Ross Burton <ross.burton@intel.com>"
@@ -624,7 +621,6 @@ RECIPE_MAINTAINER_pn-task-core-tools-testapps = "Saul Wold <sgw@linux.intel.com>
 RECIPE_MAINTAINER_pn-task-core-x11 = "Saul Wold <sgw@linux.intel.com>"
 RECIPE_MAINTAINER_pn-task-core-x11-sato = "Saul Wold <sgw@linux.intel.com>"
 RECIPE_MAINTAINER_pn-task-sdk-host = "Saul Wold <sgw@linux.intel.com>"
-RECIPE_MAINTAINER_pn-tasks = "Valentin Popa <valentin.popa@intel.com>"
 RECIPE_MAINTAINER_pn-tcf-agent = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
 RECIPE_MAINTAINER_pn-tcl = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
 RECIPE_MAINTAINER_pn-tcp-wrappers = "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 46fcbdcd30889447409cd87ec45bda72b1115135..af8ef1199e4597b9b9f31b891476ed2d6a58be89 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-contacts ?= "${AUTOREV}"
-SRCREV_pn-dates ?= "${AUTOREV}"
 #SRCREV_pn-gtkhtml2 ?= "${AUTOREV}"
 SRCREV_pn-web ?= "${AUTOREV}"
 SRCREV_pn-evolution-data-server ?= "${AUTOREV}"
@@ -37,7 +35,6 @@ SRCREV_pn-exmap-console ?= "${AUTOREV}"
 SRCREV_pn-gtk-sato-engine ?= "${AUTOREV}"
 SRCREV_pn-matchbox-theme-sato ?= "${AUTOREV}"
 SRCREV_pn-matchbox-theme-sato-2 ?= "${AUTOREV}"
-SRCREV_pn-tasks ?= "${AUTOREV}"
 SRCREV_pn-sato-icon-theme ?= "${AUTOREV}"
 SRCREV_pn-matchbox-desktop-sato ?= "${AUTOREV}"
 SRCREV_pn-oh-puzzles ?= "${AUTOREV}"

diff --git a/meta-yocto/conf/distro/include/recipe_color.inc b/meta-yocto/conf/distro/include/recipe_color.inc
index b3f9b460ae59db91be4514b9afe75b1530d506be..61394293f2063a5d399d508946dd5de500df5e98 100644 (file)
--- a/meta-yocto/conf/distro/include/recipe_color.inc
+++ b/meta-yocto/conf/distro/include/recipe_color.inc
@@ -52,7 +52,6 @@ RECIPE_COLOR_pn-clutter-gst-1.8 = "red"
 RECIPE_COLOR_pn-clutter-gtk-1.8 = "red"
 RECIPE_COLOR_pn-compositeproto = "yellow"
 RECIPE_COLOR_pn-console-tools = "red"
-RECIPE_COLOR_pn-contacts = "yellow"
 RECIPE_COLOR_pn-core-image-clutter = "red"
 RECIPE_COLOR_pn-cpio = "yellow"
 RECIPE_COLOR_pn-cronie = "yellow"
@@ -61,7 +60,6 @@ RECIPE_COLOR_pn-cups = "red"
 RECIPE_COLOR_pn-curl = "yellow"
 RECIPE_COLOR_pn-cwautomacros = "yellow"
 RECIPE_COLOR_pn-damageproto = "yellow"
-RECIPE_COLOR_pn-dates = "yellow"
 RECIPE_COLOR_pn-db = "yellow"
 RECIPE_COLOR_pn-dbus-glib = "yellow"
 RECIPE_COLOR_pn-dbus-wait = "yellow"
@@ -386,7 +384,6 @@ RECIPE_COLOR_pn-task-core-sdk = "red"
 RECIPE_COLOR_pn-task-core-sdk-gmae = "red"
 RECIPE_COLOR_pn-task-core-standalone-gmae-sdk-target = "red"
 RECIPE_COLOR_pn-task-core-standalone-sdk-target = "red"
-RECIPE_COLOR_pn-tasks = "yellow"
 RECIPE_COLOR_pn-task-sdk-host = "red"
 RECIPE_COLOR_pn-tcf-agent = "yellow"
 RECIPE_COLOR_pn-tcp-wrappers = "yellow"

diff --git a/meta-yocto/conf/distro/include/upstream_tracking.inc b/meta-yocto/conf/distro/include/upstream_tracking.inc
index d34d980212e6f38177d7e2db23b7f43af6d5adea..bdd45cdd411d9a82571150d1966cf880239aae9d 100644 (file)
--- a/meta-yocto/conf/distro/include/upstream_tracking.inc
+++ b/meta-yocto/conf/distro/include/upstream_tracking.inc
@@ -122,8 +122,6 @@ RECIPE_UPSTREAM_VERSION_pn-console-tools = "0.3.2"
 RECIPE_UPSTREAM_DATE_pn-console-tools = "Feb 18, 2002"
 CHECK_DATE_pn-console-tools = "Jul 05, 2012"
 RECIPE_UPSTREAM_VERSION_pn-consolekit = "0.4.3"
-RECIPE_UPSTREAM_VERSION_pn-contacts = "0.12+git0+19853893fdb595de6aa59db0d9dc2f9451ed2933"
-RECIPE_UPSTREAM_DATE_pn-contacts = "Nov 01, 2009"
 RECIPE_UPSTREAM_VERSION_pn-core-image-minimal = "1.0"
 RECIPE_UPSTREAM_VERSION_pn-coreutils = "8.12"
 RECIPE_UPSTREAM_DATE_pn-coreutils = "Apr 01, 2011"
@@ -148,8 +146,6 @@ CHECK_DATE_pn-cwautomacros = "Jul 06, 2012"
 RECIPE_UPSTREAM_DATE_pn-cwautomacros = "Feb 01, 2011"
 RECIPE_UPSTREAM_VERSION_pn-damageproto = "1.2.1"
 RECIPE_UPSTREAM_DATE_pn-damageproto = "Oct 29, 2010"
-RECIPE_UPSTREAM_VERSION_pn-dates = "0.4.11+git0+514185dc1f6588085fda41eb59898b93d0487dd4"
-RECIPE_UPSTREAM_DATE_pn-dates = "Oct 01, 2009"
 RECIPE_UPSTREAM_VERSION_pn-db = "5.0.26"
 RECIPE_NO_UPDATE_REASON_pn-db= "API compatibility issue"
 RECIPE_UPSTREAM_DATE_pn-db = "n/a"
@@ -921,8 +917,6 @@ RECIPE_UPSTREAM_VERSION_pn-tar = "1.26"
 RECIPE_UPSTREAM_DATE_pn-tar = "Mar 01, 2011"
 CHECK_DATE_pn-tar = "Nov 14, 2011"
 RECIPE_UPSTREAM_DATE_pn-task-base="n/a"
-RECIPE_UPSTREAM_VERSION_pn-tasks = "0.18"
-RECIPE_UPSTREAM_DATE_pn-tasks = "Jul 01, 2010"
 RECIPE_UPSTREAM_DATE_pn-tcf-agent = "Jul 07, 2011"
 RECIPE_UPSTREAM_VERSION_pn-tcl="8.5.11"
 RECIPE_UPSTREAM_DATE_pn-tcl = "Jul 07, 2011"