sync with master

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 28ce90c..f8c2d53 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
 INCLUDE_DIRECTORIES(/usr/include)
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(pkgs REQUIRED elementary appcore-efl ui-gadget-1 accounts-svc evas capi-appfw-application capi-appfw-app-manager vconf pkgmgr capi-system-system-settings csc-feature iniparser)
+pkg_check_modules(pkgs REQUIRED elementary appcore-efl ui-gadget-1 accounts-svc evas capi-appfw-application capi-appfw-app-manager vconf pkgmgr capi-system-system-settings iniparser)
 
 FOREACH(flag ${pkgs_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/packaging/my-account.spec b/packaging/my-account.spec
index 00a5a37..0f64807 100755 (executable)
--- a/packaging/my-account.spec
+++ b/packaging/my-account.spec
@@ -1,7 +1,7 @@
 #sbs-git:slp/apps/m/my-account my-account 1.5.38 c12e7805519b99951f91c33cc96745c7f36166af
 Name:       my-account
 Summary:    My account application
-Version:    1.8.24
+Version:    1.8.25
 Release:    1
 Group:      main/devel
 License:    TO_BE_FILL
@@ -19,7 +19,6 @@ BuildRequires:  pkgconfig(accounts-svc)
 BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(pkgmgr)
 BuildRequires:  pkgconfig(iniparser)
-BuildRequires:  pkgconfig(csc-feature)
 BuildRequires:  pkgconfig(capi-system-system-settings)
 BuildRequires:  cmake
 BuildRequires:  gettext-devel

diff --git a/setting-myaccount-efl.xml b/setting-myaccount-efl.xml
index 6fced1e..d1f0e29 100755 (executable)
--- a/setting-myaccount-efl.xml
+++ b/setting-myaccount-efl.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>\r
-<manifest xmlns="http://tizen.org/ns/packages" package="setting-myaccount-efl" version="1.8.24" install-location="internal-only">\r
+<manifest xmlns="http://tizen.org/ns/packages" package="setting-myaccount-efl" version="1.8.25" install-location="internal-only">\r
        <label>my-account</label>\r
        <author email="wy1115.lee@samsung.com" href="www.samsung.com">Wonyoung Lee</author>\r
        <description>My Account Application</description>\r

diff --git a/src/myaccount_ug_account_list.c b/src/myaccount_ug_account_list.c
index 55cfb26..7d1407e 100755 (executable)
--- a/src/myaccount_ug_account_list.c
+++ b/src/myaccount_ug_account_list.c
@@ -19,7 +19,6 @@
 #include "myaccount_ug_account_list.h"
 #include "myaccount_ug_addaccount.h"
 #include "myaccount_ug_common.h"
-#include <csc-feature.h>
 
 typedef struct __capability_data {
        char* type;