[oe-commits] Koen Kooi : pulseaudio: fix volatiles and ship policykit file

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 9284c24637d53889f55e2e160a62c8ff9d61d446
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=9284c24637d53889f55e2e160a62c8ff9d61d446

Author: Koen Kooi <koen at openembedded.org>
Date:   Fri Apr 17 15:11:55 2009 +0200

pulseaudio: fix volatiles and ship policykit file

---

 recipes/pulseaudio/pulseaudio.inc       |    5 +++--
 recipes/pulseaudio/pulseaudio_0.9.10.bb |    2 +-
 recipes/pulseaudio/pulseaudio_0.9.11.bb |    2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/recipes/pulseaudio/pulseaudio.inc b/recipes/pulseaudio/pulseaudio.inc
index 4b13980..d625f87 100644
--- a/recipes/pulseaudio/pulseaudio.inc
+++ b/recipes/pulseaudio/pulseaudio.inc
@@ -38,7 +38,7 @@ do_stage() {
 
 do_install_append() {
 	install -d ${D}${sysconfdir}/default/volatiles
-	install -m 0644 ${WORKDIR}/volatiles.04_pulse  ${D}${sysconfdir}/default/volatiles/volatiles.04_pulse
+	install -m 0644 ${WORKDIR}/volatiles.04_pulse  ${D}${sysconfdir}/default/volatiles/04_pulse
 	
 	if [ "x${TARGET_PFPU}" == "xsoft" ] ; then 
 	     sed -i -e s:\;\ resample-method\ =\ sinc-fastest:resample-method\ =\ trivial: ${D}${sysconfdir}/pulse/daemon.conf
@@ -64,7 +64,8 @@ FILES_${PN}-dbg += "${libexecdir}/pulse/.debug \
 FILES_${PN}-dev += "${libdir}/pulse-0.9/modules/*.la"		    
 FILES_${PN}-conf = "${sysconfdir}"
 FILES_${PN}-bin = "${bindir}/* \
-                   ${sysconfdir}/default/volatiles/volatiles.04_pulse"
+                   ${sysconfdir}/default/volatiles/ \
+                   ${datadir}/PolicyKit"
 FILES_${PN}-server = "${bindir}/pulseaudio ${sysconfdir}"
 FILES_${PN}-gconf-helper = "${libexecdir}/pulse/gconf-helper"
 FILES_${PN}-misc = "${bindir}/*"
diff --git a/recipes/pulseaudio/pulseaudio_0.9.10.bb b/recipes/pulseaudio/pulseaudio_0.9.10.bb
index 8da4a1c..f26d583 100644
--- a/recipes/pulseaudio/pulseaudio_0.9.10.bb
+++ b/recipes/pulseaudio/pulseaudio_0.9.10.bb
@@ -1,7 +1,7 @@
 require pulseaudio.inc
 
 DEPENDS += "dbus"
-PR = "r4"
+PR = "r5"
 
 SRC_URI += "\
   file://disable-using-glibc-tls.patch;patch=1 \
diff --git a/recipes/pulseaudio/pulseaudio_0.9.11.bb b/recipes/pulseaudio/pulseaudio_0.9.11.bb
index 930b991..b0b5541 100644
--- a/recipes/pulseaudio/pulseaudio_0.9.11.bb
+++ b/recipes/pulseaudio/pulseaudio_0.9.11.bb
@@ -1,7 +1,7 @@
 require pulseaudio.inc
 
 DEPENDS += "dbus gdbm speex"
-PR = "r0"
+PR = "r1"
 
 # work in progress
 DEFAULT_PREFERENCE = "-1"