projects / apps / core / preloaded / message-app.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2649bae)
Change application path from '/opt' to '/usr'.
authorJaeyun Jeong <jyjeong@samsung.com>
Sat, 10 Nov 2012 02:10:11 +0000 (11:10 +0900)
committerJaeyun Jeong <jyjeong@samsung.com>
Sat, 10 Nov 2012 02:18:16 +0000 (11:18 +0900)
Change-Id: I752cd122cfbf36aa9d478afdb35cf7f4e22a405f

CMakeLists.txt patch | blob | history
composer/include/msg-ui-composer-res.h patch | blob | history
debian/rules patch | blob | history
main/CMakeLists.txt patch | blob | history
org.tizen.message.manifest patch | blob | history
org.tizen.message.xml.emul patch | blob | history
org.tizen.message.xml.target patch | blob | history
packaging/org.tizen.message.spec patch | blob | history

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 589d35f..d8e2ff7 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,12 +13,12 @@ SET(CMAKE_SOURCE_DIALOG_DIR "${CMAKE_SOURCE_DIR}/dialog")
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(BINDIR "${PREFIX}/bin")
 SET(RESDIR "${PREFIX}/res")
-SET(DATADIR "${PREFIX}/data")
+SET(DATADIR ${CMAKE_INSTALL_DATADIR})
 SET(LOCALEDIR "${RESDIR}/locale")
 SET(ICONDIR "${RESDIR}/icons/default/small")
 SET(IMGDIR "${RESDIR}/images")
 SET(EDJDIR "${RESDIR}/edje")
-SET(UGDIR "/opt/ug/lib")
+SET(UGDIR "/usr/ug/lib")
 SET(LIBDIR "${PREFIX}/lib")
 
 ADD_DEFINITIONS("-DPREFIX=\"${PREFIX}\"")
diff --git a/composer/include/msg-ui-composer-res.h b/composer/include/msg-ui-composer-res.h
index 84e2559..b089905 100755 (executable)
--- a/composer/include/msg-ui-composer-res.h
+++ b/composer/include/msg-ui-composer-res.h
@@ -31,7 +31,7 @@
 #endif
 
 #ifndef PREFIX
-#define PREFIX "/opt/apps/" PKGNAME
+#define PREFIX "/usr/apps/" PKGNAME
 #endif
 
 #ifndef RESDIR
diff --git a/debian/rules b/debian/rules
index 9fead62..811ab78 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -11,9 +11,9 @@
 
 CFLAGS += -Wall -g
 LDFLAGS ?= 
-PREFIX ?= /opt/apps/org.tizen.message
-RESDIR ?= /opt/apps/org.tizen.message/res
-DATADIR ?= /opt/apps/org.tizen.message/data
+PREFIX ?= /usr/apps/org.tizen.message
+RESDIR ?= /usr/apps/org.tizen.message/res
+DATADIR ?= /opt/usr/apps/org.tizen.message/data
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
        CFLAGS += -O0
diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
index c3fdcca..bf2d55f 100755 (executable)
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -56,12 +56,12 @@ IF("${ARCH}" MATCHES "^arm.*")
 ELSE("${ARCH}" MATCHES "^arm.*")
         CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/${PKGNAME}.xml.emul ${CMAKE_SOURCE_DIR}/${PKGNAME}.xml)
 ENDIF("${ARCH}" MATCHES "^arm.*")
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/${PKGNAME}.xml DESTINATION /opt/share/packages)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/${PKGNAME}.xml DESTINATION /usr/share/packages)
 INSTALL(FILES ${CMAKE_SOURCE_COMMON_DIR}/data/image/${PKGNAME}.png DESTINATION ${ICONDIR})
 INSTALL(FILES ${CMAKE_SOURCE_COMMON_DIR}/data/image/${PKGNAME}.voice.png DESTINATION ${ICONDIR})
 INSTALL(FILES ${CMAKE_SOURCE_COMMON_DIR}/data/image/${PKGNAME}.cb.png DESTINATION ${ICONDIR})
 INSTALL(FILES ${CMAKE_SOURCE_COMMON_DIR}/data/image/${PKGNAME}.noti.png DESTINATION ${ICONDIR})
-INSTALL(FILES ${CMAKE_SOURCE_COMMON_DIR}/data/image/${PKGNAME}.png DESTINATION /opt/share/icons/default/small)
+INSTALL(FILES ${CMAKE_SOURCE_COMMON_DIR}/data/image/${PKGNAME}.png DESTINATION /usr/share/icons/default/small)
 INSTALL(DIRECTORY ${CMAKE_SOURCE_COMMON_DIR}/data/image/ DESTINATION ${IMGDIR} FILES_MATCHING PATTERN "*.png")
 INSTALL(DIRECTORY ${CMAKE_SOURCE_COMMON_DIR}/data/image/ DESTINATION ${IMGDIR} FILES_MATCHING PATTERN "*.PNG")
 INSTALL(DIRECTORY DESTINATION ${DATADIR})
