Hello community, here is the log from the commit of package alsa checked in at Mon Aug 18 19:01:55 CEST 2008. -------- --- alsa/alsa.changes 2008-08-06 15:52:05.000000000 +0200 +++ alsa/alsa.changes 2008-08-18 18:05:47.128375000 +0200 @@ -1,0 +2,13 @@ +Mon Aug 18 18:04:56 CEST 2008 - mrueckert@suse.de + +- remove outdated options in the fillup_and_insserv call + +------------------------------------------------------------------- +Mon Aug 18 16:35:04 CEST 2008 - tiwai@suse.de + +- fixed required-stop of joystick init script +- remove obsolete joystick control parameters from sysconfig and + init script +- updated to alsa-lib 1.0.17a -- just including previous fixes + +------------------------------------------------------------------- Old: ---- alsa-lib-1.0.17.tar.bz2 alsa-lib-git-fixes.diff New: ---- alsa-lib-1.0.17a.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa.spec ++++++ --- /var/tmp/diff_new_pack.W20702/_old 2008-08-18 19:01:32.000000000 +0200 +++ /var/tmp/diff_new_pack.W20702/_new 2008-08-18 19:01:32.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package alsa (Version 1.0.17) +# spec file for package alsa (Version 1.0.17a) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ Name: alsa BuildRequires: doxygen -%define package_version 1.0.17 +%define package_version 1.0.17a License: GPL v2 or later Group: System/Libraries Requires: alsa-utils @@ -28,8 +28,8 @@ PreReq: %insserv_prereq %fillup_prereq AutoReqProv: on Summary: Advanced Linux Sound Architecture -Version: 1.0.17 -Release: 10 +Version: 1.0.17a +Release: 1 Source: ftp://ftp.alsa-project.org/pub/lib/alsa-lib-%{package_version}.tar.bz2 Source8: 40-alsa.rules Source11: alsasound @@ -45,7 +45,7 @@ Source32: all_notes_off.mid Source33: alsa-info.sh Source34: alsa-init.sh -Patch: alsa-lib-git-fixes.diff +# Patch: alsa-lib-git-fixes.diff Url: http://www.alsa-project.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -117,7 +117,7 @@ %prep %setup -q -n alsa-lib-%{package_version} -%patch -p1 +# %patch -p1 %build # build alsa-lib @@ -196,7 +196,7 @@ sed -i -e s/LOAD_ALSA_SEQ/LOAD_SEQUENCER/g /etc/sysconfig/sound fi fi -%{fillup_and_insserv -nsy sound alsasound START_ALSA} +%{fillup_and_insserv -ny sound alsasound} %{fillup_and_insserv -n joystick joystick} if [ -f /bin/rpm.bin -a -f /bin/rpm.sh -a -f /bin/uname.sh -a -f /bin/uname.bin ]; then # do nothing in autobuild environment @@ -259,6 +259,13 @@ %{_datadir}/alsa %changelog +* Mon Aug 18 2008 mrueckert@suse.de +- remove outdated options in the fillup_and_insserv call +* Mon Aug 18 2008 tiwai@suse.de +- fixed required-stop of joystick init script +- remove obsolete joystick control parameters from sysconfig and + init script +- updated to alsa-lib 1.0.17a -- just including previous fixes * Wed Aug 06 2008 tiwai@suse.de - fix the detection of non-interleaved format in dmix code - fix the detection of old timer tread support in dmix ++++++ joystick ++++++ --- alsa/joystick 2008-06-18 14:34:07.000000000 +0200 +++ alsa/joystick 2008-08-18 16:37:42.000000000 +0200 @@ -8,7 +8,7 @@ ### BEGIN INIT INFO # Provides: joystick # Required-Start: alsasound -# Required-Stop: +# Required-Stop: alsasound # Default-Start: 2 3 5 # Default-Stop: # Short-Description: Set up analog josysticks @@ -35,19 +35,6 @@ /sbin/modprobe joydev for js in 0 1 2 3; do - # configure joystick port (if necessary) - eval jsport=\$JOYSTICK_CONTROL_PORT_$js - if [ -n "$jsport" ]; then - $alsactl set $js card:"Joystick Address" "port $jsport" - fi - # activate joystick (if necessary) - eval jsctrl=\$JOYSTICK_CONTROL_$js - if [ -n "$jsctrl" -a "$jsctrl" != no ]; then - if [ "$jsctrl" = yes ]; then - jsctrl="Joystick" - fi - $alsactl set $js card:"$jsctrl" true - fi # load gameport module eval jsmod=\$GAMEPORT_MODULE_$js if [ -n "$jsmod" -a "$jsmod" != off ]; then @@ -64,14 +51,6 @@ function stop () { for js in 0 1 2 3; do - # deactivate joystick (if necessary) - eval jsctrl=\$JOYSTICK_CONTROL_$js - if [ -n "$jsctrl" -a "$jsctrl" != no ]; then - if [ "$jsctrl" = yes ]; then - jsctrl="Joystick" - fi - $alsactl set $js card:"$jsctrl" false - fi # remove gameport module eval jsmod=\$GAMEPORT_MODULE_$js if [ -n "$jsmod" -a "$jsmod" != off ]; then ++++++ sysconfig.joystick ++++++ --- alsa/sysconfig.joystick 2008-06-18 14:34:07.000000000 +0200 +++ alsa/sysconfig.joystick 2008-08-18 16:38:13.000000000 +0200 @@ -33,25 +33,3 @@ JOYSTICK_MODULE_OPTION_1="" JOYSTICK_MODULE_OPTION_2="" JOYSTICK_MODULE_OPTION_3="" - -## Type: string -## Default: "" -# -# Control name of sound driver to activate (via alsactl) -# e.g. "yes" (alias "Joystick") or "Joystick Enable" -# -JOYSTICK_CONTROL_0="" -JOYSTICK_CONTROL_1="" -JOYSTICK_CONTROL_2="" -JOYSTICK_CONTROL_3="" - -## Type: string -## Default: "" -# -# Port to be used (via alsactl) -# Some soundcard like ens1371 needs the port address (typically 0x200) -# -JOYSTICK_CONTROL_PORT_0="" -JOYSTICK_CONTROL_PORT_1="" -JOYSTICK_CONTROL_PORT_2="" -JOYSTICK_CONTROL_PORT_3="" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org