Hello community, here is the log from the commit of package pulseaudio for openSUSE:Factory checked in at Mon Nov 2 16:09:34 CET 2009. -------- --- pulseaudio/pulseaudio.changes 2009-10-06 23:49:58.000000000 +0200 +++ /mounts/work_src_done/STABLE/pulseaudio/pulseaudio.changes 2009-10-29 10:34:44.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Oct 29 09:33:55 UTC 2009 - lnussel@suse.de + +- clean up and fix setup-pulseaudio to not corrupt /etc/environment + (bnc#547384) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pulseaudio.spec ++++++ --- /var/tmp/diff_new_pack.V4aZo2/_old 2009-11-02 16:09:27.000000000 +0100 +++ /var/tmp/diff_new_pack.V4aZo2/_new 2009-11-02 16:09:27.000000000 +0100 @@ -22,7 +22,7 @@ Name: pulseaudio Summary: A Networked Sound Server Version: 0.9.19 -Release: 1 +Release: 2 License: LGPL v2.1 or later Group: System/Sound Daemons Source: %{name}-%{version}.tar.bz2 ++++++ setup-pulseaudio ++++++ --- /var/tmp/diff_new_pack.V4aZo2/_old 2009-11-02 16:09:27.000000000 +0100 +++ /var/tmp/diff_new_pack.V4aZo2/_new 2009-11-02 16:09:27.000000000 +0100 @@ -5,12 +5,13 @@ show_help() { echo "setup-pulseaudio [ --enable | --disable | --status ]" echo "" - echo "Sets up PulseAudio configuration for all sound-based applications" + echo "Modifies configuration files of some applications for PulseAudio" echo " --enable Enables PulseAudio" echo " --disable Disables PulseAudio" echo " --status Shows activation state (disabled or enabled) for PulseAudio" echo "" echo "You need to be root for this command to succeed" + echo "You may need to re-login for changes to take effect" exit } @@ -48,27 +49,28 @@ enable_mplayer() { echo "Enabling PulseAudio for mplayer..." - # Maybe it would be better to just add a alias mplayer=mplayer -ao pulse to /etc/environment? if test -f /etc/mplayer/mplayer.conf; then - if grep "ao=pulse" /etc/mplayer/mplayer.conf; then - echo "Default driver is pulse already in /etc/mplayer/mplayer.conf" + if grep -q '^ao=' /etc/mplayer/mplayer.conf; then + perl -pi -e "s|^ao=.*|ao=pulse|g;" /etc/pulse/client.conf else - echo "" + echo "ao=pulse" >> /etc/mplayer/mplayer.conf fi - else - echo "ao=pulse" >> /etc/mplayer/mplayer.conf fi # FIXME: mplayerplug-in uses $HOME/.mplayer/mplayerplug-in.conf } enable_openal() { - echo "Enabling PulseAudio for openal..." - # FIXME: openal uses ~/.openalrc - echo "" + # nothing to do here. openal-soft is patched to prefer pulse but + # it won't autostart the daemon. + return 0 } enable_oss() { + # this is broken. /etc/environment must only contain environment + # variables. It's not a shell script + return 0 + echo "Enabling PulseAudio for OSS..." for app in $LIST_OF_OSS_APPS; do if grep "alias $app=padsp $app" /etc/environment; then @@ -90,6 +92,10 @@ } enable_timidity() { + # this is broken. /etc/environment must only contain environment + # variables. It's not a shell script + return 0 + echo "Enabling PulseAudio for Timidity..." # Use esound output for timidity if grep "alias timidity=timidity -Oe" /etc/environment; then @@ -100,9 +106,9 @@ } enable_xine() { - echo "Enabling PulseAudio for Xine..." + #echo "Enabling PulseAudio for Xine..." # FIXME: xine uses $HOME/.xine/config - echo "" + return 0 } enable_autospawn() { @@ -120,27 +126,30 @@ } disable_libao() { - echo "Disabling PulseAudio for libao..." if test -f /etc/libao.conf; then + echo "Disabling PulseAudio for libao..." perl -pi -e "s|default_driver=pulse||g;" /etc/libao.conf fi } disable_mplayer() { - echo "Disabling PulseAudio for mplayer..." if test -f /etc/mplayer/mplayer.conf; then + echo "Disabling PulseAudio for mplayer..." perl -pi -e "s|ao=pulse||g;" /etc/mplayer/mplayer.conf fi } disable_openal() { - echo "Disabling PulseAudio for openal..." - # FIXME: openal uses ~/.openalrc - echo "" + # nothing to do here. openal-soft is patched to prefer pulse but + # it won't autostart the daemon. + return 0 } disable_oss() { - echo "Disabling PulseAudio for OSS..." + # this is broken. /etc/environment must only contain environment + # variables. It's not a shell script + return 0 + for app in $LIST_OF_OSS_APPS; do perl -pi -e "s|alias $app=padsp $app||g;" /etc/environment done @@ -154,14 +163,18 @@ } disable_timidity() { + # this is broken. /etc/environment must only contain environment + # variables. It's not a shell script + return 0 + echo "Disabling PulseAudio for Timidity..." perl -pi -e "s|alias timidity=timidity -Oe||g;" /etc/environment } disable_xine() { - echo "Disabling PulseAudio for Xine..." + #echo "Disabling PulseAudio for Xine..." # FIXME: xine uses $HOME/.xine/config - echo "" + return 0 } disable_autospawn() { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org