From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Fri, 25 Mar 2011 09:03:40 +0000 (+0100)
Subject: fsoaudiod: add asound.conf to CONFFILES and RCONFLICTS with alsa-state
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61f9ea42230d9b0734827f9c56512b5196861b86;p=openembedded.git

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@gmail.com>
---

diff --git a/recipes/freesmartphone/fsoaudiod_git.bb b/recipes/freesmartphone/fsoaudiod_git.bb
index bfdfca4cfc..7205f79637 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/