From a2414f65ea1fe7cddfb8d24f332bde7f7d0abd50 Mon Sep 17 00:00:00 2001
From: Shinwoo Kim <cinoo.kim@samsung.com>
Date: Wed, 10 Oct 2018 13:46:40 +0900
Subject: [PATCH] Change package name with profile name.

[Issue]
Wearable profile image happened to use mobile accessibility-setting
and got a crash because the package name is same.

[Solution]
Change package name to org.tizen.accessibility-setting-wearable
from org.tizen.accessibility-setting to distinguish package name.

Change-Id: I401ab234c02f7d6c8c9107e874a1baf1a01ca364
---
 CMakeLists.txt                                           | 4 ++--
 ...ty-setting.edc => accessibility-setting-wearable.edc} | 0
 include/setting-accessibility.h                          | 4 ++--
 ... => org.tizen.accessibility-setting-wearable.manifest | 0
 org.tizen.accessibility-setting-wearable.xml             | 9 +++++++++
 org.tizen.accessibility-setting.xml                      | 9 ---------
 ...pec => org.tizen.accessibility-setting-wearable.spec} | 4 ++--
 7 files changed, 15 insertions(+), 15 deletions(-)
 rename data/edc/{accessibility-setting.edc => accessibility-setting-wearable.edc} (100%)
 rename org.tizen.accessibility-setting.manifest => org.tizen.accessibility-setting-wearable.manifest (100%)
 create mode 100644 org.tizen.accessibility-setting-wearable.xml
 delete mode 100644 org.tizen.accessibility-setting.xml
 rename packaging/{org.tizen.accessibility-setting.spec => org.tizen.accessibility-setting-wearable.spec} (91%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 93e6ec1..0d70483 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-PROJECT(accessibility-setting C)
+PROJECT(accessibility-setting-wearable C)
 
 SET(HEADERS)
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
@@ -80,4 +80,4 @@ INSTALL(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.edj DESTINATION ${EDJDIR})
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/${PKGNAME}.xml DESTINATION ${TZ_SYS_RO_PACKAGES})
 
 # i18n
-ADD_SUBDIRECTORY(po)
\ No newline at end of file
+ADD_SUBDIRECTORY(po)
diff --git a/data/edc/accessibility-setting.edc b/data/edc/accessibility-setting-wearable.edc
similarity index 100%
rename from data/edc/accessibility-setting.edc
rename to data/edc/accessibility-setting-wearable.edc
diff --git a/include/setting-accessibility.h b/include/setting-accessibility.h
index b5881e6..f801b1a 100644
--- a/include/setting-accessibility.h
+++ b/include/setting-accessibility.h
@@ -26,8 +26,8 @@
 #include <efl_extension.h>
 
 #define VCONFKEY_SETAPPL_ACCESSIBILITY_TTS "db/setting/accessibility/tts"
-#define SETTING_ACCESSIBILITY_PACKAGE_NAME "accessibility-setting"
-#define EDJE_PATH TZ_SYS_RO_APP_D"/org.tizen.accessibility-setting/res/edje/accessibility-setting.edj"
+#define SETTING_ACCESSIBILITY_PACKAGE_NAME "accessibility-setting-wearable"
+#define EDJE_PATH TZ_SYS_RO_APP_D"/org.tizen.accessibility-setting-wearable/res/edje/accessibility-setting-wearable.edj"
 #define access_gettext(s) dgettext(SETTING_ACCESSIBILITY_PACKAGE_NAME, s)
 
 typedef enum {
diff --git a/org.tizen.accessibility-setting.manifest b/org.tizen.accessibility-setting-wearable.manifest
similarity index 100%
rename from org.tizen.accessibility-setting.manifest
rename to org.tizen.accessibility-setting-wearable.manifest
diff --git a/org.tizen.accessibility-setting-wearable.xml b/org.tizen.accessibility-setting-wearable.xml
new file mode 100644
index 0000000..4dc97e1
--- /dev/null
+++ b/org.tizen.accessibility-setting-wearable.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest xmlns="http://tizen.org/ns/packages" package="org.tizen.accessibility-setting-wearable" version="0.0.1" install-location="internal-only" api-version="3.0">
+	<label>Accessibility Setting for Wearable</label>
+	<description>Accessibility Setting App for Wearable</description>
+	<ui-application appid="org.tizen.accessibility-setting-wearable" exec="accessibility-setting-wearable" nodisplay="true" multiple="false" type="capp" taskmanage="false" mainapp="true" process-pool="true" hw-acceleration="use-GL">
+		<label>Accessibility Setting for Wearable</label>
+		<label xml:lang="en-us">Accessibility Setting for Wearable</label>
+	</ui-application>
+</manifest>
diff --git a/org.tizen.accessibility-setting.xml b/org.tizen.accessibility-setting.xml
deleted file mode 100644
index 5e50b41..0000000
--- a/org.tizen.accessibility-setting.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" package="org.tizen.accessibility-setting" version="0.0.1" install-location="internal-only" api-version="3.0">
-	<label>Accessibility Setting</label>
-	<description>Accessibility Setting App</description>
-	<ui-application appid="org.tizen.accessibility-setting" exec="accessibility-setting" nodisplay="true" multiple="false" type="capp" taskmanage="false" mainapp="true" process-pool="true" hw-acceleration="use-GL">
-		<label>Accessibility Setting</label>
-		<label xml:lang="en-us">Accessibility Setting</label>
-	</ui-application>
-</manifest>
diff --git a/packaging/org.tizen.accessibility-setting.spec b/packaging/org.tizen.accessibility-setting-wearable.spec
similarity index 91%
rename from packaging/org.tizen.accessibility-setting.spec
rename to packaging/org.tizen.accessibility-setting-wearable.spec
index 249c046..d215080 100644
--- a/packaging/org.tizen.accessibility-setting.spec
+++ b/packaging/org.tizen.accessibility-setting-wearable.spec
@@ -1,4 +1,4 @@
-Name:       org.tizen.accessibility-setting
+Name:       org.tizen.accessibility-setting-wearable
 Summary:    Accessibility Setting Application
 Version:    0.0.1
 Release:    1
@@ -18,7 +18,7 @@ BuildRequires:  pkgconfig(efl-extension)
 BuildRequires:  pkgconfig(capi-appfw-application)
 
 %description
-Accessibility setting application.
+Accessibility setting application for wearable
 
 %prep
 %setup -q
-- 
2.34.1