upload tizen1.0 source

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b72a4a..3c0a43b 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,6 +8,7 @@ SET(description "Telephony Network Information Framework")
 SET(service "telephony")
 SET(submodule "network-info")
 SET(dependents "dlog vconf glib-2.0 capi-base-common")
+SET(pc_dependents "capi-base-common")
 SET(deb_dependents "dlog-dev libvconf-dev libglib2.0-dev capi-base-common-dev")
 
 SET(Services 
@@ -93,9 +94,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}/${service})
 
 CONFIGURE_FILE(
     capi-telephony-network-info.pc.in

diff --git a/capi-telephony-network-info.pc.in b/capi-telephony-network-info.pc.in
index 9b898b7..8731238 100644 (file)
--- a/capi-telephony-network-info.pc.in
+++ b/capi-telephony-network-info.pc.in
@@ -11,5 +11,4 @@ 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 02acbf5..169c9cb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,15 @@
+capi-telephony-network-info (0.1.0-10) unstable; urgency=low
+
+  * Correct dependent packages
+  * Git: api/network-info
+  * Tag: capi-telephony-network-info_0.1.0-10 
+
+ -- ByungWoo Lee <bw1212.lee@samsung.com>  Thu, 15 Mar 2012 13:27:05 +0900
+
 capi-telephony-network-info (0.1.0-9) unstable; urgency=low
 
   * Convert internal symbol to static
-  * Git: slp/api/network-info
+  * Git: api/network-info
   * Tag: capi-telephony-network-info_0.1.0-9 
 
  -- ByungWoo Lee <bw1212.lee@samsung.com>  Mon, 20 Feb 2012 15:53:46 +0900

diff --git a/debian/control b/debian/control
index 759e2a7..f76bceb 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -6,12 +6,12 @@ Build-Depends: debhelper (>= 5), dlog-dev, libvconf-dev, libglib2.0-dev, capi-ba
 
 Package: capi-telephony-network-info
 Architecture: any
-Depends: ${shilbs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: A Telephony Network Information library in Tizen Native API
 
 Package: capi-telephony-network-info-dev
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, capi-telephony-network-info (= ${Source-Version}), dlog-dev, libvconf-dev, libglib2.0-dev, capi-base-common-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, capi-telephony-network-info (= ${Source-Version}), capi-base-common-dev
 Description: A Telephony Network Information library in Tizen Native API (DEV)
 
 Package: capi-telephony-network-info-dbg

diff --git a/include/telephony_network.h b/include/telephony_network.h
index bb88f53..59be336 100755 (executable)
--- a/include/telephony_network.h
+++ b/include/telephony_network.h
@@ -18,7 +18,6 @@
 #ifndef __TIZEN_TELEPHONY_NETWORK_INFO_H__
 #define __TIZEN_TELEPHONY_NETWORK_INFO_H__
 
-#include <stdbool.h>
 #include <tizen.h>
 #include <telephony_network_type.h>
 

diff --git a/packaging/capi-telephony-network-info.spec b/packaging/capi-telephony-network-info.spec
index cba5e84..cbfc4ec 100644 (file)
--- a/packaging/capi-telephony-network-info.spec
+++ b/packaging/capi-telephony-network-info.spec
@@ -1,7 +1,7 @@
 Name:       capi-telephony-network-info
 Summary:    Telephony Network Information Framework
 Version:    0.1.0
-Release:    1
+Release:    10
 Group:      TO_BE/FILLED_IN
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
@@ -30,9 +30,8 @@ Requires: %{name} = %{version}-%{release}
 
 
 %build
-FULLVER=%{version}
-MAJORVER=`echo ${FULLVER} | cut -d '.' -f 1`
-cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=${FULLVER} -DMAJORVER=${MAJORVER}
+MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
+cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
 
 
 make %{?jobs:-j%jobs}
@@ -47,10 +46,11 @@ rm -rf %{buildroot}
 
 
 %files
-%{_libdir}/libcapi-telephony-network-info.so*
+%{_libdir}/libcapi-telephony-network-info.so.*
 
 %files devel
 %{_includedir}/telephony/*.h
 %{_libdir}/pkgconfig/*.pc
+%{_libdir}/libcapi-telephony-network-info.so