Imported Debian patch 1.2.2-18

diff --git a/beep.c b/beep.c
index 814a0b31f245ca22c83c4ce2bd4a5246b0358fb0..e421e8fe60f4aef01db726467597b300de579594 100644 (file)
--- a/beep.c
+++ b/beep.c
@@ -276,9 +276,8 @@ void play_beep(beep_parms_t parms) {
   if(console_device)
     console_fd = open(console_device, O_WRONLY);
   else
-    if((console_fd = open("/dev/input/event0", O_WRONLY)) == -1)
-      if((console_fd = open("/dev/tty0", O_WRONLY)) == -1)
-       console_fd = open("/dev/vc/0", O_WRONLY);
+    if((console_fd = open("/dev/tty0", O_WRONLY)) == -1)
+      console_fd = open("/dev/vc/0", O_WRONLY);
       
   if(console_fd == -1) {
     fprintf(stderr, "Could not open %s for writing\n",

diff --git a/debian/changelog b/debian/changelog
index afd8229354529fcc5e9339a30a399f1917e1a9a1..f1aa8f388f53ef1d1dba0e0a4c8efb44618eb52f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+beep (1.2.2-18) unstable; urgency=low
+
+  * Use install instead of make install which just copies over the files...
+  * Changed postrm to remove bashism.
+  * Reverted part of the evdev patch: One needs to explicitly ask for using
+    /dev/input/event0 with the -e switch instead of it being tried
+    automatically (closes: #354694)
+  * Bumped Standards-Version to 3.7.2, no changes needed.
+  * Add overrides for using-first-person-in-templates, it's about me as
+    package maintainer.
+  * Changed templates texting for the select prompt.
+  * Translations updated: Brazilian Portuguese (Felipe Augusto van de Wiel),
+    German (myself), Catalan (Miguel Gea Milvaques), Spanish (David Martínez
+    Moreno), Swedish (Daniel Nylander), Portuguese (Miguel Figueiredo), Czech
+    (Miroslav Kure), Vietnamese (Clytie Siddall), French (Daniel Déchelotte,
+    closes: #375358)
+
+ -- Gerfried Fuchs <alfie@debian.org>  Sun, 25 Jun 2006 11:12:11 -0500
+
 beep (1.2.2-17) unstable; urgency=low
 
   * Added additional debconf translations:
@@ -5,7 +24,7 @@ beep (1.2.2-17) unstable; urgency=low
   * Updated debconf translation:
     - Vietnamese by Clytie Siddall (closes: #343851)
   * Fixed breakage raised with --verbose patch (closes: #335027)
-  * Added udev generation (closes: #350220)
+  * Added udeb generation (closes: #350220)
   * Applied patch from Alessandro Zummo for evdev and general device node
     support (closes: #350214)
 

diff --git a/debian/control b/debian/control
index dc36b5e2fa5ec2c6a7b65a11c61063932c4099d1..c7f0ba8f60c2ef7526759c00f241140bb85b8cdf 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: sound
 Priority: optional
 Maintainer: Gerfried Fuchs <alfie@debian.org>
 Build-Depends: po-debconf, patch
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2
 
 Package: beep
 Architecture: any

diff --git a/debian/overrides b/debian/overrides
new file mode 100644 (file)
index 0000000..cff3c45
--- /dev/null
+++ b/debian/overrides
@@ -0,0 +1 @@
+beep: using-first-person-in-templates beep/suid_option

diff --git a/debian/po/ca.po b/debian/po/ca.po
index 6c165aa7ccc06f733bd125583c6375aa3031706b..3b66077b5ea653a81edc2414655612576aea46cd 100644 (file)
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -1,4 +1,4 @@
-# translation of beep_1.2.2-12_templates.po to catalan
+# translation of ca.po to catalan
 #
 #    Translators, if you are not familiar with the PO format, gettext
 #    documentation is worth reading, especially sections dedicated to
@@ -9,20 +9,21 @@
 #            /usr/share/doc/po-debconf/README-trans
 #         or http://www.debian.org/intl/l10n/po-debconf/README-trans#
 #    Developers do not need to manually edit POT or PO files.
-# Jordi Fernández Mora <jordi.fernandezmo@campus.uab.es>, 2004.
-# Miguel Gea Milvaques <debian@miguelgea.com>, 2004.
 #
+# Jordi Fernández Mora <jordi.fernandezmo@campus.uab.es>, 2004.
+# Miguel Gea Milvaques <xerakko@debian.org>, 2004, 2006.
 msgid ""
 msgstr ""
 "Project-Id-Version: ca\n"
 "Report-Msgid-Bugs-To: beep@packages.debian.org\n"
-"POT-Creation-Date: 2005-06-14 00:09+0200\n"
-"PO-Revision-Date: 2005-10-10 15:34+0200\n"
-"Last-Translator: Miguel Gea Milvaques <debian@miguelgea.com>\n"
-"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
+"POT-Creation-Date: 2006-06-21 05:05-0500\n"
+"PO-Revision-Date: 2006-06-21 08:40-0500\n"
+"Last-Translator: Miguel Gea Milvaques <xerakko@debian.org>\n"
+"Language-Team: catalan <debian-l10n-catalan@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.2\n"
 
 #. Type: select
 #. Choices
@@ -30,14 +31,13 @@ msgstr ""
 msgid ""
 "suid root for all, suid root with only group audio executable, not suid at "
 "all"
-msgstr ""
-"suid root per a tothom, suid root només pel grup audio, suid per a ningú "
+msgstr "suid root per a tothom, suid root només pel grup audio, suid per a ningú "
 
 #. Type: select
 #. Description
 #: ../templates:5
-msgid "How do you want to handle suid root for the beep program?"
-msgstr "Com voleu gestionar l'atribut suid root pel programa beep?"
+msgid "Install beep as:"
+msgstr "Instal·lar beep com:"
 
 #. Type: select
 #. Description
@@ -66,3 +66,4 @@ msgstr ""
 "seguretat, no es fa per defecte. Tot i això el programa és petit (unes 150 "
 "línies) i és en justícia fàcil verificar la seguretat del codi vosaltres "
 "mateixos, si no confieu en el meu criteri."
+

diff --git a/debian/po/cs.po b/debian/po/cs.po
index 41e4b9df02bfd2cd8085a2a335e814074d423814..91e906b9520ad66ed26f9ce91a63d9ff481ff6f1 100644 (file)
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -15,10 +15,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: beep\n"
 "Report-Msgid-Bugs-To: beep@packages.debian.org\n"
-"POT-Creation-Date: 2005-06-14 00:09+0200\n"
-"PO-Revision-Date: 2005-10-10 12:34+0200\n"
+"POT-Creation-Date: 2006-06-21 05:05-0500\n"
+"PO-Revision-Date: 2006-06-21 14:23+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
-"Language-Team: Czech <debian-l10-czech@lists.debian.org>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,8 +35,8 @@ msgstr ""
 #. Type: select
 #. Description
 #: ../templates:5
-msgid "How do you want to handle suid root for the beep program?"
-msgstr "Jak chcete nastavit suid root bit pro program beep?"
+msgid "Install beep as:"
+msgstr "Instalovat beep jako:"
 
 #. Type: select
 #. Description
@@ -47,10 +47,10 @@ msgid ""
 "root (no suid bit at all), executable only by users of the group audio, or "
 "usable for all."
 msgstr ""
-"beep musí běžet pod uživatelem root, protože musí mít přístup ke zvukovému "
+"beep musí běžet pod uživatelem root, protože vyžaduje přístup ke zvukovému "
 "hardwaru. Existuje několik možností, jak toho dosáhnout: buď bude použitelný "
 "jen pro uživatele root (bez suid bitu), spustitelný uživateli skupiny audio, "
-"nebo bude spustitelný pro všechny."
+"nebo jej budou moci používat všichni."
 
 #. Type: select
 #. Description
@@ -62,6 +62,6 @@ msgid ""
 "my judgement."
 msgstr ""
 "Protože je každý suid root program bezpečnostním rizikem, je lepší suid bit "
-"nenastavovat. Tento program je však velmi malý (~150 řádků kódu),  "
-"takže pokud nevěříte autorovi, můžete si celkem jednoduše bezpečnost kódu "
+"nenastavovat. Tento program je však velmi malý (~150 řádků kódu),  takže "
+"pokud nevěříte autorovi, můžete si celkem jednoduše bezpečnost kódu "
 "prostudovat sami."

diff --git a/debian/po/de.po b/debian/po/de.po
index 7d739aaf6f650a0a40ca62a81a5b7f4cff16aa6c..16cd0d14c10b0abc31c96c9b4e99418fe7b9cb10 100644 (file)
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -13,10 +13,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: beep 1.2.2-16\n"
+"Project-Id-Version: beep 1.2.2-18\n"
 "Report-Msgid-Bugs-To: beep@packages.debian.org\n"
-"POT-Creation-Date: 2005-06-14 00:09+0200\n"
-"PO-Revision-Date: 2005-06-14 08:54+0200\n"
+"POT-Creation-Date: 2006-06-21 05:05-0500\n"
+"PO-Revision-Date: 2006-06-21 05:07-0500\n"
 "Last-Translator: Gerfried Fuchs <alfie@debian.org>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -36,8 +36,8 @@ msgstr ""
 #. Type: select
 #. Description
 #: ../templates:5
-msgid "How do you want to handle suid root for the beep program?"
-msgstr "Wie wollen Sie suid root für das beep-Programm behandeln?"
+msgid "Install beep as:"
+msgstr "beep installieren als:"
 
 #. Type: select
 #. Description

diff --git a/debian/po/es.po b/debian/po/es.po
index dadb82e48ec20dd6fd709370aa7c513aa61a458f..b640cd0d4d44d6ed544e7609424ac0885a2e26f7 100644 (file)
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -4,7 +4,9 @@
 #
 # Changes:
 #  - Initial translation
-#         César Gómez Martín <cesar.gomez@gmail.com>
+#         César Gómez Martín <cesar.gomez@gmail.com>, 2005.
+#  - Updates:
+#         David Martínez Moreno <ender@debian.org>, 2006.
 #
 #   Traductores, si no conoce el formato PO, merece la pena leer la
 #   documentación de gettext, especialmente las secciones dedicadas a este
@@ -27,10 +29,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: beep\n"
 "Report-Msgid-Bugs-To: beep@packages.debian.org\n"
-"POT-Creation-Date: 2005-06-14 00:09+0200\n"
-"PO-Revision-Date: 2005-10-14 12:01+0100\n"
-"Last-Translator: César Gómez Martín <cesar.gomez@gmail.com>\n"
-"Language-Team: Debian l10n spanish <debian-l10n-spanish@lists.debian.org>\n"
+"POT-Creation-Date: 2006-06-21 05:05-0500\n"
+"PO-Revision-Date: 2006-06-28 02:06-0500\n"
+"Last-Translator: David Martínez Moreno <ender@debian.org>\n"
+"Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -51,8 +53,8 @@ msgstr ""
 #. Type: select
 #. Description
 #: ../templates:5
-msgid "How do you want to handle suid root for the beep program?"
-msgstr "¿Cómo desea gestionar el bit «suid root» para el programa beep?"
+msgid "Install beep as:"
+msgstr "Instalar beep de la siguiente manera:"
 
 #. Type: select
 #. Description
@@ -77,8 +79,8 @@ msgid ""
 "is fairly easy to verify the safety of the code yourself, if you don't trust "
 "my judgement."
 msgstr ""
-"Esto no se hace por omisión debido a que cualquier programa con el «bit "
-"suid» puede ser un riesgo de seguridad. Sin embargo, el programa es bastante "
-"pequeño (unas 150 líneas de código) y, por lo tanto, si no confía en mi "
+"Esta elección es necesaria debido a que cualquier programa con el «bit "
+"suid» puede suponer un riesgo de seguridad. Sin embargo, el programa es bastante "
+"pequeño (unas 150 líneas de código) y, por lo tanto, si no confía en nuestro "
 "juicio, usted mismo puede verificar con bastante facilidad la seguridad del "
 "código."

diff --git a/debian/po/fr.po b/debian/po/fr.po
index 3f6ed841a9e81b62242302e1ab17e1f29098b08a..9c91f2eedf8a147c2a1cb5cff7933a13e6b67249 100644 (file)
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: beep 1.2.2-10\n"
 "Report-Msgid-Bugs-To: beep@packages.debian.org\n"
-"POT-Creation-Date: 2005-06-14 00:09+0200\n"
-"PO-Revision-Date: 2003-03-13 22:18+0100\n"
+"POT-Creation-Date: 2006-06-21 05:05-0500\n"
+"PO-Revision-Date: 2006-06-28 02:06-0500\n"
 "Last-Translator: Daniel Déchelotte <maitre_yodan@club-internet.fr>\n"
 "Language-Team: Debian-l10n-french <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -29,13 +29,15 @@ msgstr ""
 msgid ""
 "suid root for all, suid root with only group audio executable, not suid at "
 "all"
-msgstr "Exécution par tous en setuid root, Exécution par le seul groupe audio en setuid root, Pas de setuid root"
+msgstr ""
+"Exécution par tous en setuid root, Exécution par le seul groupe audio en "
+"setuid root, Pas de setuid root"
 
 #. Type: select
 #. Description
 #: ../templates:5
-msgid "How do you want to handle suid root for the beep program?"
-msgstr "Gestion des privilèges spéciaux du programme beep :"
+msgid "Install beep as:"
+msgstr "Installer beep en :"
 
 #. Type: select
 #. Description

diff --git a/debian/po/it.po b/debian/po/it.po
index e0f533d3ec4f8a9d15c415c0c6c42e6828c9f850..d642007df22ed0dfc4806a6cdca49329d9b434fd 100644 (file)
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: beep 1.2.2-12\n"
 "Report-Msgid-Bugs-To: beep@packages.debian.org\n"
-"POT-Creation-Date: 2005-06-14 00:09+0200\n"
+"POT-Creation-Date: 2006-06-21 05:05-0500\n"
 "PO-Revision-Date: 2005-10-15 12:08+0100\n"
 "Last-Translator: Stefano Melchior <stefano.melchior@openlabs.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -17,14 +17,14 @@ msgid ""
 "suid root for all, suid root with only group audio executable, not suid at "
 "all"
 msgstr ""
-"suid root per tutti, suid root solamente con gli eseguibili del "
-"gruppo audio, nient'affatto suid"
+"suid root per tutti, suid root solamente con gli eseguibili del gruppo "
+"audio, nient'affatto suid"
 
 #. Type: select
 #. Description
 #: ../templates:5
-msgid "How do you want to handle suid root for the beep program?"
-msgstr "Come si vuole gestire suid root per il programma beep?"
+msgid "Install beep as:"
+msgstr ""
 
 #. Type: select
 #. Description
@@ -51,6 +51,9 @@ msgid ""
 msgstr ""
 "Dal momento che ogni programma che usa suid root è un rischio per la "
 "sicurezza, questo non viene abilitato come opzione predefinita. Comunque, il "
-"programma risulta abbastanza piccolo (circa 150 linee di codice) e semplice da "
-"permettere di verificare da soli la sicurezza del codice, qualora non ci si "
-"fidasse del giudizio dell'autore."
+"programma risulta abbastanza piccolo (circa 150 linee di codice) e semplice "
+"da permettere di verificare da soli la sicurezza del codice, qualora non ci "
+"si fidasse del giudizio dell'autore."
+
+#~ msgid "How do you want to handle suid root for the beep program?"
+#~ msgstr "Come si vuole gestire suid root per il programma beep?"

diff --git a/debian/po/ja.po b/debian/po/ja.po
index f026f1248f7f80cd0c2071e2ae1a0a30e85afb0e..c3d2e6db2ace570ec37acc26fa23dc1922e6f362 100644 (file)
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: beep 1.2.2-12\n"
 "Report-Msgid-Bugs-To: beep@packages.debian.org\n"
-"POT-Creation-Date: 2005-06-14 00:09+0200\n"
+"POT-Creation-Date: 2006-06-21 05:05-0500\n"
 "PO-Revision-Date: 2005-10-17 12:32+0200\n"
 "Last-Translator: Hideki Yamane <henrich@debian.or.jp>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -37,8 +37,8 @@ msgstr ""
 #. Type: select
 #. Description
 #: ../templates:5
-msgid "How do you want to handle suid root for the beep program?"
-msgstr "beep ¥×¥í¥°¥é¥à¤Ø¤Î suid root ÀßÄê¤ò¤É¤¦¤·¤Þ¤¹¤«?"
+msgid "Install beep as:"
+msgstr ""
 
 #. Type: select
 #. Description
@@ -65,5 +65,8 @@ msgid ""
 msgstr ""
 "³Æ¥×¥í¥°¥é¥à¤ò root ¤Ë suid ¤¹¤ë¤Î¤Ï¥»¥­¥å¥ê¥Æ¥£¥ê¥¹¥¯¤Ë¤Ê¤ë¤Î¤Ç¡¢¥Ç¥Õ¥©¥ë¥È"
 "¤Ç¤Ï¤³¤ÎÊýË¡¤ÏºÎ¤ê¤Þ¤»¤ó¡£¤·¤«¤·¤Ê¤¬¤é¡¢¤³¤Î¥×¥í¥°¥é¥à¤ÏÈó¾ï¤Ë¾®¤µ¤¤¤Î¤Ç (150"
-"¹ÔÄøÅ٤Υ³¡¼¥É¤Ç¤¹)¡¢»ä¤ÎȽÃǤò¿®¤¸¤é¤ì¤Ê¤¤¾ì¹ç¡¢¤¢¤Ê¤¿¼«¿È¤Ç¥³¡¼¥É¤Î°ÂÁ´À­¤ò¡É"
-"³Îǧ¤¹¤ë¤Î¤Ï¤È¤Æ¤â´Êñ¤Ç¤¹¡£"
+"¹ÔÄøÅ٤Υ³¡¼¥É¤Ç¤¹)¡¢»ä¤ÎȽÃǤò¿®¤¸¤é¤ì¤Ê¤¤¾ì¹ç¡¢¤¢¤Ê¤¿¼«¿È¤Ç¥³¡¼¥É¤Î°ÂÁ´À­"
+"¤ò¡É³Îǧ¤¹¤ë¤Î¤Ï¤È¤Æ¤â´Êñ¤Ç¤¹¡£"
+
+#~ msgid "How do you want to handle suid root for the beep program?"
+#~ msgstr "beep ¥×¥í¥°¥é¥à¤Ø¤Î suid root ÀßÄê¤ò¤É¤¦¤·¤Þ¤¹¤«?"

diff --git a/debian/po/nl.po b/debian/po/nl.po
index 54f869adbd59beccf5176b4d759df61ed6dc0bc2..bdc1a122c00248d423e312239636acd6ca808131 100644 (file)
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: beep 1.2.2-11\n"
 "Report-Msgid-Bugs-To: beep@packages.debian.org\n"
-"POT-Creation-Date: 2005-06-14 00:09+0200\n"
+"POT-Creation-Date: 2006-06-21 05:05-0500\n"
 "PO-Revision-Date: 2003-09-07 20:58+0100\n"
 "Last-Translator: Tim Vandermeersch <qber66@skolelinux.no>\n"
 "Language-Team: dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -36,9 +36,8 @@ msgstr ""
 #. Type: select
 #. Description
 #: ../templates:5
-#, fuzzy
-msgid "How do you want to handle suid root for the beep program?"
-msgstr "Hoe suid root af te handelen voor beep programma?"
+msgid "Install beep as:"
+msgstr ""
 
 #. Type: select
 #. Description
@@ -67,3 +66,7 @@ msgstr ""
 "Omdat elk suid root programma een veiligheids risico is wordt dit niet "
 "standaard gedaan. Het programma is vrij klein (~150 regels code) en is "
 "redelijk makkelijk om zelf te verifiëren, als u mijn oordeel niet vertrouwd."
+
+#, fuzzy
+#~ msgid "How do you want to handle suid root for the beep program?"
+#~ msgstr "Hoe suid root af te handelen voor beep programma?"

diff --git a/debian/po/pt.po b/debian/po/pt.po
index fdec7866912864ee2d02b4e1f5da6185cb0774e2..b88090019334999c2e92133eff89e06cfb6a4afa 100644 (file)
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -1,14 +1,12 @@
 # Portuguese translation for beep's debconf messages.
-# 2005, Miguel Figueiredo <elmig@debianpt.org>
-#
-# 2005-12-24 - Initial translation
+# 2005-2006, Miguel Figueiredo <elmig@debianpt.org>
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: beep 1.2.2-16\n"
 "Report-Msgid-Bugs-To: beep@packages.debian.org\n"
-"POT-Creation-Date: 2005-06-14 00:09+0200\n"
-"PO-Revision-Date: 2005-12-24 15:08+0000\n"
+"POT-Creation-Date: 2006-06-21 05:05-0500\n"
+"PO-Revision-Date: 2006-06-28 02:07-0500\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
 "MIME-Version: 1.0\n"
@@ -27,8 +25,8 @@ msgstr ""
 #. Type: select
 #. Description
 #: ../templates:5
-msgid "How do you want to handle suid root for the beep program?"
-msgstr "Como deseja lidar com o suid root para o programa beep?"
+msgid "Install beep as:"
+msgstr "Instalar beep como:"
 
 #. Type: select
 #. Description
@@ -39,10 +37,10 @@ msgid ""
 "root (no suid bit at all), executable only by users of the group audio, or "
 "usable for all."
 msgstr ""
-"O beep tem de ser executado como root já que necessita de acesso ao "
-"hardware do altifalante. Existem várias possibilidades de tornar o "
-"programa utilizável:  Quer apenas para o root (sem o bit suid), executável "
-"apenas para utilizadores do grupo audio, ou utilizável para todos."
+"O beep tem de ser executado como root já que necessita de acesso ao hardware "
+"do altifalante. Existem várias possibilidades de tornar o programa "
+"utilizável:  Quer apenas para o root (sem o bit suid), executável apenas "
+"para utilizadores do grupo audio, ou utilizável para todos."
 
 #. Type: select
 #. Description
@@ -53,7 +51,7 @@ msgid ""
 "is fairly easy to verify the safety of the code yourself, if you don't trust "
 "my judgement."
 msgstr ""
-"Já que cada programa como suid root pode ser um risco de segurança isto "
-"não é feito por omissão.  No entanto, o programa é bastante pequeno (~150 "
-"linhas de código), por isso é bastante fácil verificar por si mesmo a "
-"segurança do código, se não acreditar no meu julgamento."
+"Já que cada programa como suid root pode ser um risco de segurança isto não "
+"é feito por omissão.  No entanto, o programa é bastante pequeno (~150 linhas "
+"de código), por isso é bastante fácil verificar por si mesmo a segurança do "
+"código, se não acreditar no meu julgamento."

diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index d6cef10ad216faa49fdb2f067fbf1ab30acc3972..a73eb2f41fce3635a7056e0eb90c3cd013cbfa6e 100644 (file)
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -11,17 +11,24 @@
 #
 #    Developers do not need to manually edit POT or PO files.
 #
+# Previous translators:
+#      André Luís Lopes <andrelop@ig.com.br>, 2003
+#      Felipe Augusto van de Wiel (faw) <felipe@cathedrallabs.org>, 2006
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: beep-1.2.2-10\n"
 "Report-Msgid-Bugs-To: beep@packages.debian.org\n"
-"POT-Creation-Date: 2005-06-14 00:09+0200\n"
-"PO-Revision-Date: 2003-03-15 22:56-0300\n"
-"Last-Translator: André Luís Lopes <andrelop@ig.com.br>\n"
-"Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
+"POT-Creation-Date: 2006-06-21 05:05-0500\n"
+"PO-Revision-Date: 2006-06-28 02:06-0500\n"
+"Last-Translator: Felipe Augusto van de Wiel (faw) <felipe@cathedrallabs."
+"org>\n"
+"Language-Team: l10n portuguese <debian-l10n-portuguese@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"pt_BR utf-8\n"
+"org>\n"
 
 #. Type: select
 #. Choices
@@ -30,15 +37,14 @@ msgid ""
 "suid root for all, suid root with only group audio executable, not suid at "
 "all"
 msgstr ""
-"suid root para todos, suid root com somente o grupo audio executável, sem "
-"suid"
+"suid root para todos, suid root com propriedade de execução somente para o "
+"grupo audio, sem suid"
 
 #. Type: select
 #. Description
 #: ../templates:5
-#, fuzzy
-msgid "How do you want to handle suid root for the beep program?"
-msgstr "Como gerenciar suid root para o programa beep ?"
+msgid "Install beep as:"
+msgstr "Instalar beep como:"
 
 #. Type: select
 #. Description
@@ -51,21 +57,20 @@ msgid ""
 msgstr ""
 "O beep deve ser executado como root, uma vez que o mesmo precisa acessar o "
 "hardware do alto-falante. Existem diversas possibilidades para tornar o "
-"programa utilizável : somente executável pelo root (sem suid), executável "
-"somente pelos usuários do grupo audio ou executável para todos."
+"programa utilizável : somente executável pelo root (sem suid), executável "
+"somente pelos usuários do grupo audio ou executável para todos."
 
 #. Type: select
 #. Description
 #: ../templates:5
-#, fuzzy
 msgid ""
 "Since each program set as suid root can be a security risk this is not done "
 "by default.  However, the program is quite small (~150 lines of code), so it "
 "is fairly easy to verify the safety of the code yourself, if you don't trust "
 "my judgement."
 msgstr ""
-"Devido a cada programa que é configurado para ser executado com suid root "
-"ser um risco de segurança isto não é feito por padrão. Porém, o programa é "
-"bastante pequeno (aproximadamente 150 linhas de código) e é muito fácil "
-"verificar a segurança do código caso você não confie em no julgamento no "
-"mantenedor deste pacote."
+"Devido a cada programa que é configurado para ser executado com suid root "
+"ser um risco de segurança isto não é feito por padrão. Porém, o programa é "
+"bastante pequeno (aproximadamente 150 linhas de código) e é muito fácil "
+"verificar a segurança do código você mesmo, caso você não confie no "
+"julgamento do mantenedor deste pacote."

diff --git a/debian/po/ru.po b/debian/po/ru.po
index c40a830a1b2b9cd1a9b1743cdf7eac8f063b496d..457364f8989c5717b265bd0fe242742f5bc4a190 100644 (file)
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: beep@packages.debian.org\n"
-"POT-Creation-Date: 2005-06-14 00:09+0200\n"
+"POT-Creation-Date: 2006-06-21 05:05-0500\n"
 "PO-Revision-Date: 2003-10-02 17:10+0500\n"
 "Last-Translator: Ilgiz Kalmetev <translator@ilgiz.pp.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -35,9 +35,8 @@ msgstr ""
 #. Type: select
 #. Description
 #: ../templates:5
-#, fuzzy
-msgid "How do you want to handle suid root for the beep program?"
-msgstr "ëÁË ÏÂÒÁÂÏÔÁÔØ suid root ÄÌÑ ÐÒÏÇÒÁÍÍÙ beep?"
+msgid "Install beep as:"
+msgstr ""
 
 #. Type: select
 #. Description
@@ -67,3 +66,7 @@ msgstr ""
 "ÐÏÜÔÏÍÕ suid-ÂÉÔ ÐÏ ÕÍÏÌÞÁÎÉÀ ÎÅ ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ. ïÄÎÁËÏ, ÐÒÏÇÒÁÍÍÁ "
 "ÉÓËÌÀÞÉÔÅÌØÎÏ ÍÁÌÁ (~150 ÓÔÒÏË ËÏÄÁ), É ÷Ù ÏÞÅÎØ ÌÅÇËÏ ÍÏÖÅÔÅ ÐÒÏ×ÅÒÉÔØ "
 "ÂÅÚÏÐÁÓÎÏÓÔØ ÅÅ ËÏÄÁ ÓÁÍÉ, ÅÓÌÉ ÎÅ ÄÏ×ÅÒÑÅÔÅ ÍÎÅ."
+
+#, fuzzy
+#~ msgid "How do you want to handle suid root for the beep program?"
+#~ msgstr "ëÁË ÏÂÒÁÂÏÔÁÔØ suid root ÄÌÑ ÐÒÏÇÒÁÍÍÙ beep?"

diff --git a/debian/po/sv.po b/debian/po/sv.po
index aa66db36b61d4aafd79a01768e5a4453cb5e9196..903a07aaa754a561398b1087644de7f7d66b3dab 100644 (file)
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -7,17 +7,18 @@
 # /usr/share/doc/po-debconf/README-trans
 # or http://www.debian.org/intl/l10n/po-debconf/README-trans
 # Developers do not need to manually edit POT or PO files.
-# , fuzzy
-# 
-# 
+# Translators:
+#      Daniel Nylander <po@danielnylander.se>, 2005-2006.
+#
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: beep 1.2.2-15\n"
+"Project-Id-Version: beep\n"
 "Report-Msgid-Bugs-To: beep@packages.debian.org\n"
-"POT-Creation-Date: 2005-06-14 00:09+0200\n"
-"PO-Revision-Date: 2005-10-11 12:02+0200\n"
+"POT-Creation-Date: 2006-06-21 05:05-0500\n"
+"PO-Revision-Date: 2006-06-21 12:49-0500\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
-"Language-Team: Swedish <sv@li.org>\n"
+"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,40 +26,23 @@ msgstr ""
 #. Type: select
 #. Choices
 #: ../templates:3
-msgid ""
-"suid root for all, suid root with only group audio executable, not suid at "
-"all"
-msgstr "suid root för alla, suid root bara för gruppen 'audio', inte suid alls"
+msgid "suid root for all, suid root with only group audio executable, not suid at all"
+msgstr "suid root för alla, suid root endast för gruppen \"audio\", inte suid alls"
 
 #. Type: select
 #. Description
 #: ../templates:5
-msgid "How do you want to handle suid root for the beep program?"
-msgstr "Hur vill du hantera suid root för programmet 'beep'?"
+msgid "Install beep as:"
+msgstr "Installera beep som:"
 
 #. Type: select
 #. Description
 #: ../templates:5
-msgid ""
-"beep must be run as root since it needs to access the speaker hardware. "
-"There are several posibilities to make the program usable:  Either only for "
-"root (no suid bit at all), executable only by users of the group audio, or "
-"usable for all."
-msgstr ""
-"beep måste köras som root eftersom den behöver tillgång till "
-"högtalarhårdvaran. Det finns flera sätt att göra programmet användbart:  "
-"Antingen bara för root (ingen suid bit alls), exekverbar bara för användare "
-"i gruppen 'audio' eller användbar för alla (suid)."
+msgid "beep must be run as root since it needs to access the speaker hardware. There are several posibilities to make the program usable:  Either only for root (no suid bit at all), executable only by users of the group audio, or usable for all."
+msgstr "beep måste köras som root eftersom den behöver åtkomst till högtalarhårdvaran. Det finns flera sätt att göra programmet användbart:  Antingen endast för root (ingen suid-bit alls), körbar endast för användare i gruppen \"audio\" eller användbar för alla."
 
 #. Type: select
 #. Description
 #: ../templates:5
-msgid ""
-"Since each program set as suid root can be a security risk this is not done "
-"by default.  However, the program is quite small (~150 lines of code), so it "
-"is fairly easy to verify the safety of the code yourself, if you don't trust "
-"my judgement."
-msgstr ""
-"Eftersom varje program som är suid root kan vara en säkerhetsrisk görs detta "
-"inte som standard.  Programmet är ganska litet (~150 rader kod) och är lätt "
-"att verifiera säkerheten i koden om du inte litar på mitt omdömme."
+msgid "Since each program set as suid root can be a security risk this is not done by default.  However, the program is quite small (~150 lines of code), so it is fairly easy to verify the safety of the code yourself, if you don't trust my judgement."
+msgstr "Eftersom de program som är suid root kan vara en säkerhetsrisk kommer detta inte göras som standard.  Programmet är ganska litet (~150 rader kod) och är lätt att validera säkerheten i koden om du inte litar på mitt omdöme."

diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index d6afafca13c92e50125ab94a124d9d5baa975239..637a4d57221b864243b9bbf4ca36b67faa529023 100644 (file)
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -1,22 +1,14 @@
-#
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-#    Developers do not need to manually edit POT or PO files.
+# debconf translation for the beep package.
+# Copyright (C) 2002-2006 Gerfried Fuchs <alfie@debian.org>
+# This file is distributed under the same license as the beep package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: beep 1.2.2-16\n"
+"Project-Id-Version: beep VERSION\n"
 "Report-Msgid-Bugs-To: beep@packages.debian.org\n"
-"POT-Creation-Date: 2005-06-14 00:09+0200\n"
+"POT-Creation-Date: 2006-06-21 05:05-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -35,7 +27,7 @@ msgstr ""
 #. Type: select
 #. Description
 #: ../templates:5
-msgid "How do you want to handle suid root for the beep program?"
+msgid "Install beep as:"
 msgstr ""
 
 #. Type: select

diff --git a/debian/po/vi.po b/debian/po/vi.po
index 8a3048203ca68a94f77c81a88eea3ad9c160b68a..6ddea2aab9c6694588b71c18e80a48859cc8b00a 100644 (file)
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -1,20 +1,19 @@
 # Vietnamese translation for Beep.
-# Copyright © 2005 Free Software Foundation, Inc.
-# Clytie Siddall <clytie@riverland.net.au>, 2005.
+# Copyright © 2006 Free Software Foundation, Inc.
+# Clytie Siddall <clytie@riverland.net.au>, 2005-2006.
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: beep 1.2.2\n"
+"Project-Id-Version: beep 1.2.2-18\n"
 "Report-Msgid-Bugs-To: beep@packages.debian.org\n"
-"POT-Creation-Date: 2005-06-14 00:09+0200\n"
-"PO-Revision-Date: 2005-12-30 12:48+0100\n"
+"POT-Creation-Date: 2006-06-21 05:05-0500\n"
+"PO-Revision-Date: 2006-06-23 03:49-0500\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
-"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
-"X-Generator: LocFactoryEditor 1.5.1b\n"
 
 #. Type: select
 #. Choices
@@ -23,14 +22,14 @@ msgid ""
 "suid root for all, suid root with only group audio executable, not suid at "
 "all"
 msgstr ""
-"« suid root » cho tất cả, « suid root » chỉ với tập tin có thể chạy âm thanh "
-"nhóm, không có « suid root »"
+"« suid root » cho tất cả, « suid root » chỉ với tập tin cho phép âm thanh "
+"nhóm chạy, không có « suid root » nào cả"
 
 #. Type: select
 #. Description
 #: ../templates:5
-msgid "How do you want to handle suid root for the beep program?"
-msgstr "Bạn có muốn quản lý « suid root » cho chương trình beep như thế nào?"
+msgid "Install beep as:"
+msgstr "Cài đặt beep dạng:"
 
 #. Type: select
 #. Description
@@ -42,8 +41,8 @@ msgid ""
 "usable for all."
 msgstr ""
 "Trình beep phải chạy với tư cách người chủ (root) vì nó cần phải truy cập "
-"phần cứng loa. Vì vậy, bạn cần chọn mức độ truy cập thích hợp:\n"
-"• chỉ cho phép người chủ truy cập trình này (không có bit suid)\n"
+"phần cứng loa. Vì vậy, bạn hãy chọn mức độ truy cập thích hợp:\n"
+"• chỉ cho phép người chủ truy cập trình này (không có bit suid nào cả)\n"
 "• chỉ cho phép người dùng trong nhóm « audio » (âm thanh) chạy trình này\n"
 "• cho phép mọi người truy cập trình này."
 
@@ -56,7 +55,7 @@ msgid ""
 "is fairly easy to verify the safety of the code yourself, if you don't trust "
 "my judgement."
 msgstr ""
-"Vì mỗi chương trình với bit suid được lập có thể rủi ro bảo mật, tùy chọn "
-"này không phải mặc định. Tuy nhiên, trình beep hơi nhỏ (~150 dòng mã) thì "
-"hơi dễ dàng để tự kiểm lại mức độ an toàn của mã này, nếu bạn muốn làm như "
-"thế."
+"Vì mỗi chương trình được đặt là « suid root » thì có thể rủi ro bảo mật, tùy "
+"chọn này không phải được bật theo mặc định. Tuy nhiên, trình beep hơi nhỏ "
+"(~150 dòng mã) thì hơi dễ dàng để tự kiểm lại mức độ an toàn của mã này, nếu "
+"bạn muốn cẩn thận."

diff --git a/debian/postrm b/debian/postrm
index 9abaecaa72db2c5768b86d52719a88ca9c6c5320..fa9ecee5aca9d868c944e6c523d1f31cc88417e3 100644 (file)
--- a/debian/postrm
+++ b/debian/postrm
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 # postrm for beep
 
-if [ "$1" = purge -a -e /usr/share/debconf/confmodule ]; then
+if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then
        . /usr/share/debconf/confmodule
        db_purge
 fi

diff --git a/debian/rules b/debian/rules
index bed40c81d603b501556345db2098ad5c426b3791..56cae22af82f7216a4a0698a520b19c1eedc9a03 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,6 @@ else
 endif
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
        INSTALL_PROGRAM += -s
-       STRIP = true
 endif
 
 
@@ -48,11 +47,8 @@ install: build
        $(INSTALL_DIR) $(TMP1)
        cd $(TMP1) && $(INSTALL_DIR) usr/bin usr/share/man/man1 \
                usr/share/doc/$(PKG1)
-       $(MAKE) install INSTALL_DIR=$(TMP1)/usr/bin \
-                MAN_DIR=$(TMP1)/usr/share/man/man1
-       -test "$(STRIP)" = "true" && \
-               strip --remove-section=.comment --remove-section=.note \
-                       --strip-unneeded $(TMP1)/usr/bin/beep
+       $(INSTALL_PROGRAM) beep $(TMP1)/usr/bin
+       $(INSTALL_FILE) beep.1.gz $(TMP1)/usr/share/man/man1
        gunzip $(TMP1)/usr/share/man/man1/beep.1.gz
        cd $(TMP1)/usr/share/man/man1 && patch beep.1 $(TMP1)/../beep.1.diff
        -rm -f $(TMP1)/usr/share/man/man1/beep.1.orig
@@ -73,7 +69,8 @@ binary-indep: build
 binary-arch: build install
        $(checkdir)
        $(checkroot)
-       $(INSTALL_DIR) $(TMP1)/DEBIAN $(TMP2)/DEBIAN
+       $(INSTALL_DIR) $(TMP1)/DEBIAN $(TMP1)/usr/share/lintian/overrides \
+               $(TMP2)/DEBIAN
        $(INSTALL_FILE) debian/README.Debian debian/copyright \
                $(TMP1)/usr/share/doc/$(PKG1)
        $(INSTALL_FILE) debian/changelog \
@@ -81,6 +78,8 @@ binary-arch: build install
        gzip -9 $(TMP1)/usr/share/doc/$(PKG1)/changelog.Debian
        $(INSTALL_SCRIPT) debian/postinst debian/postrm debian/config \
                $(TMP1)/DEBIAN
+       $(INSTALL_FILE) debian/overrides \
+               $(TMP1)/usr/share/lintian/overrides/$(PKG1)
        po2debconf debian/templates > $(TMP1)/DEBIAN/templates
        dpkg-shlibdeps -Tdebian/substvars -dDepends $(TMP1)/usr/bin/beep
        dpkg-gencontrol -ldebian/changelog -isp -Tdebian/substvars -p$(PKG1) \

diff --git a/debian/templates b/debian/templates
index 10a6d6f3ff576f4bff60108ea259f0c91402c215..117d6c40d25d8cc0734a4d3c41f3f80a8d0fdd4f 100644 (file)
--- a/debian/templates
+++ b/debian/templates
@@ -2,7 +2,7 @@ Template: beep/suid_option
 Type: select
 _Choices: suid root for all, suid root with only group audio executable, not suid at all
 Default: suid root with only group audio executable
-_Description: How do you want to handle suid root for the beep program?
+_Description: Install beep as:
  beep must be run as root since it needs to access the speaker hardware.
  There are several posibilities to make the program usable:  Either only
  for root (no suid bit at all), executable only by users of the group