summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKim Kibum <kb0929.kim@samsung.com>2012-04-29 16:58:20 +0900
committerKim Kibum <kb0929.kim@samsung.com>2012-04-29 16:58:20 +0900
commitc30139ea84ec63e6762995f76f175d8fe8dc21e0 (patch)
treee4650ef2c655e9b0d8ceee8ca656aceea9cd4429
parent5047a94da2d17afb92841aee7f98710cde5bb217 (diff)
downloadcall-log-c30139ea84ec63e6762995f76f175d8fe8dc21e0.tar.gz
call-log-c30139ea84ec63e6762995f76f175d8fe8dc21e0.tar.bz2
call-log-c30139ea84ec63e6762995f76f175d8fe8dc21e0.zip
upload tizen1.0 source
-rwxr-xr-xCMakeLists.txt4
-rwxr-xr-xcapi-social-call-log.pc.in2
-rwxr-xr-xdebian/changelog8
-rwxr-xr-xdebian/control4
-rwxr-xr-xinclude/calllog_private.h1
-rwxr-xr-xpackaging/capi-social-call-log.spec12
6 files changed, 21 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b9d103..1f2918e 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,6 +10,7 @@ SET(INC_DIR include)
INCLUDE_DIRECTORIES(${INC_DIR})
SET(dependents "dlog contacts-service glib-2.0 capi-social-contacts")
+SET(pc_dependents "capi-base-common capi-social-contacts")
INCLUDE(FindPkgConfig)
pkg_check_modules(${fw_name} REQUIRED ${dependents})
@@ -50,9 +51,8 @@ INSTALL(
)
SET(PC_NAME ${fw_name})
-SET(PC_REQUIRED ${dependents})
+SET(PC_REQUIRED ${pc_dependents})
SET(PC_LDFLAGS -l${fw_name})
-SET(PC_CFLAGS -I\${includedir}/social)
CONFIGURE_FILE(
${fw_name}.pc.in
diff --git a/capi-social-call-log.pc.in b/capi-social-call-log.pc.in
index d48ca91..ebddc47 100755
--- a/capi-social-call-log.pc.in
+++ b/capi-social-call-log.pc.in
@@ -11,5 +11,5 @@ Description: @PACKAGE_DESCRIPTION@
Version: @VERSION@
Requires: @PC_REQUIRED@
Libs: -L${libdir} @PC_LDFLAGS@
-Cflags: -I${includedir} @PC_CFLAGS@
+Cflags: -I${includedir}
diff --git a/debian/changelog b/debian/changelog
index c6fc159..4b36462 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+capi-social-call-log (0.1.1-25) unstable; urgency=low
+
+ * package build dependecy updated
+ * Git: api/call-log
+ * Tag: capi-social-call-log_0.1.1-25
+
+ -- Jonghoon Lim <j.h.lim@samsung.com> Fri, 16 Mar 2012 13:34:14 +0900
+
capi-social-call-log (0.1.1-24) unstable; urgency=low
* version updated
diff --git a/debian/control b/debian/control
index 23fa461..a1331e3 100755
--- a/debian/control
+++ b/debian/control
@@ -7,12 +7,12 @@ Build-Depends: debhelper (>= 5), dlog-dev, libcontacts-service-dev, libglib2.0-d
Package: capi-social-call-log
Architecture: any
-Depends: ${shilbs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Call log library in Tizen Native API
Package: capi-social-call-log-dev
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, capi-social-call-log (= ${Source-Version}), dlog-dev, libcontacts-service-dev, libglib2.0-dev, capi-social-contacts-dev, capi-base-common-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, capi-social-call-log (= ${Source-Version}), capi-base-common-dev, capi-social-contacts-dev
Description: Call log library in Tizen Native API (DEV)
Package: capi-social-call-log-dbg
diff --git a/include/calllog_private.h b/include/calllog_private.h
index 924cab8..970c9f0 100755
--- a/include/calllog_private.h
+++ b/include/calllog_private.h
@@ -18,6 +18,7 @@
#ifndef __TIZEN_CALLLOG_PRIVATE_H__
#define __TIZEN_CALLLOG_PRIVATE_H__
+#include <calllog_types.h>
#ifdef __cplusplus
extern "C"
diff --git a/packaging/capi-social-call-log.spec b/packaging/capi-social-call-log.spec
index 1d8a9da..ace3bee 100755
--- a/packaging/capi-social-call-log.spec
+++ b/packaging/capi-social-call-log.spec
@@ -1,9 +1,9 @@
Name: capi-social-call-log
Summary: Call log library in Tizen Native API
-Version: 0.0.1
-Release: 1
+Version: 0.1.1
+Release: 25
Group: TO_BE/FILLED_IN
-License: TO BE FILLED IN
+License: Apache-2.0
Source0: %{name}-%{version}.tar.gz
BuildRequires: cmake
BuildRequires: pkgconfig(dlog)
@@ -31,7 +31,8 @@ Requires: %{name} = %{version}-%{release}
%build
-cmake . -DCMAKE_INSTALL_PREFIX=/usr
+MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
+cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
make %{?jobs:-j%jobs}
@@ -46,10 +47,11 @@ rm -rf %{buildroot}
%files
-%{_libdir}/libcapi-social-call-log.so
+%{_libdir}/libcapi-social-call-log.so.*
%files devel
%{_includedir}/social/*.h
%{_libdir}/pkgconfig/*.pc
+%{_libdir}/libcapi-social-call-log.so