diff --git a/org.tizen.message.manifest b/org.tizen.message.manifest
index 19f89de..0822c75 100755 (executable)
--- a/org.tizen.message.manifest
+++ b/org.tizen.message.manifest
@@ -6,11 +6,11 @@
                </provide>\r
        </define>\r
        <assign>\r
-               <filesystem path="/opt/share/packages/org.tizen.message.xml" label="_" />\r
-               <filesystem path="/opt/share/applications/org.tizen.message.desktop" label="_" />\r
-               <filesystem path="/opt/share/applications/org.tizen.msg-ui-class0.desktop" label="_" />\r
-               <filesystem path="/opt/share/applications/org.tizen.msg-composer-efl.desktop" label="_" />\r
-               <filesystem path="/opt/share/icons/default/small/org.tizen.message.png" label="_" />\r
+               <filesystem path="/usr/share/packages/org.tizen.message.xml" label="_" />\r
+               <filesystem path="/usr/share/applications/org.tizen.message.desktop" label="_" />\r
+               <filesystem path="/usr/share/applications/org.tizen.msg-ui-class0.desktop" label="_" />\r
+               <filesystem path="/usr/share/applications/org.tizen.msg-composer-efl.desktop" label="_" />\r
+               <filesystem path="/usr/share/icons/default/small/org.tizen.message.png" label="_" />\r
        </assign>\r
        <request>\r
                <domain name="org.tizen.message"/>\r
diff --git a/org.tizen.message.xml.emul b/org.tizen.message.xml.emul
index 2fb2182..fe72119 100755 (executable)
--- a/org.tizen.message.xml.emul
+++ b/org.tizen.message.xml.emul
@@ -3,7 +3,7 @@
        <label>Message</label>
        <author email="jyjeong@samsung.com" href="www.samsung.com">Jaeyun Jeong</author>
        <description>Message Application</description>
-       <ui-application appid="org.tizen.message" exec="/opt/apps/org.tizen.message/bin/message" nodisplay="false" multiple="false" type="capp" taskmanage="true">
+       <ui-application appid="org.tizen.message" exec="/usr/apps/org.tizen.message/bin/message" nodisplay="false" multiple="false" type="capp" taskmanage="true">
                <icon>org.tizen.message.png</icon>
                <label>Messages</label>
                <label xml:lang="en-us">Messages</label>
@@ -22,12 +22,12 @@
                <label xml:lang="fr-fr">Messages</label>
                <label xml:lang="ko-kr">메시지</label>
        </ui-application>
-       <ui-application appid="org.tizen.msg-ui-class0" exec="/opt/apps/org.tizen.message/bin/msg-ui-class0" nodisplay="true" multiple="false" type="capp" taskmanage="true">
+       <ui-application appid="org.tizen.msg-ui-class0" exec="/usr/apps/org.tizen.message/bin/msg-ui-class0" nodisplay="true" multiple="false" type="capp" taskmanage="true">
                <label>Msg-ui-class0</label>
                <label xml:lang="en-us">Class0 message viewer</label>
                <label xml:lang="ko-kr">메시지</label>
        </ui-application>
-       <ui-application appid="msg-composer-efl" exec="/opt/ug/bin/msg-composer-efl" nodisplay="true" multiple="true" type="capp" taskmanage="false">
+       <ui-application appid="msg-composer-efl" exec="/usr/ug/bin/msg-composer-efl" nodisplay="true" multiple="true" type="capp" taskmanage="false">
                <icon>org.tizen.message.png</icon>
                <label>Message</label>
                <label xml:lang="en-us">Message</label>
diff --git a/org.tizen.message.xml.target b/org.tizen.message.xml.target
index d9758e8..7f9346b 100755 (executable)
--- a/org.tizen.message.xml.target
+++ b/org.tizen.message.xml.target
@@ -3,7 +3,7 @@
        <label>Message</label>
        <author email="jyjeong@samsung.com" href="www.samsung.com">Jaeyun Jeong</author>
        <description>Message Application</description>
-       <ui-application appid="org.tizen.message" exec="/opt/apps/org.tizen.message/bin/message" nodisplay="false" multiple="false" type="capp" taskmanage="true">
+       <ui-application appid="org.tizen.message" exec="/usr/apps/org.tizen.message/bin/message" nodisplay="false" multiple="false" type="capp" taskmanage="true">
                <icon>org.tizen.message.png</icon>
                <label>Messages</label>
                <label xml:lang="en-us">Messages</label>
