[Pkg-alsa-devel] [Debian ALSA CVS] debian/alsa-driver/debian (7 files)
Steve Kowalik
stevenk@haydn.debian.org
Wed, 11 Aug 2004 02:24:46 -0600
Date: Wednesday, August 11, 2004 @ 02:24:46
Author: stevenk
Path: /cvsroot/pkg-alsa/debian/alsa-driver/debian
Modified: alsa-base.hotplug alsa-base.init alsa-base.modprobe.d
alsa-base.modutils changelog po/nl.po po/pt_BR.po
Alias force-reload to force-stop.
Add echo "done." for users using never autosave and are somehow
comforted by init scripts saying they're done.
Add audio module to our hotplug blacklist.
Automatically load OSS compat modules for sequencers and mixers.
Update Dutch Debconf translation.
Update Brazilian Portuguese translation.
----------------------+
alsa-base.hotplug | 1
alsa-base.init | 4 -
alsa-base.modprobe.d | 2
alsa-base.modutils | 2
changelog | 13 ++++-
po/nl.po | 118 +++++--------------------------------------------
po/pt_BR.po | 15 +++---
7 files changed, 40 insertions(+), 115 deletions(-)
Index: debian/alsa-driver/debian/alsa-base.hotplug
diff -u debian/alsa-driver/debian/alsa-base.hotplug:1.1 debian/alsa-driver/debian/alsa-base.hotplug:1.2
--- debian/alsa-driver/debian/alsa-base.hotplug:1.1 Tue Apr 20 15:34:26 2004
+++ debian/alsa-driver/debian/alsa-base.hotplug Wed Aug 11 02:24:46 2004
@@ -7,6 +7,7 @@
adlib_card
aedsp16
ali5455
+audio
btaudio
cmpci
cs4232
Index: debian/alsa-driver/debian/alsa-base.init
diff -u debian/alsa-driver/debian/alsa-base.init:1.45 debian/alsa-driver/debian/alsa-base.init:1.46
--- debian/alsa-driver/debian/alsa-base.init:1.45 Tue Jun 22 06:12:09 2004
+++ debian/alsa-driver/debian/alsa-base.init Wed Aug 11 02:24:46 2004
@@ -41,7 +41,7 @@
fi
fi
;;
- force-stop)
+ force-stop|force-reload)
procs_using_sound="$(lsof +D /dev -F rt | awk '/^p/ {pid=$1} /^t/ {type=$1} /^r0x(74|e)..$/ && type == "tCHR" {print pid}' | cut -c 2- | uniq)"
if [ ! -z "$procs_using_sound" ]; then
printf "Terminating processes ... "
@@ -70,7 +70,7 @@
$0 stop && $0 start
;;
*)
- echo "Usage: /etc/init.d/alsa {start|stop|restart|reload}"
+ echo "Usage: /etc/init.d/alsa {start|stop|restart|reload|force-stop|force-reload}"
exit 1
;;
esac
Index: debian/alsa-driver/debian/alsa-base.modprobe.d
diff -u debian/alsa-driver/debian/alsa-base.modprobe.d:1.1 debian/alsa-driver/debian/alsa-base.modprobe.d:1.2
--- debian/alsa-driver/debian/alsa-base.modprobe.d:1.1 Tue Apr 20 15:34:26 2004
+++ debian/alsa-driver/debian/alsa-base.modprobe.d Wed Aug 11 02:24:46 2004
@@ -1 +1,3 @@
install snd-pcm /sbin/modprobe --ignore-install snd-pcm && /sbin/modprobe snd-pcm-oss
+install snd-mixer /sbin/modprobe --ignore-install snd-mixer && /sbin/modprobe snd-mixer-oss
+install snd-seq /sbin/modprobe --ignore-install snd-seq && /sbin/modprobe snd-seq-oss
Index: debian/alsa-driver/debian/alsa-base.modutils
diff -u debian/alsa-driver/debian/alsa-base.modutils:1.1 debian/alsa-driver/debian/alsa-base.modutils:1.2
--- debian/alsa-driver/debian/alsa-base.modutils:1.1 Tue Apr 20 15:34:26 2004
+++ debian/alsa-driver/debian/alsa-base.modutils Wed Aug 11 02:24:46 2004
@@ -1 +1,3 @@
above snd-pcm snd-pcm-oss
+above snd-mixer snd-mixer-oss
+above snd-seq snd-seq-oss
Index: debian/alsa-driver/debian/changelog
diff -u debian/alsa-driver/debian/changelog:1.253 debian/alsa-driver/debian/changelog:1.254
--- debian/alsa-driver/debian/changelog:1.253 Tue Jun 22 06:12:10 2004
+++ debian/alsa-driver/debian/changelog Wed Aug 11 02:24:46 2004
@@ -1,4 +1,4 @@
-alsa-driver (1.0.5a-2) unstable; urgency=low
+alsa-driver (1.0.5a-2) unstable; urgency=medium
* Steve Kowalik:
- Remove XSIims in alsa-base's init script. (Closes: #254622)
@@ -7,9 +7,18 @@
reimplement force-stop in the init script, and tell the apm script
to run force-stop on suspend. Getting modules to load on resume is
left as an exercise for the user. (Closes: #249541, #253980)
+ - Alias force-reload to force-stop. (Closes: #264226)
+ - Add echo "done." for users using never autosave and are somehow
+ comforted by init scripts saying they're done. (Closes: #262366)
+ - Add audio module to our hotplug blacklist. (Closes: #257635)
+ - Automatically load OSS compat modules for sequencers and mixers.
+ (Closes: #246570)
+ - Update Dutch Debconf translation. (Closes: #260293) (thanks, cobaco)
+ - Update Brazilian Portuguese translation. (Closes: #262601)
+ (thanks, Andre Luis Lopes)
* Unreleased, and stuff.
- -- Steve Kowalik <stevenk@debian.org> Tue, 22 Jun 2004 22:08:14 +1000
+ -- Steve Kowalik <stevenk@debian.org> Wed, 11 Aug 2004 17:47:03 +1000
alsa-driver (1.0.5a-1) unstable; urgency=low
Index: debian/alsa-driver/debian/po/nl.po
diff -u debian/alsa-driver/debian/po/nl.po:1.16 debian/alsa-driver/debian/po/nl.po:1.17
--- debian/alsa-driver/debian/po/nl.po:1.16 Wed Apr 21 07:15:11 2004
+++ debian/alsa-driver/debian/po/nl.po Wed Aug 11 02:24:46 2004
@@ -14,26 +14,27 @@
msgid ""
msgstr ""
"Project-Id-Version: alsa-driver\n"
-"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2004-04-21 23:08+1000\n"
-"PO-Revision-Date: 2003-09-18 18:37+0100\n"
+"PO-Revision-Date: 2004-07-04 15:05-0500\n"
"Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
"Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: select
-#. Choices
+# Type: select
+# Choices
#: ../alsa-base.templates:3
msgid "autosave always, autosave once at next shutdown, never autosave"
msgstr ""
+"altijd automatisch opslaan, bij eerstvolgende afsluiten automatisch opslaan, "
+"nooit automatisch opslaan"
-#. Type: select
-#. Default
+# Type: select
+# Default
#: ../alsa-base.templates:4
msgid "autosave always"
-msgstr ""
+msgstr "altijd automatisch opslaan"
#. Type: select
#. Description
@@ -72,11 +73,11 @@
"Aanvaard dit indien u ISA PnP ondersteuning in het ALSA-stuurprogramma wenst "
"in te bouwen"
-#. Type: boolean
-#. Description
+# Type: boolean
+# Description
#: ../alsa-source.templates:11
msgid "Build ALSA driver with debugging code?"
-msgstr "ALSA-stuurprogramma bouwen me debug code?"
+msgstr "ALSA-stuurprogramma bouwen met debug code?"
#. Type: boolean
#. Description
@@ -86,12 +87,11 @@
"Aanvaard dit indien u ondersteuning voor debuggen in het ALSA-stuurprogramma "
"wenst in te bouwen."
-#. Type: multiselect
-#. Choices
+# Type: multiselect
+# Choices
#: ../alsa-source.templates:16
-#, fuzzy
msgid "all, ${alsa_cards}"
-msgstr "allemaal, ${alsa_modules}"
+msgstr "allemaal, ${alsa_cards}"
#. Type: multiselect
#. Description
@@ -112,93 +112,3 @@
"U kunt hier de kaarten die u wenst selecteren. Elke selectie is een waarde "
"van de '--with-cards' optie van het configuratiescript. De volgende lijst "
"van korte beschrijvingen maakt duidelijk wat de waarden betekenen."
-
-#~ msgid "forcibly-unload-driver, stop-procs, none"
-#~ msgstr "forceer-uitladen-stuurprogramma, stop-processen, geen"
-
-#~ msgid "none"
-#~ msgstr "geen"
-
-#~ msgid "Stop ALSA drivers forcibly before suspend?"
-#~ msgstr ""
-#~ "Stoppen van ALSA-stuurprogramma's afdwingen bij het activeren van de "
-#~ "slaapmodus?"
-
-#~ msgid ""
-#~ "With some chipsets, the kernel may hang after your machine is resumed by "
-#~ "Advanced Power Management (APM)."
-#~ msgstr ""
-#~ "Sommige chipsets zorgen ervoor dat de computer, en dan met name laptops, "
-#~ "vastloopt na ontwaken uit de slaapstand door het Advanced Power "
-#~ "Management (APM)."
-
-#~ msgid ""
-#~ "If this feature is enabled, the Debian ALSA system will unload the driver "
-#~ "before suspending the machine, in order to prevent that kernel hanging. "
-#~ "If you don't suspend your laptop, or your laptop doesn't hang after "
-#~ "resuming, then you don't need to force stop."
-#~ msgstr ""
-#~ "Indien deze optie geactiveerd is zal het Debian-ALSA-systeem het "
-#~ "stuurprogramma uitladen alvorens de slaapmodus te activeren. Dit om "
-#~ "vastlopen van de kernel te voorkomen. Indien u de slaapmodus van uw "
-#~ "laptop niet gebruikt, of uw laptop niet vastloopt na door het Advanced "
-#~ "Power Management (APM) uit de slaapstand te zijn gewekt, hoeft u hier "
-#~ "geen Ja op te zeggen"
-
-#~ msgid ""
-#~ "Note: If you want to use this feature, you need to install the apmd "
-#~ "package."
-#~ msgstr ""
-#~ "Opmerking: Indien u deze optie wilt gebruiken, dient u het apmd pakket te "
-#~ "installeren."
-
-#~ msgid "done, ${alsa_modules}"
-#~ msgstr "klaar, ${alsa_modules}"
-
-#~ msgid "done"
-#~ msgstr "klaar"
-
-#~ msgid "What driver-modules do your cards use?"
-#~ msgstr "Welke stuurprogramma-modules worden door uw kaarten gebruikt?"
-
-#~ msgid ""
-#~ "You are currently configuring ALSA's boot script. Select those driver-"
-#~ "modules you want loaded at boot-time."
-#~ msgstr ""
-#~ "U bent momenteel het ALSA-opstartscript aan het instellen. Gelieve de "
-#~ "stuurprogramma-modules die u bij het opstarten wil laden te selecteren."
-
-#~ msgid "You have selected \"${alsa_cards}\" so far."
-#~ msgstr "U heeft tot nog toe \"${alsa_cards}\" geselecteerd."
-
-#~ msgid ""
-#~ "When you are finished selecting driver-modules to load, select \"done\"."
-#~ msgstr ""
-#~ "Kies \"klaar\", wanneer u klaar bent met het selecteren van "
-#~ "stuurprogramma-modules."
-
-#~ msgid "This is a dummy question."
-#~ msgstr "Dit is een dummy vraag"
-
-#~ msgid "This question is merely a placeholder, and is not meant to be asked."
-#~ msgstr ""
-#~ "Deze vraag is enkel een plaatshouder, en hoort niet gevraagd te worden."
-
-#~ msgid "Would you like to load OSS compatibility modules when ALSA starts?"
-#~ msgstr "Wilt u OSS compatibiliteits modules laden bij het starten van ALSA?"
-
-#~ msgid ""
-#~ "Loading OSS compatibility modules when ALSA starts is useful if your "
-#~ "kernel has no kmod or devfs support. Under a kernel with devfs support, "
-#~ "the standard audio device files are created at run-time when the ALSA "
-#~ "driver is loaded. This means you can use audio applications which use the "
-#~ "standard audio device files under a devfs kernel only when the driver can "
-#~ "detect your audio device and it sucessfully works."
-#~ msgstr ""
-#~ "OSS-compatibiliteitsmodules zijn nuttig wanneer uw kernel gebouwd is "
-#~ "zonder kmod of devfs ondersteuning. Een kernel zonder devfs ondersteuning "
-#~ "maakt de standaard audioapparaatbestanden slechts aan wanneer het ALSA-"
-#~ "stuurprogramma geladen wordt. Dit houdt in dat audioapplicaties die "
-#~ "gebruik maken van de standaard audioapparaatbestanden slechts bruikbaar "
-#~ "zijn wanneer het audioapparaat door het stuurprogramma gedetecteerd "
-#~ "wordt, en met dit stuurprogramma succesvol werkt."
Index: debian/alsa-driver/debian/po/pt_BR.po
diff -u debian/alsa-driver/debian/po/pt_BR.po:1.14 debian/alsa-driver/debian/po/pt_BR.po:1.15
--- debian/alsa-driver/debian/po/pt_BR.po:1.14 Wed Apr 21 07:15:11 2004
+++ debian/alsa-driver/debian/po/pt_BR.po Wed Aug 11 02:24:46 2004
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: alsa-driver-0.9.6-2\n"
+"Project-Id-Version: alsa-driver\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2004-04-21 23:08+1000\n"
-"PO-Revision-Date: 2003-O8-29 19:27-0300\n"
+"PO-Revision-Date: 2004-O7-31 21:49-0300\n"
"Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
"Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
"MIME-Version: 1.0\n"
@@ -19,12 +19,14 @@
#: ../alsa-base.templates:3
msgid "autosave always, autosave once at next shutdown, never autosave"
msgstr ""
+"sempre autosalvar, autosalvar uma única vez no desligamento, nunca "
+"autosalvar"
#. Type: select
#. Default
#: ../alsa-base.templates:4
msgid "autosave always"
-msgstr ""
+msgstr "sempre autosalvar"
#. Type: select
#. Description
@@ -80,9 +82,8 @@
#. Type: multiselect
#. Choices
#: ../alsa-source.templates:16
-#, fuzzy
msgid "all, ${alsa_cards}"
-msgstr "todos, ${alsa_modules}"
+msgstr "todos, ${alsa_cards}"
#. Type: multiselect
#. Description
@@ -98,9 +99,9 @@
"is a same name to a option of configure script '--with-cards'. The following "
"list are short descriptions of the options to show what they mean."
msgstr ""
-"Você pode escolher compilar o suporte a placas selecionando aquelas que você "
+"Você pode optar por compilar o suporte a placas selecionando aquelas que você "
"deseja. Cada seleção é o mesmo nome de uma opção do script de configuração "
-"`--with-cards'. A seguir está uma lista de descrições curtas das opções que "
+"'--with-cards'. A lista a seguir contém descrições curtas das opções que "
"exibem o que as mesmas significam."
#, fuzzy