[Pkg-alsa-devel] [Debian ALSA CVS] debian/alsa-driver/debian (6 files)
David B Harris
dbharris-guest@quantz.debian.org
Sat, 28 Feb 2004 18:45:03 +0100
Date: Saturday, February 28, 2004 @ 18:45:03
Author: dbharris-guest
Path: /cvsroot/pkg-alsa/debian/alsa-driver/debian
Added: modules-1.0.conf
Modified: alsa-base.README.Debian alsa-base.examples
alsa-source.README.Debian changelog
Removed: modules-0.9.conf
More transition to 1.0, part 1
---------------------------+
alsa-base.README.Debian | 18 +++++++++---------
alsa-base.examples | 2 +-
alsa-source.README.Debian | 2 +-
changelog | 9 +++++++--
modules-0.9.conf | 26 --------------------------
modules-1.0.conf | 26 ++++++++++++++++++++++++++
6 files changed, 44 insertions(+), 39 deletions(-)
Index: debian/alsa-driver/debian/alsa-base.README.Debian
diff -u debian/alsa-driver/debian/alsa-base.README.Debian:1.4 debian/alsa-driver/debian/alsa-base.README.Debian:1.5
--- debian/alsa-driver/debian/alsa-base.README.Debian:1.4 Thu Dec 25 18:53:41 2003
+++ debian/alsa-driver/debian/alsa-base.README.Debian Sat Feb 28 18:45:03 2004
@@ -1,12 +1,12 @@
alsa-base for Debian
----------------------
- --- Users of ALSA 0.9 series from version 0.9.0beta10 or before ---
+ --- Users of ALSA 0.9/1.0 series from version 0.9.0beta10 or before ---
- The driver names of ALSA 0.9 have been renamed. They used to include
- "-card-" in their driver filenames, but these have now been removed.
- You may need to edit your configuration file, /etc/alsa/modutils/0.9.
- If your driver configuration includes "-card-":
+ The driver names since ALSA 0.9 have been renamed. They used to include
+ "-card-" in their driver filenames, but these have now been removed. You may
+ need to edit your configuration file, /etc/alsa/modutils/0.9. If your driver
+ configuration includes "-card-":
Example:
alias snd-card-0 snd-card-sb16.
A fixed example is:
@@ -17,9 +17,9 @@
1) ALSA configuration file for Debian GNU/Linux is located in
/etc/default/alsa.
-2) A configuration example for version 0.9 of ALSA is in
- /usr/share/doc/alsa-base/examples/modules-0.9.conf, which should be
- installed into /etc/alsa/modutils/0.9.
+2) A configuration example for version 0.9/1.0 of ALSA is in
+ /usr/share/doc/alsa-base/examples/modules-1.0.conf, which should be
+ installed into /etc/alsa/modutils/1.0.
3) /etc/init.d/alsa doesn't stop ALSA driver by default if there is an
application which uses sound devices. If you want to stop the ALSA driver
@@ -31,7 +31,7 @@
it, and mount it under /dev to use ALSA, or you can create the ALSA device
files under /dev/snd/ by using mknod.
-5) If you'd like the modutils file (usually called /etc/alsa/modutils/0.9)
+5) If you'd like the modutils file (usually called /etc/alsa/modutils/1.0)
to be generated by debconf, then add a '### DEBCONF MAGIC' line to the
file and run 'dpkg-reconfigure alsa-base'.
Index: debian/alsa-driver/debian/alsa-base.examples
diff -u debian/alsa-driver/debian/alsa-base.examples:1.1 debian/alsa-driver/debian/alsa-base.examples:1.2
--- debian/alsa-driver/debian/alsa-base.examples:1.1 Tue Mar 25 01:56:40 2003
+++ debian/alsa-driver/debian/alsa-base.examples Sat Feb 28 18:45:03 2004
@@ -1 +1 @@
-debian/modules-0.9.conf
+debian/modules-1.0.conf
Index: debian/alsa-driver/debian/alsa-source.README.Debian
diff -u debian/alsa-driver/debian/alsa-source.README.Debian:1.3 debian/alsa-driver/debian/alsa-source.README.Debian:1.4
--- debian/alsa-driver/debian/alsa-source.README.Debian:1.3 Fri Sep 5 05:02:48 2003
+++ debian/alsa-driver/debian/alsa-source.README.Debian Sat Feb 28 18:45:03 2004
@@ -1,4 +1,4 @@
- Advanced Linux Sound Architecture Version 0.9
+ Advanced Linux Sound Architecture Version 1.0
Debian-specific README file
This is the Debian GNU/Linux prepackaged sources of the ALSA drivers.
Index: debian/alsa-driver/debian/changelog
diff -u debian/alsa-driver/debian/changelog:1.213 debian/alsa-driver/debian/changelog:1.214
--- debian/alsa-driver/debian/changelog:1.213 Sat Feb 28 18:39:01 2004
+++ debian/alsa-driver/debian/changelog Sat Feb 28 18:45:03 2004
@@ -21,8 +21,13 @@
settings). Now if you boot into single-user mode and reboot right from
there, mixer settings won't be saved (so on your next boot you'll have
your normal levels, not all-muted). (Closes: #233974)
- - debian/alsa-base.config: Use /etc/alsa/modutils/1.0 if it exists, and
- if it doesn't only then use /etc/alsa/modutils/0.9.
+ - Transition from /etc/modutils/alsa/0.9 to /etc/modutils/alsa/1.0:
+ + debian/alsa-base.config: Use /etc/alsa/modutils/1.0 if it exists, and
+ if it doesn't only then use /etc/alsa/modutils/0.9.
+ + debian/alsa-base.examples, debian/modutils-0.9.conf: Move to
+ modutils-1.0.conf
+ + debian/alsa-base.README.Debian: Update
+ + debian/alsa-source.README.Debian: Update
* Unreleased.
-- David B. Harris <dbharris@debian.org> Thu, 26 Feb 2004 19:16:13 -0500
Index: debian/alsa-driver/debian/modules-0.9.conf
diff -u debian/alsa-driver/debian/modules-0.9.conf:1.3 debian/alsa-driver/debian/modules-0.9.conf:removed
--- debian/alsa-driver/debian/modules-0.9.conf:1.3 Tue Nov 11 13:31:21 2003
+++ debian/alsa-driver/debian/modules-0.9.conf Sat Feb 28 18:45:03 2004
@@ -1,26 +0,0 @@
-# Example configuration of ALSA 0.9 for Debian GNU/Linux
-
-alias char-major-116 snd
-alias char-major-14 soundcore
-
-options snd major=116 cards_limit=4 device_mode=0660
-
-alias sound-service-0-0 snd-mixer-oss
-alias sound-service-0-1 snd-seq-oss
-alias sound-service-0-3 snd-pcm-oss
-alias sound-service-0-8 snd-seq-oss
-alias sound-service-0-12 snd-pcm-oss
-alias /dev/dsp* snd-pcm-oss
-
-#alias snd-card-0 snd-dummy
-#alias snd-card-1 snd-serial
-#alias snd-card-2 snd-share
-#alias snd-card-3 snd-virmidi
-
-alias sound-slot-0 snd-card-0
-alias sound-slot-1 snd-card-1
-alias sound-slot-2 snd-card-2
-alias sound-slot-3 snd-card-3
-
-# You must add your own card settings below, or
-# use alsaconf for an easier way of setting things up.
Index: debian/alsa-driver/debian/modules-1.0.conf
diff -u /dev/null debian/alsa-driver/debian/modules-1.0.conf:1.1
--- /dev/null Sat Feb 28 18:45:03 2004
+++ debian/alsa-driver/debian/modules-1.0.conf Sat Feb 28 18:45:03 2004
@@ -0,0 +1,26 @@
+# Example configuration of ALSA for Debian GNU/Linux
+
+alias char-major-116 snd
+alias char-major-14 soundcore
+
+options snd major=116 cards_limit=4 device_mode=0660
+
+alias sound-service-0-0 snd-mixer-oss
+alias sound-service-0-1 snd-seq-oss
+alias sound-service-0-3 snd-pcm-oss
+alias sound-service-0-8 snd-seq-oss
+alias sound-service-0-12 snd-pcm-oss
+alias /dev/dsp* snd-pcm-oss
+
+#alias snd-card-0 snd-dummy
+#alias snd-card-1 snd-serial
+#alias snd-card-2 snd-share
+#alias snd-card-3 snd-virmidi
+
+alias sound-slot-0 snd-card-0
+alias sound-slot-1 snd-card-1
+alias sound-slot-2 snd-card-2
+alias sound-slot-3 snd-card-3
+
+# You must add your own card settings below, or
+# use alsaconf for an easier way of setting things up.