Sync with tizen_2.2.1

Change-Id: I26374c3561d51a67bca476de039f296c0ded570a
Signed-off-by: Sunwook Bae <sunwook45.bae@samsung.com>

diff --cc CMakeLists.txt
index f90aadb,1d9fa9b..b9b47ce
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -55,8 -50,14 +55,9 @@@ INSTALL(DIRECTORY ${LIBRARY_OUTPUT_PATH
                PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
                      GROUP_EXECUTE GROUP_READ
                      WORLD_EXECUTE WORLD_READ)
 -INSTALL(DIRECTORY ${LIBRARY_OUTPUT_PATH}/debug/ DESTINATION lib/osp/debug
 -              FILES_MATCHING PATTERN "*" PATTERN "libosp-*-server.so*" EXCLUDE
 -              PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
 -                                      GROUP_EXECUTE GROUP_READ
 -                                      WORLD_EXECUTE WORLD_READ)
  
  INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/common/opt/usr/etc DESTINATION ../opt/usr)
+ INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/common/usr/bin DESTINATION ../usr)
  IF("${ARCH}" MATCHES "arm")
    INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/arm/usr/etc DESTINATION ../usr)
  ELSEIF("${ARCH}" MATCHES "x86")

diff --cc inc/FBase.h
Simple merge

diff --cc inc/FBaseColIEnumerator.h
Simple merge

diff --cc inc/FBaseColStlConverter.h
Simple merge

diff --cc inc/FBaseObject.h
Simple merge

diff --cc inc/FBaseRtEvent.h
index b7ba556,34155b7..7086f89
--- 1/inc/FBaseRtEvent.h
--- 2/inc/FBaseRtEvent.h
+++ b/inc/FBaseRtEvent.h
@@@ -33,11 -33,12 +33,11 @@@ class IEventArg
  class IEventListener;
  /**
  * @class Event
- * @brief This class provides methods for notifying events with argument to its listeners.
+ * @brief This class provides methods for notifying events with arguments to its listeners.
  * @since 2.0
  *
 -* The %Event class provides methods for notifying events with arguments to its listeners.
 -* Because it is bounded to either a default thread or an event-driven thread, it cannot be created on a worker thread.
 -* It supports two types of listeners; one is called on the thread where the event is fired, and another is called on the thread where the listener is registered.
 +* The %Event class provides methods for notifying events with argument to its listeners.
 +* It supports two types of listeners; one is called on the thread where the event is fired, and another is called on the thread where the listener was registered.
  *
  * @code
  *

diff --cc osp-appfw.manifest
Simple merge

diff --cc src/CMakeLists.txt
index b596a9f,2013365..161d6a1
--- 1/src/CMakeLists.txt
--- 2/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -44,9 -44,10 +44,9 @@@ pkg_check_modules(pkgs REQUIRE
  )
  
  FOREACH(flag ${pkgs_CFLAGS})
-       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
+       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag} -Wall -Wno-unused")
  ENDFOREACH(flag)
  
 -
  ## Add SubModules
  ADD_SUBDIRECTORY(app)
  ADD_SUBDIRECTORY(io)

diff --cc src/app/inc/FApp_Types.h
index 8245989,cc12c86..371c47d
--- 1/src/app/inc/FApp_Types.h
--- 2/src/app/inc/FApp_Types.h
+++ b/src/app/inc/FApp_Types.h
@@@ -111,11 -112,12 +112,16 @@@ _OSP_LOCAL_ extern const wchar_t LEGACY
  _OSP_LOCAL_ extern const wchar_t TIZEN_OPERATION_MAIN[];
  _OSP_EXPORT_ extern const wchar_t TIZEN_OPERATION_PICK[];
  _OSP_LOCAL_ extern const char TIZEN_NOTIFICATION_DATA[];
+ _OSP_LOCAL_ extern const char SUBMODE_NAME[];
+ 
+ _OSP_EXPORT_ extern const char IPC_SERVER_NAME[];
+ _OSP_EXPORT_ extern const char CONDITION_MANAGER_IPC_NAME[];
+ _OSP_EXPORT_ extern const char PACKAGE_MANAGER_IPC_NAME[];
  
 +_OSP_EXPORT_ extern const char IPC_SERVER_NAME[];
 +_OSP_EXPORT_ extern const char CONDITION_MANAGER_IPC_NAME[];
 +_OSP_EXPORT_ extern const char PACKAGE_MANAGER_IPC_NAME[];
 +
  } } // Tizen::App
  
  #endif // _FAPP_INTERNAL_TYPES_H_

diff --cc src/server/system/CMakeLists.txt
Simple merge