Hello community, here is the log from the commit of package alsa for openSUSE:11.4 checked in at Mon Mar 28 17:47:21 CEST 2011.
-------- --- old-versions/11.4/all/alsa/alsa.changes 2011-01-31 18:47:03.000000000 +0100 +++ 11.4/alsa/alsa.changes 2011-03-25 12:06:38.000000000 +0100 @@ -1,0 +2,12 @@ +Fri Mar 25 11:41:18 CET 2011 - ti...@suse.de + +- Fix asound.state path in other scripts, too +- Replace the asound.state path for older distros + +------------------------------------------------------------------- +Thu Mar 24 11:27:27 UTC 2011 - wer...@suse.de + +- Make boot script load modules on boot (bnc#682222) +- Correct location of saved sound state in the boot script (bnc#682222) + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.4/all/alsa Destination is old-versions/11.4/UPDATES/all/alsa calling whatdependson for 11.4-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa.spec ++++++ --- /var/tmp/diff_new_pack.4Dv3k4/_old 2011-03-28 17:47:05.000000000 +0200 +++ /var/tmp/diff_new_pack.4Dv3k4/_new 2011-03-28 17:47:05.000000000 +0200 @@ -34,7 +34,7 @@ # Summary: Advanced Linux Sound Architecture Version: 1.0.24.1 -Release: 1 +Release: 4.<RELEASE5> Source: ftp://ftp.alsa-project.org/pub/lib/alsa-lib-%{package_version}.tar.bz2 Source2: baselibs.conf Source8: 40-alsa.rules @@ -166,6 +166,10 @@ mkdir -p $RPM_BUILD_ROOT%{_sbindir} install -c -m 0755 %{SOURCE16} $RPM_BUILD_ROOT%{_bindir} install -c -m 0755 %{SOURCE34} $RPM_BUILD_ROOT%{_sbindir}/alsa-init +%if %suse_version < 1140 +sed -i -e 's@/var/lib/asound.state@/etc/asound.state@g' $RPM_BUILD_ROOT%{_bindir}/set_default_volume +sed -i -e 's@/var/lib/asound.state@/etc/asound.state@g' $RPM_BUILD_ROOT%{_sbindir}/alsa-init +%endif # install test wave file mkdir -p $RPM_BUILD_ROOT%{_datadir}/sounds/alsa install -c -m 0644 %{SOURCE17} $RPM_BUILD_ROOT%{_datadir}/sounds/alsa/test.wav @@ -180,6 +184,9 @@ mkdir -p $RPM_BUILD_ROOT/etc/init.d install -c -m 0755 %{SOURCE11} $RPM_BUILD_ROOT/etc/init.d install -c -m 0755 %{SOURCE13} $RPM_BUILD_ROOT/etc/init.d +%if %suse_version < 1140 +sed -i -e 's@/var/lib/asound.state@/etc/asound.state@g' $RPM_BUILD_ROOT/etc/init.d/alsasound +%endif rm -f $RPM_BUILD_ROOT%{_sbindir}/rcalsasound ln -s ../../etc/init.d/alsasound $RPM_BUILD_ROOT%{_sbindir}/rcalsasound rm -f $RPM_BUILD_ROOT%{_sbindir}/rcjoystick ++++++ alsa-init.sh ++++++ --- /var/tmp/diff_new_pack.4Dv3k4/_old 2011-03-28 17:47:05.000000000 +0200 +++ /var/tmp/diff_new_pack.4Dv3k4/_new 2011-03-28 17:47:05.000000000 +0200 @@ -2,7 +2,7 @@ # alsa-init card# /usr/bin/set_default_volume -f $1 >/dev/null 2>&1 -test -s /etc/asound.state && /usr/sbin/alsactl -F restore $1 >/dev/null 2>&1 +test -s /var/lib/asound.state && /usr/sbin/alsactl -F restore $1 >/dev/null 2>&1 # increase buffer-preallocation size (for PA) if [ -f /proc/asound/card$1/pcm0p/sub0/prealloc_max ]; then pmax=$(< /proc/asound/card$1/pcm0p/sub0/prealloc_max) ++++++ alsasound ++++++ --- /var/tmp/diff_new_pack.4Dv3k4/_old 2011-03-28 17:47:05.000000000 +0200 +++ /var/tmp/diff_new_pack.4Dv3k4/_new 2011-03-28 17:47:05.000000000 +0200 @@ -58,7 +58,7 @@ rc_reset alsactl=/usr/sbin/alsactl -asoundcfg=/etc/asound.state +asoundcfg=/var/lib/asound.state aconnect=/usr/bin/aconnect # @@ -78,7 +78,7 @@ get_drivers() { /sbin/modprobe -c | \ - grep -E "^[[:space:]]*alias[[:space:]]+snd-card-[[:digit:]]" | sort | \ + grep -E "^[[:space:]]*alias[[:space:]]+snd-card-[[:digit:]]" | sort -u | \ while read a b card; do echo $card done @@ -188,8 +188,8 @@ # See how we were called. case "$1" in start) - if [ "$PREVLEVEL" = "N" ]; then - test -d /proc/asound && start_rest + if test "$PREVLEVEL" = "N" -a -d /proc/asound ; then + start_rest else start_all fi ++++++ set_default_volume ++++++ --- /var/tmp/diff_new_pack.4Dv3k4/_old 2011-03-28 17:47:05.000000000 +0200 +++ /var/tmp/diff_new_pack.4Dv3k4/_new 2011-03-28 17:47:05.000000000 +0200 @@ -7,7 +7,7 @@ # written by Takashi Iwai <ti...@suse.de> # -if [ -f /etc/asound.state -a x$1 != x-f ]; then +if [ -f /var/lib/asound.state -a x$1 != x-f ]; then /usr/sbin/alsactl restore >/dev/null 2>&1 exit 0 fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
