diff options
| author | Jonghoon Lim <j.h.lim@samsung.com> | 2012-02-16 17:17:02 +0900 |
|---|---|---|
| committer | Jonghoon Lim <j.h.lim@samsung.com> | 2012-02-16 17:17:02 +0900 |
| commit | 2242f530bc8c60ba203d3157346c236e77384331 (patch) | |
| tree | 27cf7c2514fd10a36b3495220181d0be46b907d0 | |
| parent | 83807e88f73bb7d580a874caf29172128f763d2e (diff) | |
| download | contacts-2242f530bc8c60ba203d3157346c236e77384331.tar.gz contacts-2242f530bc8c60ba203d3157346c236e77384331.tar.bz2 contacts-2242f530bc8c60ba203d3157346c236e77384331.zip | |
versioning updated
| -rwxr-xr-x | CMakeLists.txt | 8 | ||||
| -rwxr-xr-x[-rw-r--r--] | debian/changelog | 4 | ||||
| -rwxr-xr-x | debian/rules | 4 | ||||
| -rwxr-xr-x | src/contacts_search.c | 2 |
4 files changed, 13 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 147a4c3..e2bda10 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,3 @@ - CMAKE_MINIMUM_REQUIRED(VERSION 2.6) SET(fw_name "capi-social-contacts") @@ -35,6 +34,13 @@ ADD_LIBRARY(${fw_name} SHARED ${SOURCES}) TARGET_LINK_LIBRARIES(${fw_name} ${${fw_name}_LDFLAGS}) +SET_TARGET_PROPERTIES(${fw_name} + PROPERTIES + VERSION ${FULLVER} + SOVERSION ${MAJORVER} + CLEAN_DIRECT_OUTPUT 1 +) + INSTALL(TARGETS ${fw_name} DESTINATION lib) INSTALL( DIRECTORY ${INC_DIR}/ DESTINATION include/social diff --git a/debian/changelog b/debian/changelog index abe040a..3eb0dde 100644..100755 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -capi-social-contacts (0.1.1-25) unstable; urgency=low +capi-social-contacts (0.1.1-28) unstable; urgency=low * Multiple address books feature added * Git: api/contacts - * Tag: capi-social-contacts_0.1.1-25 + * Tag: capi-social-contacts_0.1.1-28 -- Jonghoon Lim <j.h.lim@samsung.com> Fri, 10 Feb 2012 15:12:20 +0900 diff --git a/debian/rules b/debian/rules index af730d0..7312770 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,7 @@ #!/usr/bin/make -f +FULLVER ?= $(shell dpkg-parsechangelog | grep Version: | cut -d ' ' -f 2 | cut -d '-' -f 1) +MAJORVER ?= $(shell echo $(FULLVER) | cut -d '.' -f 1) CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -13,7 +15,7 @@ CMAKE_BUILD_DIR ?= $(CURDIR)/cmake_build_tmp configure: configure-stamp configure-stamp: dh_testdir - mkdir -p $(CMAKE_BUILD_DIR) && cd $(CMAKE_BUILD_DIR) && cmake .. + mkdir -p $(CMAKE_BUILD_DIR) && cd $(CMAKE_BUILD_DIR) && cmake .. -DFULLVER=${FULLVER} -DMAJORVER=${MAJORVER} touch configure-stamp diff --git a/src/contacts_search.c b/src/contacts_search.c index fe7edb7..d50232c 100755 --- a/src/contacts_search.c +++ b/src/contacts_search.c @@ -157,7 +157,7 @@ int contact_get_number_contact_from_db(contact_query_number_array *contact_numbe *contact_number_array = NULL; *length = 0; CTSiter *iter = NULL; - if(CTS_SUCCESS != contacts_svc_get_list(CTS_LIST_ALL_CONTACT_HAD_NUMBER, &iter)) { + if(CTS_SUCCESS != contacts_svc_get_list(CTS_LIST_ALL_NUMBER, &iter)) { LOGE("[%s] CONTACTS_ERROR_DB_FAILED(0x%08x)", __FUNCTION__, CONTACTS_ERROR_DB_FAILED); return CONTACTS_ERROR_DB_FAILED; } |