Merge branch 'tizen_2.2' of ssh://review.tizendev.org:29418/apps/livebox/data-provide...

Sync with the tizen 2.2 latest code.
systemd socket activation for notification service is now disabled temporarly.
After implement the systemd:// schema from the com-core, it will be able to enabled again.
I keep the .sockets service file, but it cannot be work because of com-core.

Conflicts:
	CMakeLists.txt
	data-provider-master.manifest
	include/conf.h
	packaging/data-provider-master.spec
	src/event.c
	src/main.c
	src/parser.c
	src/service_common.c
	util_liveinfo/src/liveinfo.c

Change-Id: I907b79843769778164f4ad8561537dbb15293857

diff --cc CMakeLists.txt
index 0c17570,50bf37e..3fdecad
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -33,8 -35,7 +35,8 @@@ pkg_check_modules(pkg REQUIRE
  )
  
  SET(PACKAGE "${PROJECT_NAME}")
- SET(CMAKE_C_FLAGS "-Wall -Winline -Werror -fno-builtin-malloc -fno-omit-frame-pointer -g")
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Winline -Werror -fno-builtin-malloc -fno-omit-frame-pointer -g")
 +SET(CMAKE_EXE_LINKER_FLAGS)
  
  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
  

diff --cc packaging/data-provider-master.spec
index 6cd320a,803ba21..95a0175
--- 1/packaging/data-provider-master.spec
--- 2/packaging/data-provider-master.spec
+++ b/packaging/data-provider-master.spec
@@@ -53,16 -74,27 +74,29 @@@ mkdir -p %{buildroot}/opt/usr/share/liv
  mkdir -p %{buildroot}/opt/usr/share/live_magazine/log
  mkdir -p %{buildroot}/opt/usr/share/live_magazine/reader
  mkdir -p %{buildroot}/opt/usr/share/live_magazine/always
+ mkdir -p %{buildroot}/opt/usr/devel/usr/bin
  mkdir -p %{buildroot}/opt/dbspace
- mkdir -p %{buildroot}/%{_sysconfdir}/rc.d/rc3.d
+ #mkdir -p %{buildroot}/%{_sysconfdir}/rc.d/rc3.d
 -mkdir -p %{buildroot}/%{_libdir}/systemd/user/tizen-middleware.target.wants
 +mkdir -p %{buildroot}%{_unitdir_user}/tizen-middleware.target.wants
 +mkdir -p %{buildroot}%{_unitdir_user}/sockets.target.wants
  touch %{buildroot}/opt/dbspace/.livebox.db
  touch %{buildroot}/opt/dbspace/.livebox.db-journal
- ln -sf %{_sysconfdir}/rc.d/init.d/data-provider-master %{buildroot}/%{_sysconfdir}/rc.d/rc3.d/S99data-provider-master
+ #ln -sf %{_sysconfdir}/rc.d/init.d/data-provider-master %{buildroot}/%{_sysconfdir}/rc.d/rc3.d/S99data-provider-master
 -ln -sf %{_libdir}/systemd/user/data-provider-master.service %{buildroot}/%{_libdir}/systemd/user/tizen-middleware.target.wants/data-provider-master.service
 +ln -sf %{_unitdir_user}/data-provider-master.service %{buildroot}%{_unitdir_user}/tizen-middleware.target.wants/data-provider-master.service
 +ln -sf %{_unitdir_user}/data-provider-master.socket %{buildroot}%{_unitdir_user}/sockets.target.wants/data-provider-master.socket
