[Pkg-alsa-devel] [Debian ALSA CVS] debian/alsa-driver/debian (alsa-common.templates changelog)
David B Harris
dbharris-guest@quantz.debian.org
Sat, 28 Feb 2004 20:27:17 +0100
Date: Saturday, February 28, 2004 @ 20:27:17
Author: dbharris-guest
Path: /cvsroot/pkg-alsa/debian/alsa-driver/debian
Modified: alsa-common.templates changelog
Remove extraneous , which would cause'harmony (PCI: Harmony/Vivace sound chip)' to show up as two options.
-----------------------+
alsa-common.templates | 2 +-
changelog | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
Index: debian/alsa-driver/debian/alsa-common.templates
diff -u debian/alsa-driver/debian/alsa-common.templates:1.5 debian/alsa-driver/debian/alsa-common.templates:1.6
--- debian/alsa-driver/debian/alsa-common.templates:1.5 Mon Feb 16 00:59:38 2004
+++ debian/alsa-driver/debian/alsa-common.templates Sat Feb 28 20:27:17 2004
@@ -1,4 +1,4 @@
Template: alsa-common/card-list
Type: select
-Choices: ad1816a (ISA: Analog Devices SoundPort AD1816), ad1848 (ISA: Generic AD1848/CS4248), ali5451 (PCI: ALi PCI Audio M5451), als100 (ISA: Avance Logic ALS100), als4000 (PCI: Avance Logic ALS4000), au8810 (PCI: Aureal Advantage), au8820 (PCI: Aureal Vortex), au8830 (PCI: Aureal Vortex 2), azt2320 (ISA: Aztech Systems AZT2320), azt3328 (PCI: Aztech Systems AZF3328), cmi8330 (ISA: C-Media CMI8330), bt87x (PCI: Bt878/Bt879 TV card audio), cmipci (PCI: C-Media 8738 or 8338), cs4231 (ISA: Cirrus Logic CS4231), cs4232 (ISA: Cirrus Logic CS4232), cs4236 (ISA: Cirrus Logic CS4236), cs4281 (PCI: Cirrus Logic CS4281), cs46xx (PCI: Cirrus Logic (Sound Fusion) CS4280/CS461x/CS462x/CS463x), dt019x (ISA: Diamond Technologies DT-0197H), dummy (Dummy (/dev/null) soundcard), emu10k1 (PCI: EMU10K1 (SB Live! or E-mu APS)), ens1370 (PCI: (Creative) Ensoniq AudioPCI 1370), ens1371 (PCI: (Creative) Ensoniq AudioPCI 1371), es1688 (ISA: ESS ES1688), es18xx (ISA: ESS ES18XX), es1938 (PCI: ESS ES1938/1946 (Solo-1)), es1968 (PCI: ESS ES1968/1978 (Maestro-1/2/2E)), es968 (ISA: ESS ES968), fm801 (PCI: ForteMedia FM801), gusclassic (ISA: Gravis UltraSound Classic), gusextreme (ISA: Gravis UltraSound Extreme), gusmax (ISA: Gravis UltraSound MAX), harmony, (PCI: Harmony/Vivace sound chip), hdsp (PCI: RME Hammerfall DSP), hdspm (PCI: RME HDSP MADI board), ice1712 (PCI: ICEnsemble ICE1712 (Envy24)), ice1724 (PCI: ICEnsemble ICE1724 / VIA VT1724 (Envy24HT)), intel8x0 (PCI: Intel i810/i820/i830/i840/MX440 integrated audio), intel8x0m (PCI: Intel i8x0 software modem driver), interwave (ISA: InterWave / Gravis UltraSound PnP), interwave-stb (ISA: InterWave + TEA6330T (UltraSound 32-Pro)), korg1212 (PCI: Korg 1212 IO), maestro3 (PCI: ESS Allegro/Maestro3), mixart (PCI: Digigram miXart), mpu401 (ISA: Generic MPU-401 UART), msnd-pinnacle (ISA: Turtle Beach MultiSound Pinnacle), mtpav (ISA: MOTU MidiTimePiece AV multiport MIDI), nm256 (PCI: NeoMagic NM256AV/ZX), opl3sa2 (ISA: Yamaha OPL3-SA2/SA3), opti92x-ad1848 (ISA: OPTi 82C92x - AD1848), opti92x-cs4231 (ISA: Generic AD1848/CS424), opti93x (ISA: OPTi 82C93x), pdaudiocf (PCMCIA: Sound Core PDAudioCF), pdplus (PCI: Marian/Sek'D Prodif Plus), powermac (PowerMac), rme32 (PCI: RME Digi32 or 32/8 or 32 PRO), rme96 (PCI: RME Digi96 or 96/8 or 96/8 PRO), rme9652 (PCI: RME Digi9652 (Hammerfall)), sa11xx-uda1341 (ARM iPAQ uda1341), sb16 (ISA: Sound Blaster 16), sb8 (ISA: Sound Blaster 1.0/2.0/Pro), sbawe (ISA: Sound Blaster AWE 32/64), serial-u16550 (ISA: UART16550 - MIDI only), serialmidi (Generic serial MIDI), sgalaxy (ISA: Aztech Sound Galaxy), sonicvibes (PCI: S3 SonicVibes), sscape (ISA: Ensoniq SoundScape PnP), trident (PCI: Trident 4D-Wave DX/NX; SiS 7018), usb-audio (USB: USB Audio), usb-usx2y (USB: Tascam US-122 and US-428), via82xx (PCI: VIA VT8233/82C686A South Bridge), virmidi (Virtual MIDI soundcard), vx222 (PCI: Digigram VX222 V2/Mic), vxpocket (PCMCIA: Digigram VXpocket), vxp440 (PCMCIA: Digigram VXpocket 440), wavefront (ISA: Turtle Beach Maui/Tropez/Tropez+ (Wavefront)), ymfpci (PCI: Yamaha YMF724/740/744/754)
+Choices: ad1816a (ISA: Analog Devices SoundPort AD1816), ad1848 (ISA: Generic AD1848/CS4248), ali5451 (PCI: ALi PCI Audio M5451), als100 (ISA: Avance Logic ALS100), als4000 (PCI: Avance Logic ALS4000), au8810 (PCI: Aureal Advantage), au8820 (PCI: Aureal Vortex), au8830 (PCI: Aureal Vortex 2), azt2320 (ISA: Aztech Systems AZT2320), azt3328 (PCI: Aztech Systems AZF3328), cmi8330 (ISA: C-Media CMI8330), bt87x (PCI: Bt878/Bt879 TV card audio), cmipci (PCI: C-Media 8738 or 8338), cs4231 (ISA: Cirrus Logic CS4231), cs4232 (ISA: Cirrus Logic CS4232), cs4236 (ISA: Cirrus Logic CS4236), cs4281 (PCI: Cirrus Logic CS4281), cs46xx (PCI: Cirrus Logic (Sound Fusion) CS4280/CS461x/CS462x/CS463x), dt019x (ISA: Diamond Technologies DT-0197H), dummy (Dummy (/dev/null) soundcard), emu10k1 (PCI: EMU10K1 (SB Live! or E-mu APS)), ens1370 (PCI: (Creative) Ensoniq AudioPCI 1370), ens1371 (PCI: (Creative) Ensoniq AudioPCI 1371), es1688 (ISA: ESS ES1688), es18xx (ISA: ESS ES18XX), es1938 (PCI: ESS ES1938/1946 (Solo-1)), es1968 (PCI: ESS ES1968/1978 (Maestro-1/2/2E)), es968 (ISA: ESS ES968), fm801 (PCI: ForteMedia FM801), gusclassic (ISA: Gravis UltraSound Classic), gusextreme (ISA: Gravis UltraSound Extreme), gusmax (ISA: Gravis UltraSound MAX), harmony (PCI: Harmony/Vivace sound chip), hdsp (PCI: RME Hammerfall DSP), hdspm (PCI: RME HDSP MADI board), ice1712 (PCI: ICEnsemble ICE1712 (Envy24)), ice1724 (PCI: ICEnsemble ICE1724 / VIA VT1724 (Envy24HT)), intel8x0 (PCI: Intel i810/i820/i830/i840/MX440 integrated audio), intel8x0m (PCI: Intel i8x0 software modem driver), interwave (ISA: InterWave / Gravis UltraSound PnP), interwave-stb (ISA: InterWave + TEA6330T (UltraSound 32-Pro)), korg1212 (PCI: Korg 1212 IO), maestro3 (PCI: ESS Allegro/Maestro3), mixart (PCI: Digigram miXart), mpu401 (ISA: Generic MPU-401 UART), msnd-pinnacle (ISA: Turtle Beach MultiSound Pinnacle), mtpav (ISA: MOTU MidiTimePiece AV multiport MIDI), nm256 (PCI: NeoMagic NM256AV/ZX), opl3sa2 (ISA: Yamaha OPL3-SA2/SA3), opti92x-ad1848 (ISA: OPTi 82C92x - AD1848), opti92x-cs4231 (ISA: Generic AD1848/CS424), opti93x (ISA: OPTi 82C93x), pdaudiocf (PCMCIA: Sound Core PDAudioCF), pdplus (PCI: Marian/Sek'D Prodif Plus), powermac (PowerMac), rme32 (PCI: RME Digi32 or 32/8 or 32 PRO), rme96 (PCI: RME Digi96 or 96/8 or 96/8 PRO), rme9652 (PCI: RME Digi9652 (Hammerfall)), sa11xx-uda1341 (ARM iPAQ uda1341), sb16 (ISA: Sound Blaster 16), sb8 (ISA: Sound Blaster 1.0/2.0/Pro), sbawe (ISA: Sound Blaster AWE 32/64), serial-u16550 (ISA: UART16550 - MIDI only), serialmidi (Generic serial MIDI), sgalaxy (ISA: Aztech Sound Galaxy), sonicvibes (PCI: S3 SonicVibes), sscape (ISA: Ensoniq SoundScape PnP), trident (PCI: Trident 4D-Wave DX/NX; SiS 7018), usb-audio (USB: USB Audio), usb-usx2y (USB: Tascam US-122 and US-428), via82xx (PCI: VIA VT8233/82C686A South Bridge), virmidi (Virtual MIDI soundcard), vx222 (PCI: Digigram VX222 V2/Mic), vxpocket (PCMCIA: Digigram VXpocket), vxp440 (PCMCIA: Digigram VXpocket 440), wavefront (ISA: Turtle Beach Maui/Tropez/Tropez+ (Wavefront)), ymfpci (PCI: Yamaha YMF724/740/744/754)
Index: debian/alsa-driver/debian/changelog
diff -u debian/alsa-driver/debian/changelog:1.218 debian/alsa-driver/debian/changelog:1.219
--- debian/alsa-driver/debian/changelog:1.218 Sat Feb 28 19:16:37 2004
+++ debian/alsa-driver/debian/changelog Sat Feb 28 20:27:17 2004
@@ -35,6 +35,8 @@
/etc/alsa/modutils/ on purge
+ debian/alsa-base.README.Debian: Update
+ debian/alsa-source.README.Debian: Update
+ - debian/alsa-common.templates: Remove extraneous "," which would cause
+ 'harmony (PCI: Harmony/Vivace sound chip)' to show up as two options.
* Unreleased.
-- David B. Harris <dbharris@debian.org> Sat, 28 Feb 2004 12:49:38 -0500