Merge branch 'tizen_2.2' into tizen

Conflicts:
	packaging/ail.spec

diff --cc packaging/ail.spec
index 6158bcd,35984b5..20476b6
--- 1/packaging/ail.spec
--- 2/packaging/ail.spec
+++ b/packaging/ail.spec
@@@ -1,7 -1,7 +1,6 @@@
--#sbs-git:slp/pkgs/a/ail ail 0.2.22 29ac1f2c98453cad647cca6a92abc7da3dbb047b
  Name:       ail
  Summary:    Application Information Library
- Version:    0.2.68
+ Version:    0.2.73
  Release:    1
  Group:      System/Libraries
  License:    Apache License, Version 2.0
@@@ -41,13 -39,9 +40,13 @@@ make %{?jobs:-j%jobs
  %install
  %make_install
  
 +mkdir -p %{buildroot}/opt/dbspace/
 +mkdir -p %{buildroot}/opt/share/applications/
 +
  %post
- vconftool set -t string db/ail/ail_info "0" -f
- vconftool set -t string db/menuscreen/desktop "0" -f
- vconftool set -t string db/menu_widget/language "en_US.utf8" -f
+ vconftool set -t string db/ail/ail_info "0" -f -s system::vconf_inhouse
+ vconftool set -t string db/menuscreen/desktop "0" -f -s system::vconf_inhouse
++vconftool set -t string db/menu_widget/language "en_US.utf8" -f -s system::vconf_inhouse
  
  CHDBGID="6010"
  
@@@ -69,18 -63,15 +68,17 @@@ update_DAC_for_db_file(
  ail_initdb
  update_DAC_for_db_file /opt/dbspace/.app_info.db
  update_DAC_for_db_file /opt/dbspace/.app_info.db-journal
 -chsmack -a 'ail::db' /opt/dbspace/.app_info.db*
  
  %postun
 +if [ $1 == 0 ]; then
 +rm -f /opt/dbspace/.app_info.db*
 +fi
  
  %files
 -%manifest ail.manifest
 +%manifest %{name}.manifest
  %{_libdir}/libail.so.0
  %{_libdir}/libail.so.0.1.0
- /opt/dbspace
 +/opt/share/applications
  /usr/bin/ail_initdb
  /usr/share/install-info/*
  

diff --cc src/ail_db.c
Simple merge

diff --cc src/ail_desktop.c
Simple merge