Hello community, here is the log from the commit of package pulseaudio for openSUSE:11.4 checked in at Fri Apr 8 23:26:56 CEST 2011.
-------- --- old-versions/11.4/all/pulseaudio/pulseaudio.changes 2011-02-17 17:55:38.000000000 +0100 +++ 11.4/pulseaudio/pulseaudio.changes 2011-03-21 14:51:53.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 21 14:51:21 CET 2011 - [email protected] + +- Fix handling of /etc/mplayer/mplayer.conf in setup-pulseaudio + script (bnc#681113) + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.4/all/pulseaudio Destination is old-versions/11.4/UPDATES/all/pulseaudio calling whatdependson for 11.4-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pulseaudio.spec ++++++ --- /var/tmp/diff_new_pack.APrfTc/_old 2011-04-08 23:26:27.000000000 +0200 +++ /var/tmp/diff_new_pack.APrfTc/_new 2011-04-08 23:26:27.000000000 +0200 @@ -22,7 +22,7 @@ Name: pulseaudio Summary: A Networked Sound Server Version: 0.9.22 -Release: 6.<RELEASE3> +Release: 6.<RELEASE11> License: GPLv2+ ; LGPLv2.1+ Group: System/Sound Daemons Source: %{name}-%{version}.tar.bz2 ++++++ setup-pulseaudio ++++++ --- /var/tmp/diff_new_pack.APrfTc/_old 2011-04-08 23:26:27.000000000 +0200 +++ /var/tmp/diff_new_pack.APrfTc/_new 2011-04-08 23:26:27.000000000 +0200 @@ -28,6 +28,8 @@ PROFNAME=/etc/profile.d/pulseaudio.sh CPROFNAME=/etc/profile.d/pulseaudio.csh +MPLAYER_CONF=/etc/mplayer/mplayer.conf + set_variable () { if test -f $PROFNAME && grep -q "export $1"= $PROFNAME; then @@ -79,11 +81,13 @@ enable_mplayer() { echo "Enabling PulseAudio for mplayer..." - if test -f /etc/mplayer/mplayer.conf; then - if grep -q '^ao=' /etc/mplayer/mplayer.conf; then - perl -pi -e "s|^ao=.*|ao=pulse|g;" /etc/mplayer/mplayer.conf + if test -f $MPLAYER_CONF; then + if grep -q '^ao *= *pulse' $MPLAYER_CONF; then + : + elif grep -q '^ao *=' $MPLAYER_CONF; then + sed -i -e 's/^ao *= *\(.*\)$/ao=pulse,\1/g' $MPLAYER_CONF else - echo "ao=pulse" >> /etc/mplayer/mplayer.conf + echo "ao=pulse" >> $MPLAYER_CONF fi fi @@ -178,9 +182,10 @@ } disable_mplayer() { - if test -f /etc/mplayer/mplayer.conf; then + if test -f $MPLAYER_CONF; then echo "Disabling PulseAudio for mplayer..." - perl -pi -e "s|ao=pulse||g;" /etc/mplayer/mplayer.conf + sed -i -e 's/^ao *= *pulse,*/ao=/g' \ + -e 's/^ao *= *$/ao=alsa/g' $MPLAYER_CONF fi } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
