Merge branch 'master' into systemd

Conflicts:
	packaging/aul.spec

Change-Id: I9872c73c66563ea74ed3a8412595d3984d8bb479
Signed-off-by: Chengwei Yang <chengwei.yang@intel.com>

diff --cc packaging/aul.spec
index 61274a1,2498306..fad22d8
--- 1/packaging/aul.spec
--- 2/packaging/aul.spec
+++ b/packaging/aul.spec
@@@ -58,63 -56,51 +61,68 @@@ rm -rf %{buildroot
  
  mkdir -p %{buildroot}/etc/init.d
  install -m 755 launchpad_run %{buildroot}/etc/init.d
 -chmod +x %{buildroot}/usr/bin/aul_service.sh
 -chmod +x %{buildroot}/usr/bin/aul_service_test.sh
  
- ln -sf ../../init.d/launchpad_run %{buildroot}/%{_sysconfdir}/rc.d/rc3.d/S35launchpad_run
 +mkdir -p %{buildroot}/etc/rc.d/rc3.d
 +mkdir -p %{buildroot}/etc/rc.d/rc4.d
++ln -sf ../../init.d/launchpad_run %{buildroot}/%{_sysconfdir}/rc.d/rc3.d/S15launchpad_run
 +ln -sf ../../init.d/launchpad_run %{buildroot}/%{_sysconfdir}/rc.d/rc4.d/S80launchpad_run
  
 -%post
 +mkdir -p %{buildroot}/opt/dbspace
 +sqlite3 %{buildroot}/opt/dbspace/.mida.db < %{buildroot}/usr/share/aul/mida_db.sql
 +rm -rf %{buildroot}/usr/share/aul/mida_db.sql
  
 -/sbin/ldconfig
 -mkdir -p /etc/rc.d/rc3.d
 -mkdir -p /etc/rc.d/rc4.d
 -ln -sf /etc/init.d/launchpad_run /etc/rc.d/rc3.d/S15launchpad_run
 -ln -sf /etc/init.d/launchpad_run /etc/rc.d/rc4.d/S80launchpad_run
 +mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
 +install -m 0644 %SOURCE101 %{buildroot}%{_libdir}/systemd/system/launchpad-preload@.service
 +ln -s ../launchpad-preload@.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/launchpad-preload@app.service
 +
 +mkdir -p %{buildroot}%{_libdir}/systemd/user/tizen-middleware.target.wants
 +install -m 0644 %SOURCE102 %{buildroot}%{_libdir}/systemd/user/ac.service
 +ln -s ../ac.service %{buildroot}%{_libdir}/systemd/user/tizen-middleware.target.wants/ac.service
  
 -mkdir -p /opt/dbspace
 -sqlite3 /opt/dbspace/.mida.db < /usr/share/aul/mida_db.sql
 -rm -rf /usr/share/aul/mida_db.sql
  
 -chown 0:0 /usr/lib/libaul.so.0.1.0
 -chown 0:5000 /opt/dbspace/.mida.db
 -chown 0:5000 /opt/dbspace/.mida.db-journal
 +%preun
 +if [ $1 == 0 ]; then
 +    systemctl stop launchpad-preload@app.service
 +fi
  
 -chmod 644 /usr/lib/libaul.so.0.1.0
 -chmod 664 /opt/dbspace/.mida.db
 -chmod 664 /opt/dbspace/.mida.db-journal
 +%post
 +/sbin/ldconfig
 +systemctl daemon-reload
 +if [ $1 == 1 ]; then
 +    systemctl restart launchpad-preload@app.service
 +fi
  
  %postun -p /sbin/ldconfig
 +systemctl daemon-reload
  
  %files
 -/usr/lib/*.so.*
 -/etc/init.d/launchpad_run
 -/usr/bin/aul_service.sh
 -/usr/bin/aul_service_test.sh
 -/usr/share/aul/mida_db.sql
 -/usr/bin/aul_mime.sh
 -/usr/bin/aul_test
 -/usr/bin/launch_app
+ %manifest aul.manifest
- %attr(0755,root,root) %{_sysconfdir}/rc.d/rc3.d/S35launchpad_run
 +%attr(0644,root,root) %{_libdir}/libaul.so.0
 +%attr(0644,root,root) %{_libdir}/libaul.so.0.1.0
 +%{_sysconfdir}/init.d/launchpad_run
 +%attr(0755,root,root) %{_bindir}/aul_service.sh
 +%attr(0755,root,root) %{_bindir}/aul_service_test.sh
++%attr(0755,root,root) %{_sysconfdir}/rc.d/rc3.d/S15launchpad_run
 +%attr(0755,root,root) %{_sysconfdir}/rc.d/rc4.d/S80launchpad_run
 +%config(noreplace) %attr(0644,root,app) /opt/dbspace/.mida.db
 +%config(noreplace) %attr(0644,root,app) /opt/dbspace/.mida.db-journal
 +%attr(0755,root,root) %{_bindir}/aul_mime.sh
 +%{_bindir}/aul_test
 +%{_bindir}/launch_app
  /usr/share/aul/miregex/*
  /usr/share/aul/service/*
  /usr/share/aul/preload_list.txt
  /usr/share/aul/preexec_list.txt
 -/usr/bin/launchpad_preloading_preinitializing_daemon
 +%{_bindir}/launchpad_preloading_preinitializing_daemon
 +%{_bindir}/ac_daemon
 +%{_libdir}/systemd/system/multi-user.target.wants/launchpad-preload@app.service
 +%{_libdir}/systemd/system/launchpad-preload@.service
 +%{_libdir}/systemd/user/tizen-middleware.target.wants/ac.service
 +%{_libdir}/systemd/user/ac.service
+ /usr/bin/amd
+ /usr/bin/daemon-manager-release-agent
+ /usr/bin/daemon-manager-launch-agent
+ 
  
  %files devel
  /usr/include/aul/*.h