applied the new partition rule.

diff --git a/debian/changelog b/debian/changelog
index f8b8da7fc980d0093630bdd29f0aaa866f018d4a..021047060831fdaa0967551d8bb400387e731061 100755 (executable)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ug-setting-wifidirect-efl (0.7.9) precise; urgency=low
+
+  * applied the new partition rule.
+  * Git: rsa/apps/home/ug-wifi-direct
+  * Tag: libug-setting-wifidirect-efl_0.7.9
+
+ -- sungsik.jang <slowhand@sungsik.jang@samsung.com>  Fri, 09 Nov 2012 17:57:25 +0900
+
 ug-setting-wifidirect-efl (0.7.8) unstable; urgency=low
 
   * set the value "false" of taskmanager in xml so that pop-up App does not appear in TaskManager

diff --git a/debian/libug-setting-wifidirect-efl.install.in b/debian/libug-setting-wifidirect-efl.install.in
index 3e3982d27ff502dfe8bc89b4e0f406c66b162069..3cf9e4294b59dd6862748e6486812eb477927a10 100644 (file)
--- a/debian/libug-setting-wifidirect-efl.install.in
+++ b/debian/libug-setting-wifidirect-efl.install.in
@@ -1,4 +1,4 @@
-/opt/ug/lib/*
-/opt/ug/res/edje/*
-/opt/ug/res/images/*
-/opt/ug/res/locale/*
+/usr/ug/lib/*
+/usr/ug/res/edje/*
+/usr/ug/res/images/*
+/usr/ug/res/locale/*

diff --git a/debian/org.tizen.wifi-direct-popup.install.in b/debian/org.tizen.wifi-direct-popup.install.in
index d34027f20bd2c68662dada1497fb067ba4fb96c7..d01a7857d4ddbdc7074a970f242901457080363a 100755 (executable)
--- a/debian/org.tizen.wifi-direct-popup.install.in
+++ b/debian/org.tizen.wifi-direct-popup.install.in
@@ -1,4 +1,4 @@
-/opt/apps/org.tizen.wifi-direct-popup/bin/*  
-/opt/apps/org.tizen.wifi-direct-popup/res/*  
-/opt/apps/org.tizen.wifi-direct-popup/res/images/*  
-/opt/share/applications/org.tizen.wifi-direct-popup.*
+/usr/apps/org.tizen.wifi-direct-popup/bin/*
+/usr/apps/org.tizen.wifi-direct-popup/res/*
+/usr/apps/org.tizen.wifi-direct-popup/res/images/*
+/usr/share/applications/org.tizen.wifi-direct-popup.*

diff --git a/debian/org.tizen.wifi-direct-ugapp.install.in b/debian/org.tizen.wifi-direct-ugapp.install.in
index a16c4736cbb92a2997009ebd1de9ad8de5eee153..c12a394600729261e717e822880f89b57ba3fa44 100755 (executable)
--- a/debian/org.tizen.wifi-direct-ugapp.install.in
+++ b/debian/org.tizen.wifi-direct-ugapp.install.in
@@ -1,2 +1,2 @@
-/opt/apps/org.tizen.wifi-direct-ugapp/bin/*
-/opt/share/applications/org.tizen.wifi-direct-ugapp.*
+/usr/apps/org.tizen.wifi-direct-ugapp/bin/*
+/usr/share/applications/org.tizen.wifi-direct-ugapp.*

diff --git a/packaging/libug-setting-wifidirect-efl.spec b/packaging/libug-setting-wifidirect-efl.spec
index 3539b3ce5977235449632272b5fcd51b0d1d56c2..1c19e7bde7e0f3bb51428caa350d3ced20c02ed0 100755 (executable)
--- a/packaging/libug-setting-wifidirect-efl.spec
+++ b/packaging/libug-setting-wifidirect-efl.spec
@@ -1,9 +1,9 @@
 #sbs-git:slp/apps/u/ug-wifi-direct libug-setting-wifidirect-efl 0.3.4 82f07b22ef73127a446c49e00b8dca37010b3ee2
-%define PREFIX /opt/ug
+%define PREFIX /usr/ug
 
 Name:       libug-setting-wifidirect-efl
 Summary:    Wi-Fi Direct setting UI gadget 
-Version:    0.7.8
+Version:    0.7.9
 Release:    1
 Group:      TO_BE_FILLED
 License:    Samsung Proprietary License
@@ -77,39 +77,39 @@ make %{?jobs:-j%jobs}
 %install
 rm -rf %{buildroot}
 %make_install
-%__strip %{buildroot}/opt/ug/lib/libug-setting-wifidirect-efl.so.0.1.0
-%__strip %{buildroot}/opt/apps/org.tizen.wifi-direct-ugapp/bin/wifi-direct-ugapp
-%__strip %{buildroot}/opt/apps/org.tizen.wifi-direct-popup/bin/wifi-direct-popup
+%__strip %{buildroot}/usr/ug/lib/libug-setting-wifidirect-efl.so.0.1.0
+%__strip %{buildroot}/usr/apps/org.tizen.wifi-direct-ugapp/bin/wifi-direct-ugapp
+%__strip %{buildroot}/usr/apps/org.tizen.wifi-direct-popup/bin/wifi-direct-popup
 
 %post
-mkdir -p /opt/ug/bin/
-ln -sf /usr/bin/ug-client /opt/ug/bin/ug-setting-wifidirect-efl
+mkdir -p /usr/ug/bin/
+ln -sf /usr/bin/ug-client /usr/ug/bin/ug-setting-wifidirect-efl
 %postun
 
 
 %files
 %manifest libug-setting-wifidirect-efl.manifest
 %defattr(-,root,root,-)
-/opt/ug/lib/*
-/opt/ug/res/images/*
-/opt/ug/res/edje/*
-/opt/ug/res/locale/*/*/*
+/usr/ug/lib/*
+/usr/ug/res/images/*
+/usr/ug/res/edje/*
+/usr/ug/res/locale/*/*/*
 
 %files -n org.tizen.wifi-direct-popup
 %manifest com.samsung.wifi-direct-popup.manifest
 %defattr(-,root,root,-)
-/opt/apps/org.tizen.wifi-direct-popup/bin/*
-/opt/apps/org.tizen.wifi-direct-popup/res/images/*
-/opt/apps/org.tizen.wifi-direct-popup/res/locale/*/*/*
-#/opt/share/applications/org.tizen.wifi-direct-popup.desktop
+/usr/apps/org.tizen.wifi-direct-popup/bin/*
+/usr/apps/org.tizen.wifi-direct-popup/res/images/*
+/usr/apps/org.tizen.wifi-direct-popup/res/locale/*/*/*
+#/usr/share/applications/org.tizen.wifi-direct-popup.desktop
 #for appfw new manifest
-/opt/share/packages/org.tizen.wifi-direct-popup.xml
+/usr/share/packages/org.tizen.wifi-direct-popup.xml
 
 %files -n org.tizen.wifi-direct-ugapp
 %manifest com.samsung.wifi-direct-ugapp.manifest
 %defattr(-,root,root,-)
-/opt/apps/org.tizen.wifi-direct-ugapp/bin/*
-#/opt/share/applications/org.tizen.wifi-direct-ugapp.desktop
+/usr/apps/org.tizen.wifi-direct-ugapp/bin/*
+#/usr/share/applications/org.tizen.wifi-direct-ugapp.desktop
 #for appfw new manifest
-/opt/share/packages/org.tizen.wifi-direct-ugapp.xml
+/usr/share/packages/org.tizen.wifi-direct-ugapp.xml
 

diff --git a/popup-wifidirect/CMakeLists.txt b/popup-wifidirect/CMakeLists.txt
index 0b993db65c16c2a6ce48b4cac9ae7d824cd4cf46..9a81a60b0335d83256c6b3d840946babee60ad8a 100755 (executable)
--- a/popup-wifidirect/CMakeLists.txt
+++ b/popup-wifidirect/CMakeLists.txt
@@ -2,7 +2,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(wifi-direct-popup C)
 SET(PACKAGE_NAME org.tizen.wifi-direct-popup)
 
-SET(PREFIX /opt/apps/${PACKAGE_NAME})
+SET(PREFIX /usr/apps/${PACKAGE_NAME})
 SET(BINDIR "${PREFIX}/bin")
 SET(RESDIR "${PREFIX}/res")
 SET(LOCALEDIR "${RESDIR}/locale")
@@ -37,10 +37,10 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS})
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})
 
 #CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE_NAME}.desktop.in ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}.desktop)
-#INSTALL(FILES ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}.desktop DESTINATION /opt/share/applications)
+#INSTALL(FILES ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}.desktop DESTINATION /usr/share/applications)
 #for appfw new manifest
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE_NAME}.xml ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}.xml)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE_NAME}.xml DESTINATION "/opt/share/packages/")
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE_NAME}.xml DESTINATION "/usr/share/packages/")
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/resources/images/ DESTINATION ${IMGDIR})
 
 ADD_SUBDIRECTORY(po)

diff --git a/popup-wifidirect/include/wfd-app.h b/popup-wifidirect/include/wfd-app.h
index 6dccacde6c1404eb60a85597e830dcdc76e3e818..0bf527e3a5eddf559efda8ba363c073efa6768fa 100755 (executable)
--- a/popup-wifidirect/include/wfd-app.h
+++ b/popup-wifidirect/include/wfd-app.h
@@ -49,7 +49,7 @@
 
 
 #define LOCALE_FILE_NAME "wifi-direct-popup"
-#define LOCALEDIR "/opt/apps/org.tizen.wifi-direct-popup/res/locale"
+#define LOCALEDIR "/usr/apps/org.tizen.wifi-direct-popup/res/locale"
 
 #define _(s)        dgettext(LOCALE_FILE_NAME, s)
 #define N_(s)      dgettext_noop(s)

diff --git a/popup-wifidirect/org.tizen.wifi-direct-popup.xml b/popup-wifidirect/org.tizen.wifi-direct-popup.xml
index 48e26949a10b475822bf638ee540b7179ab513b4..0f82b8da9abd1c48dd7292ba6171e5cc177494cf 100755 (executable)
--- a/popup-wifidirect/org.tizen.wifi-direct-popup.xml
+++ b/popup-wifidirect/org.tizen.wifi-direct-popup.xml
@@ -4,7 +4,7 @@
        <author email="sungsik.jang@samsung.com" href="www.samsung.com">Sungsik Jang</author>
        <author email="dwmax.lee@samsung.com" href="www.samsung.com">Dongwook Lee</author>
        <description>WiFi Direct Popup Application</description>
-       <ui-application appid="org.tizen.wifi-direct-popup" exec="/opt/apps/org.tizen.wifi-direct-popup/bin/wifi-direct-popup" nodisplay="true" multiple="false" type="capp" taskmanage="false">
+       <ui-application appid="org.tizen.wifi-direct-popup" exec="/usr/apps/org.tizen.wifi-direct-popup/bin/wifi-direct-popup" nodisplay="true" multiple="false" type="capp" taskmanage="false">
                <label>WifiDirectPopup</label>
                <label xml:lang="en-us">WifiDirectPopup</label>
        </ui-application>

diff --git a/popup-wifidirect/po/CMakeLists.txt b/popup-wifidirect/po/CMakeLists.txt
index fee12e90b37faf423688f8b843da609780aa3019..3ba67b3e917d0e23000b989db1b722bd15a3d7ae 100644 (file)
--- a/popup-wifidirect/po/CMakeLists.txt
+++ b/popup-wifidirect/po/CMakeLists.txt
@@ -16,7 +16,7 @@ FOREACH(pofile ${POFILES})
                        DEPENDS ${absPofile}
        )
        INSTALL(FILES ${moFile}
-                       DESTINATION /opt/apps/org.tizen.wifi-direct-popup/res/locale/${lang}/LC_MESSAGES RENAME ${PROJECT_NAME}.mo)
+                       DESTINATION /usr/apps/org.tizen.wifi-direct-popup/res/locale/${lang}/LC_MESSAGES RENAME ${PROJECT_NAME}.mo)
        SET(moFiles ${moFiles} ${moFile})
 ENDFOREACH(pofile)
 

diff --git a/ug-wifidirect/CMakeLists.txt b/ug-wifidirect/CMakeLists.txt
index e10920f20a5c26337d95a8f6721448a4abda70b2..ac65829778f27f6613753363a1440d6d487dfa3d 100755 (executable)
--- a/ug-wifidirect/CMakeLists.txt
+++ b/ug-wifidirect/CMakeLists.txt
@@ -2,7 +2,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(ug-setting-wifidirect-efl C)
 SET(PACKAGE_NAME ug-setting-wifidirect-efl)
 
-SET(PREFIX "/opt/ug")
+SET(PREFIX "/usr/ug")
 SET(LIBDIR "${PREFIX}/lib")
 SET(RESDIR "${PREFIX}/res")
 SET(EDJDIR "${RESDIR}/edje/${PROJECT_NAME}") 

diff --git a/ug-wifidirect/include/wfd_ug.h b/ug-wifidirect/include/wfd_ug.h
index c24b1ee236bf6089a3e96505290704a3ae628661..be905df92f3e71e5d990cc7a604b8970a1e3d62a 100755 (executable)
--- a/ug-wifidirect/include/wfd_ug.h
+++ b/ug-wifidirect/include/wfd_ug.h
@@ -26,7 +26,7 @@
 #include <tethering.h>
 
 #define PACKAGE "ug-setting-wifidirect-efl"
-#define LOCALEDIR "/opt/ug/res/locale"
+#define LOCALEDIR "/usr/ug/res/locale"
 
 #define DIRECT_TAG  "wfd_ug"
 #define DBG(log_level, format, args...) \

diff --git a/ug-wifidirect/include/wfd_ug_view.h b/ug-wifidirect/include/wfd_ug_view.h
index 2a35949ded1825642f717c491db15a5f450b4d0a..f22a3915273676217a6df995ed4e5282dbdb22ca 100755 (executable)
--- a/ug-wifidirect/include/wfd_ug_view.h
+++ b/ug-wifidirect/include/wfd_ug_view.h
@@ -23,9 +23,9 @@
 #include <glib.h>
 #include <syspopup_caller.h>
 
-#define EDJDIR "/opt/ug/res/edje/ug-setting-wifidirect-efl"
+#define EDJDIR "/usr/ug/res/edje/ug-setting-wifidirect-efl"
 #define WFD_UG_EDJ_PATH  EDJDIR"/wfd_ug.edj"
-#define WFD_IMG_DIR "/opt/ug/res/images/ug-setting-wifidirect-efl"
+#define WFD_IMG_DIR "/usr/ug/res/images/ug-setting-wifidirect-efl"
 #define TICKERNOTI_SYSPOPUP "tickernoti-syspopup"
 
 

diff --git a/ug-wifidirect/po/CMakeLists.txt b/ug-wifidirect/po/CMakeLists.txt
index f54113b230d4602a220d0bd4635ae47c5ea31a7d..68ac9faa14fa0624d6c1c9974e4da9ab615782c9 100644 (file)
--- a/ug-wifidirect/po/CMakeLists.txt
+++ b/ug-wifidirect/po/CMakeLists.txt
@@ -16,7 +16,7 @@ FOREACH(pofile ${POFILES})
                        DEPENDS ${absPofile}
        )
        INSTALL(FILES ${moFile}
-                       DESTINATION /opt/ug/res/locale/${lang}/LC_MESSAGES RENAME ${PROJECT_NAME}.mo)
+                       DESTINATION /usr/ug/res/locale/${lang}/LC_MESSAGES RENAME ${PROJECT_NAME}.mo)
        SET(moFiles ${moFiles} ${moFile})
 ENDFOREACH(pofile)
 

diff --git a/ug-wifidirect/src/wfd_ug_main_view.c b/ug-wifidirect/src/wfd_ug_main_view.c
index 1849e63fafac0fa4f3323a56296494ba9b2bc195..f0e800f111c067eb0f5b706e3f63b2591c19b530 100755 (executable)
--- a/ug-wifidirect/src/wfd_ug_main_view.c
+++ b/ug-wifidirect/src/wfd_ug_main_view.c
@@ -262,7 +262,7 @@ static Evas_Object *_gl_noitem_icon_get(void *data, Evas_Object * obj,
 #else   // use image
     Evas_Object *icon;
     icon = elm_icon_add(obj);
-    elm_icon_file_set(icon, "/opt/ug/res/images/ug-wifi-direct/A09_NoDevice.png", NULL);
+    elm_icon_file_set(icon, "/usr/ug/res/images/ug-wifi-direct/A09_NoDevice.png", NULL);
     evas_object_size_hint_min_set(icon, 400, 200);
     evas_object_size_hint_max_set(icon, 400, 200);
     evas_object_resize(icon, 400, 200);

diff --git a/ugapp-wifidirect/CMakeLists.txt b/ugapp-wifidirect/CMakeLists.txt
index de7d5ee99e3fb0031f1b0a17944a4470a0f79740..ff12a67c143a2f6e3058a58c9be831d74edaa014 100755 (executable)
--- a/ugapp-wifidirect/CMakeLists.txt
+++ b/ugapp-wifidirect/CMakeLists.txt
@@ -2,7 +2,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(wifi-direct-ugapp C)
 SET(PACKAGE_NAME org.tizen.wifi-direct-ugapp)
 
-SET(PREFIX /opt/apps/${PACKAGE_NAME})
+SET(PREFIX /usr/apps/${PACKAGE_NAME})
 SET(BINDIR "${PREFIX}/bin")
 SET(RESDIR "${PREFIX}/res")
 SET(LOCALEDIR "${RESDIR}/locale")
@@ -35,7 +35,7 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS})
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})
 
 #CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE_NAME}.desktop.in ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}.desktop)
-#INSTALL(FILES ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}.desktop DESTINATION /opt/share/applications)
+#INSTALL(FILES ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}.desktop DESTINATION /usr/share/applications)
 #for appfw new manifest
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE_NAME}.xml ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}.xml)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE_NAME}.xml DESTINATION "/opt/share/packages/")
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE_NAME}.xml DESTINATION "/usr/share/packages/")

diff --git a/ugapp-wifidirect/include/wfd-ugapp.h b/ugapp-wifidirect/include/wfd-ugapp.h
index 96c3d47a65285504265e2c2f6614153815f7dba8..02c544d101b1480d9a764c32cf782c361eb8e781 100755 (executable)
--- a/ugapp-wifidirect/include/wfd-ugapp.h
+++ b/ugapp-wifidirect/include/wfd-ugapp.h
@@ -37,7 +37,7 @@
 
 
 #define PACKAGE "org.tizen.wifi-direct-ugapp"
-#define LOCALEDIR "/opt/apps/org.tizen.wifi-direct-ugapp"
+#define LOCALEDIR "/usr/apps/org.tizen.wifi-direct-ugapp"
 
 typedef struct
 {

diff --git a/ugapp-wifidirect/org.tizen.wifi-direct-ugapp.xml b/ugapp-wifidirect/org.tizen.wifi-direct-ugapp.xml
index 7b36e1defebee324adb064b44c3fb5254dbd813a..8ecdaf2d3041e0caa403f49efa85692257c2ba12 100755 (executable)
--- a/ugapp-wifidirect/org.tizen.wifi-direct-ugapp.xml
+++ b/ugapp-wifidirect/org.tizen.wifi-direct-ugapp.xml
@@ -4,7 +4,7 @@
        <author email="sungsik.jang@samsung.com" href="www.samsung.com">Sungsik Jang</author>
        <author email="dwmax.lee@samsung.com" href="www.samsung.com">Dongwook Lee</author>
        <description>WiFi Direct UG Application</description>
-       <ui-application appid="org.tizen.wifi-direct-ugapp" exec="/opt/apps/org.tizen.wifi-direct-ugapp/bin/wifi-direct-ugapp" nodisplay="true" multiple="false" type="capp" taskmanage="false">
+       <ui-application appid="org.tizen.wifi-direct-ugapp" exec="/usr/apps/org.tizen.wifi-direct-ugapp/bin/wifi-direct-ugapp" nodisplay="true" multiple="false" type="capp" taskmanage="false">
                <label>WifiDirectUgapp</label>
                <label xml:lang="en-us">WifiDirectUgapp</label>
        </ui-application>