Merge branch 'devel-crosswalk' of git.vannes:/srv/git/gitcache/github.com/eurogiciel...

Conflicts:
	proto-meta-Tizen_generic/.spec2yoctorc

Change-Id: I9946fd408ee6babb56344de4fee14c28bf5ad830

diff --cc proto-meta-Tizen_generic/.spec2yoctorc
index 653e23c,8f90962..1b49c74
--- 1/proto-meta-Tizen_generic/.spec2yoctorc
--- 2/proto-meta-Tizen_generic/.spec2yoctorc
+++ b/proto-meta-Tizen_generic/.spec2yoctorc
@@@ -27,7 -27,7 +27,8 @@@ default_git_src=review.tizen.or
  priority=1
  
  [whitelist_tizen_common]
 -list=smack, rpm, uthash, lua, weston-common, pwdutils, fdupes, doxygen, crosswalk, location-manager, vconf, appcore-agent, dlog, common, libslp-sysman, aul-1, librua, libhaptic, pkgmgr-info, libdevice-node, xdgmime, libprivilege-control, ail, bundle, app-checker, privacy-manager, libslp-pm, vconf-internal-keys, system-info, libiri, sound-manager, iniparser, libmm-sound, libmm-session, libmm-common, libmm-log, heynoti, security-server, audio-session-manager, avsystem, libmm-ta, slp-pkgmgr, tizen-platform-config, tizen-platform-wrapper, libslp-db-util
++
 +list=smack, rpm, uthash, lua, weston-common, pwdutils, fdupes, doxygen, crosswalk, location-manager, vconf, appcore-agent, dlog, common, libslp-sysman, aul-1, librua, libhaptic, pkgmgr-info, libdevice-node, xdgmime, libprivilege-control, ail, bundle, app-checker, privacy-manager, libslp-pm, vconf-internal-keys, system-info, libiri, sound-manager, iniparser, libmm-sound, libmm-session, libmm-common, libmm-log, heynoti, security-server, audio-session-manager, avsystem, libmm-ta, slp-pkgmgr, app-core, libslp-sensor, libsf-common, tizen-platform-config, application, libslp-db-util, tizen-platform-wrapper, app-svc, notification, alarm-manager, eina, com-core, libtapi, libtapi-legacy
  
  [substitute]
  pkgconfig(zlib)=zlib-devel
@@@ -84,9 -84,10 +85,9 @@@ ignore= glibc-devel-32bit, gdm, tk, sub
  [tizen-provided-extra]
  acl=libacl-devel
  ail=pkgconfig(ail)
- alsa-lib=pkgconfig(alsa)
+ alsa-lib=pkgconfig(alsa), alsa
  alsa-state=pkgconfig(libascenario)
  app-checker=pkgconfig(app-checker), pkgconfig(app-checker-server)
 -appcore-agent=pkgconfig(appcore-common)
  application=pkgconfig(capi-appfw-application)
  attr=libattr-devel
  audio-session-manager=pkgconfig(audio-session-mgr)
@@@ -156,9 -155,10 +155,10 @@@ pwdutils=/usr/sbin/groupad
  python=python-devel
  readline=readline-devel
  security-server=pkgconfig(security-server)
+ slp-pkgmgr=pkgconfig(pkgmgr-installer)
  smack=pkgconfig(libsmack)
  sound-manager=pkgconfig(capi-media-sound-manager)
 -sqlite3=pkgconfig(sqlite3)
 +sqlite3=pkgconfig(sqlite3), /usr/bin/sqlite3
  system-info=pkgconfig(capi-system-info)
  systemd=pkgconfig(libsystemd-login), pkgconfig(libsystemd-daemon), /usr/bin/systemctl
  tizen-platform-config=pkgconfig(libtzplatform-config)
@@@ -171,16 -171,4 +171,16 @@@ weston=pkgconfig(weston
  xdgmime=pkgconfig(xdgmime), xdgmime-devel
  xz=xz-devel
  zlib=zlib-devel
 -
 +bundle=pkgconfig(bundle)
 +slp-pkgmgr=pkgconfig(pkgmgr-installer)
 +app-core=pkgconfig(appcore-efl),pkgconfig(appcore-common)
 +elementary=pkgconfig(elementary)
 +libsf-common=pkgconfig(sf_common)
 +app-svc=pkgconfig(appsvc)
 +notification=pkgconfig(notification)
 +alarm-manager =pkgconfig(alarm-service)
 +eina=pkgconfig(eina)
 +com-core=pkgconfig(com-core)
 +libtapi-legacy=pkgconfig(tapi)
 +libtapi=pkgconfig(tapi-3.0)
- libsoup-2.4=pkgconfig(libsoup-2.4)
++libsoup-2.4=pkgconfig(libsoup-2.4)