merge of '7cd971721449f843bea317fc1d0bf7b659f7daee'

     and '8a55857e345eca1a0caea656d5c41dea4941e869'

diff --cc packages/alsa/alsa-lib_1.0.11.bb
index 8676d7a,5192e42..b9169e6
--- 1/packages/alsa/alsa-lib_1.0.11.bb
--- 2/packages/alsa/alsa-lib_1.0.11.bb
+++ b/packages/alsa/alsa-lib_1.0.11.bb
@@@ -2,7 -2,7 +2,7 @@@ DESCRIPTION = "Alsa sound library
  HOMEPAGE = "http://www.alsa-project.org"
  SECTION = "libs/multimedia"
  LICENSE = "GPL"
--PR = "r3"
++PR = "r4"
  
  # configure.in sets -D__arm__ on the command line for any arm system
  # (not just those with the ARM instruction set), this should be removed,
@@@ -29,13 -29,5 +29,13 @@@ PACKAGES =+ "alsa-server libasound alsa
  FILES_${PN}-dbg += "${libdir}/alsa-lib/*/.debu*"
  FILES_libasound = "${libdir}/libasound.so*"
  FILES_alsa-server = "${bindir}/*"
- FILES_alsa-conf = "${datadir}"
- FILES_alsa-dev = "${libdir}/pkgconfig/ /usr/include/"
+ FILES_alsa-conf = "${datadir}/alsa/"
+ FILES_alsa-dev = "${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*"
 +FILES_alsa-conf-base = "\
 +${datadir}/alsa/alsa.conf \
 +${datadir}/alsa/cards/aliases.conf \
 +${datadir}/alsa/pcm/default.conf \
 +${datadir}/alsa/pcm/dmix.conf \
 +${datadir}/alsa/pcm/dsnoop.conf"
 +
 +RDEPENDS_libasound = "alsa-conf-base"

diff --cc packages/alsa/alsa-lib_1.0.13.bb
index 35cf843,276067c..78df6df
--- 1/packages/alsa/alsa-lib_1.0.13.bb
--- 2/packages/alsa/alsa-lib_1.0.13.bb
+++ b/packages/alsa/alsa-lib_1.0.13.bb
@@@ -2,7 -2,7 +2,7 @@@ DESCRIPTION = "Alsa sound library
  HOMEPAGE = "http://www.alsa-project.org"
  SECTION = "libs/multimedia"
  LICENSE = "GPL"
--PR = "r2"
++PR = "r3"
  
  # configure.in sets -D__arm__ on the command line for any arm system
  # (not just those with the ARM instruction set), this should be removed,
@@@ -30,13 -30,5 +30,13 @@@ PACKAGES =+ "alsa-server libasound alsa
  FILES_${PN}-dbg += "${libdir}/alsa-lib/*/.debu*"
  FILES_libasound = "${libdir}/libasound.so.*"
  FILES_alsa-server = "${bindir}/*"
- FILES_alsa-conf = "${datadir}"
- FILES_alsa-dev += "${libdir}/pkgconfig/ /usr/include/"
+ FILES_alsa-conf = "${datadir}/alsa/"
+ FILES_alsa-dev += "${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*"
 +FILES_alsa-conf-base = "\
 +${datadir}/alsa/alsa.conf \
 +${datadir}/alsa/cards/aliases.conf \
 +${datadir}/alsa/pcm/default.conf \
 +${datadir}/alsa/pcm/dmix.conf \
 +${datadir}/alsa/pcm/dsnoop.conf"
 +
 +RDEPENDS_libasound = "alsa-conf-base"