[oe-commits] Martin Jansa : fsoaudiod: add asound. conf to CONFFILES and RCONFLICTS with alsa-state

[git version control]

Module: openembedded.git
Branch: testing-next
Commit: 61f9ea42230d9b0734827f9c56512b5196861b86
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=61f9ea42230d9b0734827f9c56512b5196861b86

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Fri Mar 25 10:03:40 2011 +0100

fsoaudiod: add asound.conf to CONFFILES and RCONFLICTS with alsa-state

* fixes SHR bug http://trac.shr-project.org/trac/ticket/1350

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 recipes/freesmartphone/fsoaudiod_git.bb |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/recipes/freesmartphone/fsoaudiod_git.bb b/recipes/freesmartphone/fsoaudiod_git.bb
index bfdfca4..7205f79 100644
--- a/recipes/freesmartphone/fsoaudiod_git.bb
+++ b/recipes/freesmartphone/fsoaudiod_git.bb
@@ -11,7 +11,7 @@ DEPENDS += "alsa-lib"
 SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
 PV = "0.1.0+gitr${SRCPV}"
 PE = "2"
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 
 inherit update-rc.d
 
@@ -22,7 +22,9 @@ SRC_URI += "file://fsoaudiod"
 
 CONFFILES_${PN} = " \
   ${sysconfdir}/freesmartphone/conf/palm_pre/fsoaudiod.conf \
+  ${sysconfdir}/asound.conf \
 "
+RCONFLICTS_${PN} = "alsa-state"
 
 do_install_append() {
   install -d ${D}${sysconfdir}/init.d/