[oe-commits] org.oe.dev pulseaudio: set postinst to correct package

[mickeyl commit]

pulseaudio: set postinst to correct package

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: ca79cbe803b8aa5bd6d3ebe944504e5af8234d59
ViewMTN: http://monotone.openembedded.org/revision.psp?id=ca79cbe803b8aa5bd6d3ebe944504e5af8234d59
Files:
1
packages/pulseaudio/pulseaudio_0.9.5.bb
packages/pulseaudio/pulse.inc
packages/pulseaudio/pulseaudio_0.9.6.bb
Diffs:

#
# mt diff -r51d54920e9415bae1f8924c1c9e72abf5f918ac6 -rca79cbe803b8aa5bd6d3ebe944504e5af8234d59
#
# 
# 
# delete "packages/pulseaudio/pulseaudio_0.9.5.bb"
# 
# patch "packages/pulseaudio/pulse.inc"
#  from [f89af52f87198178c40491617e535f1bf63aa6e5]
#    to [13e5ed16850df498fa03cf93e6186cb21597298a]
# 
# patch "packages/pulseaudio/pulseaudio_0.9.6.bb"
#  from [5fd2aeb06e04c45caebb9f24c26dc6c080630be7]
#    to [277e19b6004bf26e9850276af07b6fe9c4b53ab0]
# 
============================================================
--- packages/pulseaudio/pulse.inc	f89af52f87198178c40491617e535f1bf63aa6e5
+++ packages/pulseaudio/pulse.inc	13e5ed16850df498fa03cf93e6186cb21597298a
@@ -65,28 +65,25 @@ CONFFILES_pulseaudio-server = "\ 
 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() {
============================================================
--- packages/pulseaudio/pulseaudio_0.9.6.bb	5fd2aeb06e04c45caebb9f24c26dc6c080630be7
+++ packages/pulseaudio/pulseaudio_0.9.6.bb	277e19b6004bf26e9850276af07b6fe9c4b53ab0
@@ -1,4 +1,4 @@ require pulse.inc
 require pulse.inc
 
-PR = "r3"
+PR = "r4"