Merge remote-tracking branch 'rsa/tizen_2.2' into tizen

[Note] Rebase wrt-setting

Conflicts:
	webapp-detail/CMakeLists.txt

Change-Id: Icbe12b323a05c1b2453192c3e98482174d440519

diff --cc packaging/wrt-setting.spec
index 4192e7a,d7e884d..f75bc85
mode 100644,100755..100755
--- 1/packaging/wrt-setting.spec
--- 2/packaging/wrt-setting.spec
+++ b/packaging/wrt-setting.spec
@@@ -38,13 -44,8 +44,12 @@@ cp LICENSE.Flora %{buildroot}/usr/share
  %clean
  rm -rf %{buildroot}
  
 +%post -p /bin/ldconfig
 +
 +%postun -p /bin/ldconfig
 +
  %files
  %manifest wrt-setting.manifest
- /etc/smack/accesses2.d/ug.webapp-common-efl.include
  /etc/smack/accesses2.d/ug.webapp-detail-efl.include
  %defattr(-,root,root,-)
  %{_datadir}/license/%{name}

diff --cc webapp-detail/CMakeLists.txt
index c3c438b,af7d659..c0b6bad
--- 1/webapp-detail/CMakeLists.txt
--- 2/webapp-detail/CMakeLists.txt
+++ b/webapp-detail/CMakeLists.txt
@@@ -16,40 -16,28 +16,38 @@@
  
  SET(TARGET_UG_DETAIL_LIB "ug-webapp-detail-efl")
  SET(TARGET_UG_EDJ "webapp-detail.edj")
- SET(UGDIR "${UG_INSTALL_PREFIX}/ug/lib")
- SET(EDJDIR "${UG_INSTALL_PREFIX}/ug/res/edje/${TARGET_UG_DETAIL_LIB}")
+ SET(UGDIR "/usr/ug/lib")
  
  PKG_CHECK_MODULES(UG_WEB_APP_DETAIL_DEPS
+     dlog
      ecore
      elementary
+     efl-assist
      ui-gadget-1
 +    wrt-commons-custom-handler-dao-ro
      dpl-efl
-     dpl-wrt-dao-rw
-     dpl-utils-efl
-     security-settings
      wrt-commons-security-origin-dao
      REQUIRED)
  
 +# Compiler flags
 +SET(CMAKE_BUILD_TYPE           "Release")
 +SET(CMAKE_C_FLAGS_PROFILING    "-O0 -g -pg")
 +SET(CMAKE_CXX_FLAGS_PROFILING  "-O0 -std=c++0x -g -pg")
 +SET(CMAKE_C_FLAGS_DEBUG        "-O0 -g")
 +SET(CMAKE_CXX_FLAGS_DEBUG      "-O0 -std=c++0x -g")
 +SET(CMAKE_C_FLAGS_RELEASE      "-O2 -g")
 +SET(CMAKE_CXX_FLAGS_RELEASE    "-O2 -std=c++0x -g")
 +
  SET(UG_DETAIL_SOURCES
-     ug.cpp
-     view.cpp
-     mainview.cpp
-     detailview.cpp
-     permview.cpp
-     advancedview.cpp
-     exceptionsview.cpp
-     wac_feature.cpp
-     tizen_feature.cpp
+     main.cpp
+     context.cpp
+     menu_data.cpp
+     main_view.cpp
+     origin_view.cpp
+     permission_view.cpp
+     permission_delete_view.cpp
+     ctxpopup_view.cpp
+     wrt_setting_text.cpp
  )
  
  INCLUDE_DIRECTORIES(${UG_WEB_APP_DETAIL_DEPS_INCLUDE_DIRS})