From b9d119f0d5b7843e572cbc1dae5a479ef2030d8b Mon Sep 17 00:00:00 2001
From: Joonsub Lee <joon-sub.lee@samsung.com>
Date: Fri, 8 Apr 2016 14:16:01 +0900
Subject: [PATCH] [TRE-134/148/151/152] Add/Replace packages

* Added
platform/core/system/system-popup - Mobile/TV/Wearable
platform/adaptation/emulator/nfc-plugin-emul - Mobile/Wearable
platform/core/accessibility/screen-reader - Mobile/Wearable/IVI

* Replaced
platform/core/uifw/at-spi2-atk to platform/upstream/at-spi2-atk - Mobile/TV/Wearable/IVI
profile/tv/apps/native/screen-reader to platform/core/accessibility/screen-reader - TV

Change-Id: I6152e4d54aeb47f55727cec381188dd87913da8c
Signed-off-by: Joonsub Lee <joon-sub.lee@samsung.com>
---
 profiles/tizen_ivi.xml      | 3 ++-
 profiles/tizen_mobile.xml   | 5 ++++-
 profiles/tizen_tv.xml       | 5 +++--
 profiles/tizen_wearable.xml | 5 ++++-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/profiles/tizen_ivi.xml b/profiles/tizen_ivi.xml
index 06884f4..40353ab 100644
--- a/profiles/tizen_ivi.xml
+++ b/profiles/tizen_ivi.xml
@@ -56,6 +56,7 @@
     <project name="platform/adaptation/setup-scripts" OBS_package="setup-scripts"/>
     <project name="platform/adaptation/system-plugin" OBS_package="system-plugin"/>
     <project name="platform/adaptation/xu3/model-config-xu3" OBS_package="model-config-xu3"/>
+    <project name="platform/core/accessibility/screen-reader" OBS_package="org.tizen.screen-reader" />
     <project name="platform/core/account/account-common" OBS_package="account-common"/>
     <project name="platform/core/account/account-manager" OBS_package="account-manager"/>
     <project name="platform/core/account/account-parser" OBS_package="account-aparser"/>
@@ -298,7 +299,6 @@
     <project name="platform/core/telephony/tel-plugin-vconf" OBS_package="tel-plugin-vconf"/>
     <project name="platform/core/telephony/tel-plugin-vmodem" OBS_package="tel-plugin-vmodem"/>
     <project name="platform/core/uifw/anthy" OBS_package="anthy"/>
-    <project name="platform/core/uifw/at-spi2-atk" OBS_package="at-spi2-atk"/>
     <project name="platform/core/uifw/coregl" OBS_package="coregl"/>
     <project name="platform/core/uifw/dali-adaptor" OBS_package="dali-adaptor"/>
     <project name="platform/core/uifw/dali-core" OBS_package="dali-core"/>
@@ -363,6 +363,7 @@
     <project name="platform/upstream/asciidoc" OBS_package="asciidoc"/>
     <project name="platform/upstream/aspell" OBS_package="aspell"/>
     <project name="platform/upstream/atk" OBS_package="atk"/>
+    <project name="platform/upstream/at-spi2-atk" OBS_package="at-spi2-atk" />
     <project name="platform/upstream/at-spi2-core" OBS_package="at-spi2-core"/>
     <project name="platform/upstream/augeas" OBS_package="augeas"/>
     <project name="platform/upstream/avahi" OBS_package="avahi"/>
diff --git a/profiles/tizen_mobile.xml b/profiles/tizen_mobile.xml
index 196977a..cc2e215 100644
--- a/profiles/tizen_mobile.xml
+++ b/profiles/tizen_mobile.xml
@@ -31,6 +31,7 @@
     <project name="platform/adaptation/emulator/gst-plugins-emulator" OBS_package="gst-plugins-emulator" />
     <project name="platform/adaptation/emulator/libtbm-vigs" OBS_package="libtbm-vigs" />
     <project name="platform/adaptation/emulator/model-config-emulator" OBS_package="model-config-emulator" />
+    <project name="platform/adaptation/emulator/nfc-plugin-emul" OBS_package="nfc-plugin-emul" />
     <project name="platform/adaptation/emulator/system-plugin-emulator" OBS_package="system-plugin-emulator" />
     <project name="platform/adaptation/emulator/vmodem-daemon-emulator" OBS_package="vmodemd-emul" />
     <project name="platform/adaptation/emulator/xf86-misc-vigs" OBS_package="xf86-misc-vigs" />
@@ -58,6 +59,7 @@
     <project name="platform/adaptation/tm1/model-config-tm1" OBS_package="model-config-tm1" />
     <project name="platform/adaptation/tm1/sensor-hal-tm1" OBS_package="sensor-hal-tm1" />
     <project name="platform/adaptation/tm1/sensor-plugins-tm1" OBS_package="sensor-plugins-tm1" />
