Apply new directory policy to RSA git branch.

Change-Id: I9ad779735165f094104a0145326d79316fd4b15d

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4f0f87f..f916549 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,7 +15,7 @@ SET(PKGNAME "org.${VENDOR}.${PACKAGE}")
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(BINDIR "${PREFIX}/bin")
 SET(RESDIR "${PREFIX}/res")
-SET(DATADIR "${PREFIX}/data")
+SET(DATADIR "/opt/usr/apps/com.${VENDOR}.${PACKAGE}/data")
 SET(LOCALEDIR "${RESDIR}/locale")
 SET(ICONDIR "/opt/share/icons/default/small")
 SET(IMAGEDIR "${RESDIR}/images/${PACKAGE}")
@@ -82,7 +82,7 @@ INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})
 
 # install desktop file & icon
 #CONFIGURE_FILE(${PKGNAME}.desktop.in ${CMAKE_BINARY_DIR}/${PKGNAME}.desktop)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/${PKGNAME}.xml DESTINATION /opt/share/packages)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/${PKGNAME}.xml DESTINATION /usr/share/packages)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/${PKGNAME}.png DESTINATION ${ICONDIR})
 
 # data

diff --git a/data/images/private/00_volume_icon.png b/data/images/private/00_volume_icon.png
new file mode 100755 (executable)
index 0000000..d9bdd9b
Binary files /dev/null and b/data/images/private/00_volume_icon.png differ

diff --git a/data/images/private/00_volume_icon_Call.png b/data/images/private/00_volume_icon_Call.png
new file mode 100755 (executable)
index 0000000..922b246
Binary files /dev/null and b/data/images/private/00_volume_icon_Call.png differ

diff --git a/data/images/private/00_volume_icon_Mute.png b/data/images/private/00_volume_icon_Mute.png
new file mode 100755 (executable)
index 0000000..bb970b9
Binary files /dev/null and b/data/images/private/00_volume_icon_Mute.png differ

diff --git a/data/images/private/00_volume_icon_Vibrat.png b/data/images/private/00_volume_icon_Vibrat.png
new file mode 100755 (executable)
index 0000000..2528fff
Binary files /dev/null and b/data/images/private/00_volume_icon_Vibrat.png differ

diff --git a/data/images/private/00_volume_icon_headphone.png b/data/images/private/00_volume_icon_headphone.png
new file mode 100755 (executable)
index 0000000..0819ca0
Binary files /dev/null and b/data/images/private/00_volume_icon_headphone.png differ

diff --git a/data/images/private/00_volume_icon_media.png b/data/images/private/00_volume_icon_media.png
new file mode 100755 (executable)
index 0000000..39b0abe
Binary files /dev/null and b/data/images/private/00_volume_icon_media.png differ

diff --git a/data/images/private/00_volume_icon_settings.png b/data/images/private/00_volume_icon_settings.png
new file mode 100755 (executable)
index 0000000..645d51b
Binary files /dev/null and b/data/images/private/00_volume_icon_settings.png differ

diff --git a/data/images/private/00_volume_icon_settings_pressed.png b/data/images/private/00_volume_icon_settings_pressed.png
new file mode 100755 (executable)
index 0000000..71cdb7b
Binary files /dev/null and b/data/images/private/00_volume_icon_settings_pressed.png differ

diff --git a/data/images/private/00_winset_divider_line.png b/data/images/private/00_winset_divider_line.png
index b10e249..e287978 100755 (executable)
Binary files a/data/images/private/00_winset_divider_line.png and b/data/images/private/00_winset_divider_line.png differ

diff --git a/org.tizen.volume.xml b/org.tizen.volume.xml
index 1f8167d..db2fab6 100755 (executable)
--- a/org.tizen.volume.xml
+++ b/org.tizen.volume.xml
@@ -3,7 +3,7 @@
        <label>Volume</label>\r
        <author email="hhh.kwon@samsung.com" href="www.samsung.com">Hong Kwon</author>\r
        <description>Volume Application</description>\r
-       <ui-application appid="org.tizen.volume" exec="/opt/apps/org.tizen.volume/bin/volume" nodisplay="true" multiple="false" type="capp" taskmanage="false">\r
+       <ui-application appid="org.tizen.volume" exec="/usr/apps/org.tizen.volume/bin/volume" nodisplay="true" multiple="false" type="capp" taskmanage="false">\r
                <icon>org.tizen.volume.png</icon>\r
                <label>Volume</label>\r
        </ui-application>\r

diff --git a/packaging/org.tizen.volume.spec b/packaging/org.tizen.volume.spec
index 067daef..7298249 100755 (executable)
--- a/packaging/org.tizen.volume.spec
+++ b/packaging/org.tizen.volume.spec
@@ -25,7 +25,7 @@ volume.
 %prep
 %setup -q
 
-%define PREFIX /opt/apps/org.tizen.volume
+%define PREFIX /usr/apps/org.tizen.volume
 
 %build
 RPM_OPT=`echo $CFLAGS|sed 's/-Wp,-D_FORTIFY_SOURCE=2//'`
@@ -42,5 +42,5 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{PREFIX}/bin/*
 %{PREFIX}/res/*
-/opt/share/packages/org.tizen.volume.xml
 /opt/share/icons/default/small/org.tizen.volume.png
+/usr/share/packages/org.tizen.volume.xml

diff --git a/src/volume.h b/src/volume.h
index 7707d79..4f827b2 100755 (executable)
--- a/src/volume.h
+++ b/src/volume.h
@@ -30,7 +30,7 @@
 #endif
 
 #if !defined(RESDIR)
-#  define RESDIR "/opt/apps/com.samsung.volume/res"
+#  define RESDIR "/usr/apps/com.samsung.volume/res"
 #endif
 
 #if !defined(LOCALEDIR)

diff --git a/volume.manifest b/volume.manifest
index dcd49c0..fd570ed 100644 (file)
--- a/volume.manifest
+++ b/volume.manifest
@@ -6,6 +6,6 @@
                <domain name="volume"/>
        </request>
        <assign>
-               <filesystem path="/opt/apps/org.tizen.volume/bin/volume" exec_label="volume"/>
+               <filesystem path="/usr/apps/org.tizen.volume/bin/volume" exec_label="volume"/>
        </assign>
 </manifest>