- 
+ if [ ! -s %{buildroot}/opt/dbspace/.livebox.db ]; then
+ echo "LiveBox DB file is not exists, initiate it"
+ sqlite3 %{buildroot}/opt/dbspace/.livebox.db <<EOF
+ CREATE TABLE box_size ( pkgid TEXT NOT NULL, size_type INTEGER, preview TEXT, touch_effect INTEGER, need_frame INTEGER, FOREIGN KEY(pkgid) REFERENCES pkgmap(pkgid) ON DELETE CASCADE);
+ CREATE TABLE client (pkgid TEXT PRIMARY KEY NOT NULL, icon TEXT, name TEXT, auto_launch TEXT, pd_size TEXT, content TEXT, nodisplay INTEGER, setup TEXT, mouse_event INTEGER, FOREIGN KEY(pkgid) REFERENCES pkgmap(pkgid) ON DELETE CASCADE);
+ CREATE TABLE groupinfo ( id INTEGER PRIMARY KEY AUTOINCREMENT, cluster TEXT NOT NULL, category TEXT NOT NULL, pkgid TEXT NOT NULL, FOREIGN KEY(pkgid) REFERENCES pkgmap(pkgid) ON DELETE CASCADE);
+ CREATE TABLE groupmap (option_id INTEGER PRIMARY KEY AUTOINCREMENT, id INTEGER, pkgid TEXT NOT NULL, ctx_item TEXT NOT NULL, FOREIGN KEY(id) REFERENCES groupinfo(id), FOREIGN KEY(pkgid) REFERENCES pkgmap(pkgid) ON DELETE CASCADE);
+ CREATE TABLE i18n ( pkgid TEXT NOT NULL, lang TEXT COLLATE NOCASE, name TEXT, icon TEXT, FOREIGN KEY(pkgid) REFERENCES pkgmap(pkgid) ON DELETE CASCADE);
+ CREATE TABLE option ( pkgid TEXT NOT NULL, option_id INTEGER, key TEXT NOT NULL, value TEXT NOT NULL, FOREIGN KEY(option_id) REFERENCES groupmap(option_id), FOREIGN KEY(pkgid) REFERENCES pkgmap(pkgid) ON DELETE CASCADE);
+ CREATE TABLE pkgmap ( pkgid TEXT PRIMARY KEY NOT NULL, appid TEXT, uiapp TEXT, prime INTEGER );
+ CREATE TABLE provider ( pkgid TEXT PRIMARY KEY NOT NULL, network INTEGER, abi TEXT, secured INTEGER, box_type INTEGER, box_src TEXT, box_group TEXT, pd_type INTEGER, pd_src TEXT, pd_group TEXT, libexec TEXT, timeout INTEGER, period TEXT, script TEXT, pinup INTEGER, FOREIGN KEY(pkgid) REFERENCES pkgmap(pkgid) ON DELETE CASCADE);
+ EOF
+ fi
  
  %pre
  # Executing the stop script for stopping the service of installed provider (old version)
@@@ -91,22 -125,19 +127,22 @@@ echo "%{_sysconfdir}/init.d/data-provid
  %manifest data-provider-master.manifest
  %defattr(-,root,root,-)
  %{_sysconfdir}/rc.d/init.d/data-provider-master
- %{_sysconfdir}/rc.d/rc3.d/S99data-provider-master
+ #%{_sysconfdir}/rc.d/rc3.d/S99data-provider-master
  %{_bindir}/data-provider-master
- %{_bindir}/liveinfo
  %{_prefix}/etc/package-manager/parserlib/*
  %{_datarootdir}/data-provider-master/*
 -%{_libdir}/systemd/user/data-provider-master.service
 -%{_libdir}/systemd/user/tizen-middleware.target.wants/data-provider-master.service
 +%{_unitdir_user}/data-provider-master.service
 +%{_unitdir_user}/data-provider-master.socket
 +%{_unitdir_user}/tizen-middleware.target.wants/data-provider-master.service
 +%{_unitdir_user}/sockets.target.wants/data-provider-master.socket
 +
  %{_datarootdir}/license/*
- /opt/usr/share/live_magazine
- /opt/usr/share/live_magazine/log
- /opt/usr/share/live_magazine/reader
- /opt/usr/share/live_magazine/always
+ /opt/usr/share/live_magazine/*
+ %if 0%{?tizen_build_binary_release_type_eng}
+ /opt/usr/devel/usr/bin/*
+ %endif
  /opt/dbspace/.livebox.db
  /opt/dbspace/.livebox.db-journal
+ /opt/etc/smack/accesses.d/*
  
  # End of a file

diff --cc src/parser.c
Simple merge