pulseaudio: set postinst to correct package

3 files changed, 13 insertions, 19 deletions

diff --git a/packages/pulseaudio/pulse.inc b/packages/pulseaudio/pulse.inc
index 0158a8a9cc..6594fcfbb6 100644
--- a/packages/pulseaudio/pulse.inc
+++ b/packages/pulseaudio/pulse.inc
@@ -65,28 +65,25 @@ FILES_${PN}-gconf-helper = "${libexecdir}/pulse/gconf-helper"
 FILES_${PN}-misc = "${bindir}/*"
 
 CONFFILES_pulseaudio-server = "\ 
-                       ${sysconfdir}/pulse/default.pa \
-		       ${sysconfdir}/pulse/daemon.conf \
-		       ${sysconfdir}/pulse/client.conf \
-		       "
-pkg_postinst_libppulse() {
-if test "x$D" != "x"; then
-        exit 1
-else
+  ${sysconfdir}/pulse/default.pa \
+  ${sysconfdir}/pulse/daemon.conf \
+  ${sysconfdir}/pulse/client.conf \
+  "
+
+pkg_postinst_${PN}-server() {
+        # can't do this offline
+        if [ "x$D" != "x" ]; then
+                exit 1
+        fi
         grep -q pulse: /etc/group || addgroup pulse
         grep -q pulse: /etc/passwd || \
             adduser --disabled-password --home=/var/run/pulse/ --system \
                     --ingroup pulse --no-create-home -g "Pulse audio daemon" pulse                                            
         /etc/init.d/populate-volatile.sh update
-fi
 }
 
-pkg_postrm_libpulse() {
-if test "x$D" != "x"; then
-        exit 1
-else
-        deluser pulse
-fi
+pkg_postrm_${PN}-server() {
+        deluser pulse || true
 }
 
 python populate_packages_prepend() {
diff --git a/packages/pulseaudio/pulseaudio_0.9.5.bb b/packages/pulseaudio/pulseaudio_0.9.5.bb
deleted file mode 100644
index 63c33c4725..0000000000
--- a/packages/pulseaudio/pulseaudio_0.9.5.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require pulse.inc
-
-PR  = "r11"
diff --git a/packages/pulseaudio/pulseaudio_0.9.6.bb b/packages/pulseaudio/pulseaudio_0.9.6.bb
index fd64673cc7..bc2bc4d061 100644
--- a/packages/pulseaudio/pulseaudio_0.9.6.bb
+++ b/packages/pulseaudio/pulseaudio_0.9.6.bb
@@ -1,4 +1,4 @@
 require pulse.inc
 
-PR = "r3"
+PR = "r4"