Merge changes I6f1336e6,I37b5ca81 into tizen

* changes:
  Unify mobile / wearable codes
  Defragment CAPI for Profiles

diff --cc libs/CMakeLists.txt
index 6795c28,6a54358..672af22
--- 1/libs/CMakeLists.txt
--- 2/libs/CMakeLists.txt
+++ b/libs/CMakeLists.txt
@@@ -39,8 -39,17 +39,16 @@@ SET(POLICY              administration.
                                                dpm/security.cpp
                                                dpm/wifi.cpp
  )
+ # wearable, ivi, common, mobile
+ SET(POLICY_EXT_PASSWORD       password.cpp
+                                               dpm/password.cpp
+ )
+ # ivi, common, mobile
+ SET(POLICY_EXT_KRATE_ZONE     krate.cpp
+                                               dpm/zone.cpp
+ )
  
  SET(CAPI                dpm/device-policy-manager.h
 -                                              dpm/context.h
                                                dpm/administration.h
                                                dpm/application.h
                                                dpm/bluetooth.h

diff --cc packaging/device-policy-manager.spec
index 557a67b,122658d..eb5c604
--- 1/packaging/device-policy-manager.spec
--- 2/packaging/device-policy-manager.spec
+++ b/packaging/device-policy-manager.spec
@@@ -53,10 -72,10 +72,10 @@@ managing device policies
  %files
  %manifest device-policy-manager.manifest
  %defattr(644,root,root,755)
- %attr(755,root,root) %{_bindir}/device-policy-manager
  %attr(700,root,root) %{_bindir}/dpm-admin-cli
+ # dpm-admin-cli: no differences per profile
  %attr(755,root,root) %{_bindir}/dpm-syspopup
 -%attr(755,root,root) %{_bindir}/dpm-preference
 +%attr(755,root,root) %{_bindir}/dpm-storage-builder
  %{_unitdir}/device-policy-manager.service
  %{_unitdir}/multi-user.target.wants/device-policy-manager.service
  

diff --cc server/CMakeLists.txt
Simple merge

diff --cc tests/CMakeLists.txt
Simple merge