@@ -46,12 +46,12 @@
                        <mime name="*/*"/>
                </application-service>
        </ui-application>
-       <ui-application appid="org.tizen.msg-ui-class0" exec="/opt/apps/org.tizen.message/bin/msg-ui-class0" nodisplay="true" multiple="false" type="capp" taskmanage="true">
+       <ui-application appid="org.tizen.msg-ui-class0" exec="/usr/apps/org.tizen.message/bin/msg-ui-class0" nodisplay="true" multiple="false" type="capp" taskmanage="true">
                <label>Msg-ui-class0</label>
                <label xml:lang="en-us">Class0 message viewer</label>
                <label xml:lang="ko-kr">메시지</label>
        </ui-application>
-       <ui-application appid="msg-composer-efl" exec="/opt/ug/bin/msg-composer-efl" nodisplay="true" multiple="true" type="capp" taskmanage="false">
+       <ui-application appid="msg-composer-efl" exec="/usr/ug/bin/msg-composer-efl" nodisplay="true" multiple="true" type="capp" taskmanage="false">
                <icon>org.tizen.message.png</icon>
                <label>Message</label>
                <label xml:lang="en-us">Message</label>
diff --git a/packaging/org.tizen.message.spec b/packaging/org.tizen.message.spec
index 5f15bd5..2f86fa6 100755 (executable)
--- a/packaging/org.tizen.message.spec
+++ b/packaging/org.tizen.message.spec
@@ -1,6 +1,6 @@
 Name:       org.tizen.message
 Summary:    message application
-Version:    0.8.23
+Version:    0.8.24
 Release:    1
 Group:      devel
 License:    Samsung
@@ -52,11 +52,11 @@ message application.
 
 %build
 
-%define PREFIX    "/opt/apps/org.tizen.message"
-%define RESDIR    "/opt/apps/org.tizen.message/res"
-%define DATADIR    "/opt/apps/org.tizen.message/data"
+%define PREFIX    "/usr/apps/org.tizen.message"
+%define RESDIR    "/usr/apps/org.tizen.message/res"
+%define DATADIR    "/opt/usr/apps/org.tizen.message/data"
 LDFLAGS+="-Wl,--rpath=%{PREFIX}/lib -Wl,--as-needed -Wl,--hash-style=both"; export LDFLAGS
-cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX}
+cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX} -DCMAKE_INSTALL_DATADIR=%{DATADIR}
 # CMakeLists.Txt needs to be fixed for parallel build to work
 make #%{?jobs:-j%jobs}
 
@@ -68,25 +68,27 @@ rm -rf %{buildroot}
 vconftool set -t int db/private/org.tizen.message/font_size 0 -u 5000
 vconftool set -t int db/private/org.tizen.message/mdm_status 0 -u 5000
 vconftool set -t bool db/private/org.tizen.message/use_volume_key 0 -u 5000
-#mkdir -p %{buildroot}/opt/apps/org.tizen.message/data
-chown -R 5000:5000 /opt/apps/org.tizen.message/data
-mkdir -p /opt/ug/bin
-ln -sf /usr/bin/ug-client /opt/ug/bin/msg-composer-efl
+chown -R 5000:5000 /opt/usr/apps/org.tizen.message/data
+mkdir -p /usr/ug/bin
+ln -sf /usr/bin/ug-client /usr/ug/bin/msg-composer-efl
 
 %files
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
-/opt/apps/org.tizen.message/bin/message
-/opt/apps/org.tizen.message/lib/*
-/opt/apps/org.tizen.message/bin/message-dialog
-/opt/apps/org.tizen.message/bin/msg-ui-class0
-/opt/share/packages/*.xml
-/opt/apps/org.tizen.message/res/*
-/opt/ug/lib/*.so
-%dir /opt/apps/org.tizen.message/data
-/opt/share/icons/default/small/*.png
+/usr/apps/org.tizen.message/bin/message
+/usr/apps/org.tizen.message/lib/*
+/usr/apps/org.tizen.message/bin/message-dialog
+/usr/apps/org.tizen.message/bin/msg-ui-class0
+/usr/share/packages/*.xml
+/usr/apps/org.tizen.message/res/*
+/usr/ug/lib/*.so
+%dir /opt/usr/apps/org.tizen.message/data
+/usr/share/icons/default/small/*.png
 
 %changelog
+* Sat Nov 10 2012 Jaeyun Jeong <jyjeong@samsung.com>
+- Change application path from '/opt' to '/usr'.
+
 * Fri Oct 26 2012 Jaeyun Jeong <jyjeong@samsung.com>
 - Fix build errors.
 - Fix cmaketext file.
Domain: Applications / Uncategorized;