+    <project name="platform/core/accessibility/screen-reader" OBS_package="org.tizen.screen-reader" />
     <project name="platform/core/account/account-common" OBS_package="account-common" />
     <project name="platform/core/account/account-manager" OBS_package="account-manager" />
     <project name="platform/core/account/account-parser" OBS_package="account-parser" />
@@ -279,6 +281,7 @@
     <project name="platform/core/system/sensord" OBS_package="sensord" />
     <project name="platform/core/system/swap-manager" OBS_package="swap-manager" />
     <project name="platform/core/system/swap-probe" OBS_package="swap-probe" />
+    <project name="platform/core/system/system-popup" OBS_package="system-servant" />
     <project name="platform/core/system/tlm" OBS_package="tlm" />
     <project name="platform/core/telephony/call-manager" OBS_package="call-manager" />
     <project name="platform/core/telephony/libcall-manager" OBS_package="libcall-manager" />
@@ -295,7 +298,6 @@
     <project name="platform/core/telephony/tel-plugin-vconf" OBS_package="tel-plugin-vconf" />
     <project name="platform/core/telephony/tel-plugin-vmodem" OBS_package="tel-plugin-vmodem" />
     <project name="platform/core/uifw/anthy" OBS_package="anthy" />
-    <project name="platform/core/uifw/at-spi2-atk" OBS_package="at-spi2-atk" />
     <project name="platform/core/uifw/coregl" OBS_package="coregl" />
     <project name="platform/core/uifw/dali-adaptor" OBS_package="dali-adaptor" />
     <project name="platform/core/uifw/dali-core" OBS_package="dali" />
@@ -359,6 +361,7 @@
     <project name="platform/upstream/asciidoc" OBS_package="asciidoc" />
     <project name="platform/upstream/aspell" OBS_package="aspell" />
     <project name="platform/upstream/atk" OBS_package="atk" />
+    <project name="platform/upstream/at-spi2-atk" OBS_package="at-spi2-atk" />
     <project name="platform/upstream/at-spi2-core" OBS_package="at-spi2-core" />
     <project name="platform/upstream/augeas" OBS_package="augeas" />
     <project name="platform/upstream/avahi" OBS_package="avahi" />
diff --git a/profiles/tizen_tv.xml b/profiles/tizen_tv.xml
index f06a8e2..898e14b 100644
--- a/profiles/tizen_tv.xml
+++ b/profiles/tizen_tv.xml
@@ -47,6 +47,7 @@
     <project name="platform/adaptation/setup-scripts" OBS_package="setup-scripts" />
     <project name="platform/adaptation/system-plugin" OBS_package="system-plugin" />
     <project name="platform/adaptation/xu3/model-config-xu3" OBS_package="model-config-xu3" />
+    <project name="platform/core/accessibility/screen-reader" OBS_package="org.tizen.screen-reader" />
     <project name="platform/core/api/app-manager" OBS_package="capi-appfw-app-manager" />
     <project name="platform/core/api/application" OBS_package="capi-appfw-application" />
     <project name="platform/core/api/audio-io" OBS_package="capi-media-audio-io" />
@@ -244,6 +245,7 @@
     <project name="platform/core/system/sensord" OBS_package="sensord" />
     <project name="platform/core/system/swap-manager" OBS_package="swap-manager" />
     <project name="platform/core/system/swap-probe" OBS_package="swap-probe" />
+    <project name="platform/core/system/system-popup" OBS_package="system-servant" />
     <project name="platform/core/system/tlm" OBS_package="tlm" />
     <project name="platform/core/telephony/call-manager" OBS_package="call-manager" />
     <project name="platform/core/telephony/libcall-manager" OBS_package="libcall-manager" />
@@ -259,7 +261,6 @@
     <project name="platform/core/telephony/tel-plugin-vmodem" OBS_package="tel-plugin-vmodem" />
     <project name="platform/core/telephony/telephony-daemon" OBS_package="telephony-daemon" />
     <project name="platform/core/uifw/anthy" OBS_package="anthy" />
-    <project name="platform/core/uifw/at-spi2-atk" OBS_package="at-spi2-atk" />
     <project name="platform/core/uifw/coregl" OBS_package="coregl" />
     <project name="platform/core/uifw/dali-adaptor" OBS_package="dali-adaptor" />
     <project name="platform/core/uifw/dali-core" OBS_package="dali" />
@@ -321,6 +322,7 @@
     <project name="platform/upstream/alsa-utils" OBS_package="alsa-utils" />
     <project name="platform/upstream/asciidoc" OBS_package="asciidoc" />
     <project name="platform/upstream/aspell" OBS_package="aspell" />
