diff options
-rwxr-xr-x | debian/changelog | 8 | ||||
-rw-r--r-- | debian/libug-setting-wifidirect-efl.install.in | 8 | ||||
-rwxr-xr-x | debian/org.tizen.wifi-direct-popup.install.in | 8 | ||||
-rwxr-xr-x | debian/org.tizen.wifi-direct-ugapp.install.in | 4 | ||||
-rwxr-xr-x | packaging/libug-setting-wifidirect-efl.spec | 38 | ||||
-rwxr-xr-x | popup-wifidirect/CMakeLists.txt | 6 | ||||
-rwxr-xr-x | popup-wifidirect/include/wfd-app.h | 2 | ||||
-rwxr-xr-x | popup-wifidirect/org.tizen.wifi-direct-popup.xml | 2 | ||||
-rw-r--r-- | popup-wifidirect/po/CMakeLists.txt | 2 | ||||
-rwxr-xr-x | ug-wifidirect/CMakeLists.txt | 2 | ||||
-rwxr-xr-x | ug-wifidirect/include/wfd_ug.h | 2 | ||||
-rwxr-xr-x | ug-wifidirect/include/wfd_ug_view.h | 4 | ||||
-rw-r--r-- | ug-wifidirect/po/CMakeLists.txt | 2 | ||||
-rwxr-xr-x | ug-wifidirect/src/wfd_ug_main_view.c | 2 | ||||
-rwxr-xr-x | ugapp-wifidirect/CMakeLists.txt | 6 | ||||
-rwxr-xr-x | ugapp-wifidirect/include/wfd-ugapp.h | 2 | ||||
-rwxr-xr-x | ugapp-wifidirect/org.tizen.wifi-direct-ugapp.xml | 2 |
17 files changed, 54 insertions, 46 deletions
diff --git a/debian/changelog b/debian/changelog index f8b8da7..0210470 100755 --- 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 3e3982d..3cf9e42 100644 --- 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 d34027f..d01a785 100755 --- 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 a16c473..c12a394 100755 --- 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 3539b3c..1c19e7b 100755 --- 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 0b993db..9a81a60 100755 --- 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 6dccacd..0bf527e 100755 --- 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 48e2694..0f82b8d 100755 --- 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 fee12e9..3ba67b3 100644 --- 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 e10920f..ac65829 100755 --- 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 c24b1ee..be905df 100755 --- 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 2a35949..f22a391 100755 --- 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 f54113b..68ac9fa 100644 --- 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 1849e63..f0e800f 100755 --- 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 de7d5ee..ff12a67 100755 --- 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 96c3d47..02c544d 100755 --- 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 7b36e1d..8ecdaf2 100755 --- 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> |