From b95356c455ee7611cd3c0a766785a9c13fbe8f69 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 9 Aug 2012 09:09:27 +0000 Subject: distro: Remove Pimlico from distro-tracking (From meta-yocto rev: 62822ea2141345552ab59bb6e673103f1efb6639) Signed-off-by: Ross Burton 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/poky-floating-revisions.inc | 3 --- meta-yocto/conf/distro/include/recipe_color.inc | 3 --- meta-yocto/conf/distro/include/upstream_tracking.inc | 6 ------ 5 files changed, 20 deletions(-) diff --git a/meta-yocto/conf/distro/include/distro_alias.inc b/meta-yocto/conf/distro/include/distro_alias.inc index 0c0684b..30ec2f6 100644 --- 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 0f34d64..fe78b3e 100644 --- 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 " RECIPE_MAINTAINER_pn-connman = "Cristian Iorga " RECIPE_MAINTAINER_pn-connman-gnome = "Cristian Iorga " RECIPE_MAINTAINER_pn-console-tools = "Saul Wold " -RECIPE_MAINTAINER_pn-contacts = "Valentin Popa " RECIPE_MAINTAINER_pn-core-image-base = "Saul Wold " RECIPE_MAINTAINER_pn-core-image-basic = "Saul Wold " RECIPE_MAINTAINER_pn-core-image-core = "Saul Wold " @@ -116,7 +115,6 @@ RECIPE_MAINTAINER_pn-cronie = "Radu Moisan " RECIPE_MAINTAINER_pn-curl = "Radu Moisan " RECIPE_MAINTAINER_pn-cwautomacros = "Cristian Iorga " RECIPE_MAINTAINER_pn-damageproto = "Valentin Popa " -RECIPE_MAINTAINER_pn-dates = "Valentin Popa " RECIPE_MAINTAINER_pn-db = "Cristian Iorga " RECIPE_MAINTAINER_pn-dbus = "Cristian Iorga " RECIPE_MAINTAINER_pn-dbus-glib = "Scott Garman " @@ -606,7 +604,6 @@ RECIPE_MAINTAINER_pn-sysvinit = "Saul Wold " RECIPE_MAINTAINER_pn-taglib = "Cristian Iorga " RECIPE_MAINTAINER_pn-tar = "Scott Garman " RECIPE_MAINTAINER_pn-task-base = "Saul Wold " -RECIPE_MAINTAINER_pn-task-core-apps-x11-pimlico = "Cristian Iorga " RECIPE_MAINTAINER_pn-task-core-basic = "Saul Wold " RECIPE_MAINTAINER_pn-task-core-boot = "Saul Wold " RECIPE_MAINTAINER_pn-task-core-clutter = "Ross Burton " @@ -624,7 +621,6 @@ RECIPE_MAINTAINER_pn-task-core-tools-testapps = "Saul Wold RECIPE_MAINTAINER_pn-task-core-x11 = "Saul Wold " RECIPE_MAINTAINER_pn-task-core-x11-sato = "Saul Wold " RECIPE_MAINTAINER_pn-task-sdk-host = "Saul Wold " -RECIPE_MAINTAINER_pn-tasks = "Valentin Popa " RECIPE_MAINTAINER_pn-tcf-agent = "Bogdan Marinescu " RECIPE_MAINTAINER_pn-tcl = "Bogdan Marinescu " RECIPE_MAINTAINER_pn-tcp-wrappers = "Radu Moisan " diff --git a/meta-yocto/conf/distro/include/poky-floating-revisions.inc b/meta-yocto/conf/distro/include/poky-floating-revisions.inc index 46fcbdc..af8ef11 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}" #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 b3f9b46..6139429 100644 --- 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 d34d980..bdd45cd 100644 --- 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" -- cgit v1.1