+    <project name="platform/upstream/at-spi2-atk" OBS_package="at-spi2-atk" />
     <project name="platform/upstream/at-spi2-core" OBS_package="at-spi2-core" />
     <project name="platform/upstream/atk" OBS_package="atk" />
     <project name="platform/upstream/augeas" OBS_package="augeas" />
@@ -591,7 +593,6 @@
     <project name="profile/tv/apps/native/air_mediahub" OBS_package="org.tizen.mediahub" />
     <project name="profile/tv/apps/native/air_settings" OBS_package="org.tizen.settings" />
     <project name="profile/tv/apps/native/air_volume" OBS_package="org.tizen.volume" />
-    <project name="profile/tv/apps/native/screen-reader" OBS_package="org.tizen.screen-reader" />
     <project name="profile/tv/apps/native/settings" OBS_package="settings" />
     <project name="profile/tv/apps/native/utils/app-utils" OBS_package="app-utils" />
     <project name="profile/tv/meta-tv" OBS_package="meta-tv" />
diff --git a/profiles/tizen_wearable.xml b/profiles/tizen_wearable.xml
index 9440b23..c3f6564 100644
--- a/profiles/tizen_wearable.xml
+++ b/profiles/tizen_wearable.xml
@@ -29,6 +29,7 @@
     <project name="platform/adaptation/emulator/gst-plugins-emulator" OBS_package="gst-plugins-emulator" />
     <project name="platform/adaptation/emulator/libtbm-vigs" OBS_package="libtbm-vigs" />
     <project name="platform/adaptation/emulator/model-config-emulator" OBS_package="model-config-emulator" />
+    <project name="platform/adaptation/emulator/nfc-plugin-emul" OBS_package="nfc-plugin-emul" />
     <project name="platform/adaptation/emulator/system-plugin-emulator" OBS_package="system-plugin-emulator" />
     <project name="platform/adaptation/emulator/vmodem-daemon-emulator" OBS_package="vmodemd-emul" />
     <project name="platform/adaptation/emulator/xf86-misc-vigs" OBS_package="xf86-misc-vigs" />
@@ -49,6 +50,7 @@
     <project name="platform/adaptation/system-plugin" OBS_package="system-plugin" />
     <project name="platform/adaptation/tw1/model-config-tw1" OBS_package="model-config-tw1" />
     <project name="platform/adaptation/tw1/sensor-hal-tw1" OBS_package="sensor-hal-tw1" />
+    <project name="platform/core/accessibility/screen-reader" OBS_package="org.tizen.screen-reader" />
     <project name="platform/core/account/account-common" OBS_package="account-common" />
     <project name="platform/core/account/account-manager" OBS_package="account-manager" />
     <project name="platform/core/account/account-parser" OBS_package="account-parser" />
@@ -261,6 +263,7 @@
     <project name="platform/core/system/sensord" OBS_package="sensord" />
     <project name="platform/core/system/swap-manager" OBS_package="swap-manager" />
     <project name="platform/core/system/swap-probe" OBS_package="swap-probe" />
+    <project name="platform/core/system/system-popup" OBS_package="system-servant" />
     <project name="platform/core/system/tlm" OBS_package="tlm" />
     <project name="platform/core/telephony/call-manager" OBS_package="call-manager" />
     <project name="platform/core/telephony/libcall-manager" OBS_package="libcall-manager" />
@@ -277,7 +280,6 @@
     <project name="platform/core/telephony/tel-plugin-vmodem" OBS_package="tel-plugin-vmodem" />
     <project name="platform/core/telephony/telephony-daemon" OBS_package="telephony-daemon" />
     <project name="platform/core/uifw/anthy" OBS_package="anthy" />
-    <project name="platform/core/uifw/at-spi2-atk" OBS_package="at-spi2-atk" />
     <project name="platform/core/uifw/coregl" OBS_package="coregl" />
     <project name="platform/core/uifw/dali-adaptor" OBS_package="dali-adaptor" />
     <project name="platform/core/uifw/dali-core" OBS_package="dali" />
@@ -339,6 +341,7 @@
     <project name="platform/upstream/alsa-utils" OBS_package="alsa-utils" />
     <project name="platform/upstream/asciidoc" OBS_package="asciidoc" />
     <project name="platform/upstream/aspell" OBS_package="aspell" />
+    <project name="platform/upstream/at-spi2-atk" OBS_package="at-spi2-atk" />
     <project name="platform/upstream/at-spi2-core" OBS_package="at-spi2-core" />
     <project name="platform/upstream/atk" OBS_package="atk" />
     <project name="platform/upstream/augeas" OBS_package="augeas" />
-- 
2.7.4