Revert "Revert "remove globally-shared resource from package""

This reverts commit a0b3ee9310c5a467a017b9403c3b48b20532ffcd.

Change-Id: Idbd96c67cbec78ad24ddaa8e02667105d510eaa7

diff --git a/packaging/org.tizen.setting.spec b/packaging/org.tizen.setting.spec
index 72c26e311738b2dcae14196bbb2cdd9eaa1c12a8..638e2fccb44eabd5f62e93a81ee7fef66ff53bf0 100755 (executable)
--- a/packaging/org.tizen.setting.spec
+++ b/packaging/org.tizen.setting.spec
@@ -219,6 +219,3 @@ mkdir -p %{_prefix}/apps/org.tizen.mode-syspopup/bin/
 %{PREFIX}/res/edje/*
 %{PREFIX}/res/icons/*
 %{PREFIX}/res/images/*
-
-%{TZ_SYS_GLOBALUSER_DATA}/settings/*
-

diff --git a/resource/media/settings/Alerts/General notification_sdk.wav b/resource/media/settings/Alerts/General notification_sdk.wav
deleted file mode 100644 (file)
index 6487389..0000000
Binary files a/resource/media/settings/Alerts/General notification_sdk.wav and /dev/null differ

diff --git a/resource/media/settings/Ringtones/ringtone_sdk.mp3 b/resource/media/settings/Ringtones/ringtone_sdk.mp3
deleted file mode 100644 (file)
index f159e35..0000000
Binary files a/resource/media/settings/Ringtones/ringtone_sdk.mp3 and /dev/null differ

diff --git a/resource/media/settings/Wallpapers/home_001.png b/resource/media/settings/Wallpapers/home_001.png
deleted file mode 100644 (file)
index ba5cd1e..0000000
Binary files a/resource/media/settings/Wallpapers/home_001.png and /dev/null differ

diff --git a/resource/media/settings/Wallpapers/home_002.png b/resource/media/settings/Wallpapers/home_002.png
deleted file mode 100644 (file)
index 76780cd..0000000
Binary files a/resource/media/settings/Wallpapers/home_002.png and /dev/null differ

diff --git a/resource/media/settings/Wallpapers/home_003.png b/resource/media/settings/Wallpapers/home_003.png
deleted file mode 100644 (file)
index bc6bd1a..0000000
Binary files a/resource/media/settings/Wallpapers/home_003.png and /dev/null differ

diff --git a/resource/media/settings/Wallpapers/home_004.png b/resource/media/settings/Wallpapers/home_004.png
deleted file mode 100644 (file)
index 5beb79e..0000000
Binary files a/resource/media/settings/Wallpapers/home_004.png and /dev/null differ

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2b8ac7cec1280829f4f7b64cc7561107d27a6169..328954b0a220d0527f029beb5a279b72db69fe69 100755 (executable)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -130,8 +130,6 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/${SETTING_PKG_NAME}.png DESTINATION ${TZ_SYS_R
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/icons DESTINATION ${TZ_SYS_RO_APP}/${SETTING_PKG_NAME}/res FILES_MATCHING PATTERN "*.png")
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/images DESTINATION ${TZ_SYS_RO_APP}/${SETTING_PKG_NAME}/res FILES_MATCHING PATTERN "*.png")
 
-# install media-data ; should be at /usr/share
-INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/media/settings DESTINATION ${TZ_SYS_GLOBALUSER_DATA} PATTERN "*")
 #IF("${BUILD_ARCH}" STREQUAL "arm")
 #      INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/media-data-sdk/settings DESTINATION ${TZ_SYS_RO_APP}/org.tizen.setting/shared/res PATTERN "*")
 #ELSE("${BUILD_ARCH}" STREQUAL "arm")