Merge branch 'tizen_3.0' into tizen

Change-Id: Iafc39f9c439e15bbc8ca9cee22b4cf80cc676a73
Signed-off-by: Yunmi Ha <yunmi.ha@samsung.com>

diff --cc packaging/tlm.spec
index c3a30091e902f2c182eb02764b8038ce198f5327,288361e1c0494ae1df996770fb6c134d1e99a15f..89437fbec169268ef360c92930661464cb64eac8
--- 1/packaging/tlm.spec
--- 2/packaging/tlm.spec
+++ b/packaging/tlm.spec
@@@ -213,4 -398,75 +214,5 @@@ f
  %files config-common-singleseat
  %defattr(-,root,root,-)
  %manifest %{name}.manifest
+ %license COPYING
  %config(noreplace) %{_sysconfdir}/tlm-singleseat.conf
 -
 -%if "%{profile}" == "ivi"
 -
 -%files config-ivi-singleseat
 -%defattr(-,root,root,-)
 -%manifest %{name}.manifest
 -%config(noreplace) %{_sysconfdir}/tlm-singleseat.conf
 -%config(noreplace) %{_sysconfdir}/session.d/genivi-session-singleseat
 -%config(noreplace) %{_sysconfdir}/session.d/user-session
 -%config(noreplace) %{_sysconfdir}/session.d/user-session-launch-script
 -%config(noreplace) %{_sysconfdir}/session.d/user-session-weston
 -%config(noreplace) %{_sysconfdir}/xdg/weston/weston-genivi.ini
 -%config(noreplace) %{_sysconfdir}/xdg/weston/weston-user.ini
 -%config(noreplace) %{_sysconfdir}/profile.d/weston-env-ivi.sh
 -
 -
 -%files config-ivi-singleseat-modello
 -%defattr(-,root,root,-)
 -%manifest %{name}.manifest
 -%config(noreplace) %{_sysconfdir}/tlm-singleseat-modello.conf
 -%config(noreplace) %{_sysconfdir}/session.d/genivi-session-modello
 -%config(noreplace) %{_sysconfdir}/session.d/user-session-modello
 -%config(noreplace) %{_sysconfdir}/session.d/user-session-modello-launch-script
 -%config(noreplace) %{_sysconfdir}/session.d/user-session-modello-weston
 -%config(noreplace) %{_sysconfdir}/xdg/weston/weston-genivi-modello.ini
 -%config(noreplace) %{_sysconfdir}/xdg/weston/weston-user-modello.ini
 -%config(noreplace) %{_sysconfdir}/profile.d/weston-env-ivi.sh
 -
 -
 -%files config-ivi-singleseat-ico
 -%defattr(-,root,root,-)
 -%manifest %{name}.manifest
 -%config(noreplace) %{_sysconfdir}/tlm-singleseat-ico.conf
 -%config(noreplace) %{_sysconfdir}/session.d/genivi-session-singleseat
 -%config(noreplace) %{_sysconfdir}/session.d/user-session-ico
 -%config(noreplace) %{_sysconfdir}/session.d/user-session-ico-launch-script
 -%config(noreplace) %{_sysconfdir}/session.d/user-session-ico-weston
 -%config(noreplace) %{_sysconfdir}/xdg/weston/weston-genivi.ini
 -%config(noreplace) %{_sysconfdir}/xdg/weston/weston-user.ini
 -%config(noreplace) %{_sysconfdir}/profile.d/weston-env-ivi.sh
 -
 -
 -%files config-ivi-multiseat
 -%defattr(-,root,root,-)
 -%manifest %{name}.manifest
 -%config(noreplace) %{_sysconfdir}/tlm-multiseat.conf
 -%config(noreplace) %{_sysconfdir}/session.d/genivi-session-multiseat
 -%config(noreplace) %{_sysconfdir}/session.d/user-session
 -%config(noreplace) %{_sysconfdir}/session.d/user-session-launch-script
 -%config(noreplace) %{_sysconfdir}/session.d/user-session-weston
 -%config(noreplace) %{_sysconfdir}/xdg/weston/weston-genivi.ini
 -%config(noreplace) %{_sysconfdir}/xdg/weston/weston-user.ini
 -%config(noreplace) %{_sysconfdir}/profile.d/weston-env-ivi.sh
 -
 -
 -%files config-ivi-vtc1010
 -%defattr(-,root,root,-)
 -%manifest %{name}.manifest
 -%config(noreplace) %{_sysconfdir}/tlm-vtc1010.conf
 -%config(noreplace) %{_sysconfdir}/session.d/genivi-session-vtc1010
 -%config(noreplace) %{_sysconfdir}/session.d/user-session
 -%config(noreplace) %{_sysconfdir}/session.d/user-session-launch-script
 -%config(noreplace) %{_sysconfdir}/session.d/user-session-weston
 -%config(noreplace) %{_sysconfdir}/xdg/weston/weston-genivi-vtc1010.ini
 -%config(noreplace) %{_sysconfdir}/xdg/weston/weston-user.ini
 -%config(noreplace) %{_sysconfdir}/udev/rules.d/*
 -%config(noreplace) %{_sysconfdir}/profile.d/weston-env-ivi.sh
 -
 -%endif
 -