From 05e67326bf208399329240c1c5ab5513d15b0505 Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Thu, 10 Jun 2010 13:31:24 +0200 Subject: [PATCH 01/48] Imported Upstream version 1.2.2 --- CHANGELOG | 62 ++++++++++ COPYING | 340 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ CREDITS | 33 ++++++ INSTALL | 10 ++ Makefile | 19 +++ README | 121 +++++++++++++++++++ beep.1.gz | Bin 0 -> 3327 bytes beep.c | 299 +++++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 884 insertions(+) create mode 100644 CHANGELOG create mode 100644 COPYING create mode 100644 CREDITS create mode 100644 INSTALL create mode 100644 Makefile create mode 100644 README create mode 100644 beep.1.gz create mode 100644 beep.c diff --git a/CHANGELOG b/CHANGELOG new file mode 100644 index 0000000..52dfe08 --- /dev/null +++ b/CHANGELOG @@ -0,0 +1,62 @@ +1.2.2 +----- +- Man pages now gzip -9 for better compression +- Table of frequencies added to man page +- Fix for platforms with unsigned chars +- On ioctl() errors, beep will now do a printf("\a") so that, at very least, youget a beep. :) + + +1.2.1 +----- +- fixed segfault when handling long options + +1.2.0 +----- +- added -n/--new support - so beep FINALLY handles multiple beeps on a single + command line. +- -f now takes decimal frequencies, not just whole numbers. + +1.0.2 +----- +- Added more common -V option, as companion to -v and --version +- README now addresses the question of multiple beeps, and composing music with + beep. + +1.0.1 +----- +- Fixed some outdated comments in the source, and a typo in the man page. + +1.0.0 +----- +- added a SIGINT handler, so Ctrl-C no longer leaves the speaker wailing + forever +- added -v/--version and -h/--help support +- updated man page +- this release is changed from 0.8 to 1.0.0, it's worthy of it. Feature + complete and no outstanding bugs that I know of. + +0.6.1 +----- +- changed man page to gzip format (instead of bzip2) +- updated man page and README to explain ioctl problems + + +0.6 +--- +- added -D option. Both -d and -D set inter-repetition delay, but -D instructs + beep to delay even after the last beep, where -d delays only between beeps, + and terminates immediately after last beep. +- incorporated Rick Franchuk's idea of stdin hooks - dear god -c is annoying. +- added a man page + + +0.5 +--- +- changed over from manually parsing command line parms to getopt() +- changed atoi() calls into sscanf() calls, to get more meaningful error + handling + +0.4 +--- +- first useable +- initial options supported: -f, -l, -d, -r diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..60549be --- /dev/null +++ b/COPYING @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) 19yy + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/CREDITS b/CREDITS new file mode 100644 index 0000000..ed92613 --- /dev/null +++ b/CREDITS @@ -0,0 +1,33 @@ +I (Johnathan Nightingale) handled the original coding, distribution, +maintenance, etc. + +Peter Tirsek (peter at tirsek dot com) filled me in on where the magical +fairy number comes from (see beep.c). He also tracked down the relevant +kernel code that causes the ioctl()s to die under certain conditions +(see the README or man page sections on ioctl). He is truly a wonderful +person. + +Andreas Hochsteger (e9625392 at student dot tuwien dot ac dot at) contributed +several useful little patches, and was my inspiration for the -d/-D +distinction. He's also thrown pointers my way about code packaging, which +are appreciated. + +Rick Franchuk (rickf at transpect dot net) came up with the idea of the -s and +-c stdin hooks. Since most people will be using beep to tell them when a new +line pops up in log, or mail, or what-have-you, this was quite clever of him +and though I really did mean to do it anyhow, he sent me the patch before I had +bothered to write it, so he gets the credit. :) + +Serge Winitzki (winitzki at erebus.phys.cwru.edu) suggested having beep take +floats for frequency, instead of int's. + +The guys at freshmeat.net really deserve a big ol whack of credit too, for +running a very cool site in general, and for running one so successfully that +my little 4k program generated literally hundreds of emails in reply. It gives +one a great sense of community to see such an overwhelming response. + +In particular, fryguy[at]freshmeat (Ryan Weaver) rocks supremely, for packaging +beep in RPM format, and maintaining said package until he decides not to. I +really did mean to make a spec for it myself, but hey, when freshmeat offers to +maintain your packages, you'd have to have a *real* good reason to say no. + diff --git a/INSTALL b/INSTALL new file mode 100644 index 0000000..d2beaa5 --- /dev/null +++ b/INSTALL @@ -0,0 +1,10 @@ +Couldn't be easier: + +make +make install + +By default, it'll put the executable ("beep") in /usr/bin. If you don't like +this, change the makefile as appropriate. + +This will get things off and running, but you'll probably want to check the man +page section "IOCTL_WACKINESS" to see if you will need to fix any permissions. \ No newline at end of file diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..5856f9f --- /dev/null +++ b/Makefile @@ -0,0 +1,19 @@ +CC=gcc +FLAGS=-Wall +EXEC_NAME=beep +INSTALL_DIR=/usr/bin +MAN_FILE=beep.1.gz +MAN_DIR=/usr/man/man1 + +default : beep + +clean : + rm ${EXEC_NAME} + +beep : beep.c + ${CC} ${FLAGS} -o ${EXEC_NAME} beep.c + +install : + cp ${EXEC_NAME} ${INSTALL_DIR} + rm -f /usr/man/man1/beep.1.bz2 + cp ${MAN_FILE} ${MAN_DIR} diff --git a/README b/README new file mode 100644 index 0000000..efac280 --- /dev/null +++ b/README @@ -0,0 +1,121 @@ +Intro +----- + +I just got so tired of being limited to printf("\a"); when I wanted a terminal +beep. This program isn't supposed to be anything stupendous, it's just +supposed to get the job done. Its intended purpose in life is to live inside +shell/perl scripts, and allow a little more granularity than you get with the +default terminal bell. Maybe I'm the only one who thinks this is useful. :) + +If for any reason you decide you need to, contact me: + +johnath@johnath.com +http://johnath.com/ + +And beep can generally be found at: + +http://johnath.com/beep/ + +For installation instructions, see INSTALL. +For copying and (non-)warranty information, see COPYING. +For usage information, check the man page. + +fryguy (Ryan Weaver) at freshmeat.net has packaged beep in RPM format and has +promised to try to get new rpms out with each new source release. RPMs can be +found, among other places, at: + +ftp://ftp.falsehope.com/pub/beep/ + +or + +ftp://ftp.freshmeat.net/pub/rpms/beep/ + + +A note about ioctl +------------------ + +As noted in the man page, some users are running into a situation where beep +dies with a complaint from ioctl(). The reason for this, as Peter Tirsek was +nice enough to point out to me, stems from how the kernel handles beep's +attempt to poke at (for non-programmers: ioctl is a sort of catch-all function +that lets you poke at things that have no other predefined poking-at mechanism) +the tty, which is how it beeps. The short story is, the kernel checks that +either: + +- you are the superuser +- you own the current tty + +What this means is that root can always make beep work (to the best of my +knowledge!), and that any local user can make beep work, BUT a non-root remote +user cannot use beep in it's natural state. What's worse, an xterm, or other +x-session counts, as far as the kernel is concerned, as 'remote', so beep +won't work from a non-priviledged xterm either. I had originally chalked this +up to a bug, but there's actually nothing I can do about it, and it really is +a Good Thing that the kernel does things this way. There is also a solution. + +By default beep is not installed with the suid bit set, because that would +just be zany. On the other hand, if you do make it suid root, all your +problems with beep bailing on ioctl calls will magically vanish, which is +pleasant, and the only reason not to is that any suid program is a potential +security hole. Conveniently, beep is very short, so auditing it is pretty +straightforward. + +Decide for yourself, of course, but it looks safe to me - there's only one +buffer and fgets doesn't let it overflow, there's only one file opening, and +while there is a potential race condition there, it's with /dev/console. If +someone can exploit this race by replacing /dev/console, you've got bigger +problems. :) + +So the quick solution is beep is not beeping when you want it to is: + +$ su +Password: +# chmod 4755 /usr/bin/beep + +(or wherever you put it) + +The one snag is that this will give any little nitwit the ability to run beep +successfully - make sure this is what you want. If it isn't, a slightly more +complex fix would be something like: + +# chgrp beep /usr/bin/beep +# chmod 4750 /usr/bin/beep + +and then add only beep-worthy users to the 'beep' group. + +Playing Songs +------------- + +A surprising number of people have sent in requests, or even patches, to help +beep play multiple, different sounds off a single invocation. I had always +thought that if people wanted a more complex melody, they would just do +something like: + +$ cat << EOF > song.sh +#!/bin/sh +beep +beep +etc... +EOF + +Nevertheless, because of repeated and vociferous demand, version 1.2 (and +presumably all later versions) include the -n/--new switch which allows you to +use one command line to create multiple beeps. Check the man page for +details. I have also had a couple people suggest that I encourage the +development of such shell scripts/command lines, even collect the particularly +melodious ones. Certainly if anyone feels like sending some to me, I will put +them somewhere visible, or even include them as a sample. I think Dvorak's New +World Symphony, 4th Movement, for example, would make a lovely shell script. +I also wouldn't mind a rendition of BNL's If I had a million dollars. But by +all means, be creative. + +All files copyright (C) Johnathan Nightingale, 2002. +All files distributed under the GNU general public license. + + + + + + + + diff --git a/beep.1.gz b/beep.1.gz new file mode 100644 index 0000000000000000000000000000000000000000..800f92cb6af5c5d41f087e7866a1274dfe21d76c GIT binary patch literal 3327 zcmVViwFo@v7|f#17c-ma4s-*YZNiFPv0gGGtJ#l^knp8JvU{iQm+xVTXV>Zf0H zlP%QYWODe^V0?F}u1elU&F)ml~Ua)w7&sFhxO*?0Hb z)%DHY^lmUdm2HFnd>s|)>UV|DGJQ7bGf$uA>C?;K?DxU=@@BhVUEkbKudnVD-i|8% z8C7P5&+Uun8@`SfA_$+RtiOBtC@+6aOCC+*t*d?)<0o*<%_IK$u~J_awlvBHmFWuFtER2gpRL8>g|2H`u9d6g@XRfjy2@2)D>KA~9S^y| zRJqAjUFyuxLyhq^Hx<5EFFM*vc^IhNuT4`bpEb4)eyA!JY_X=ko4c+S25a5YaMN65 zLt5ao%d)niveyOFz@sPt1w90bEa*slEOe(<+B#ITHbi9`qf0e+E>}9>RQ%a0QR^m* z#Th4Msa#Eg9`YYyGE?Zb4C+yrt%2rCqpPSlB>d5O$XeI@VQ1^d9b6r9R<3z~($fMk zPC{uGxG=MYh1r&_F%*QiG}#Xg?c13*f41~lrl335}SA%ZpmAd>kq?e%cME#8KKU45zf-_IN z(rRuh)4;|vU=ap=7|LxLGjB@`D4S+!E1iyp8FWK@s^cSSpdilDn*pA!GGZt|%z8*f zg~nz9<^qye3kS4DM)2dUu4PZx!Xfn464$ieAbj%v!X_?^K3I!}TYhOwZGw$P-c62| z06N&~iO5C7P|26`=khf0QtCB@Jy!wO4l4tM_s+nrKYIxqvQ!5PAEAXP@JX0oxVFpz z4+bMc0Y^`hJRZ+m`(fN>y@W>E0(+(%x(MVGT({J~>{bgXL2m3QVspBAad=M(xT9J3 zM2O4EHt)ijC(xs=SwtL?KQQ zGQ{DkXdAh+@GDi1! za5R|=1}i~9-MG93Q)v}BDUyCzG{$UEh=Xkdj7f^ps%YX;2?`!@`AzN8N{&}pAwXVm z?4Agz@+5&~LM6!p63m!TI^DKasAsF!#=(Wh5U660j#Qr88IV9`x z_QFs1bPz*wlR}HeE&JZp3N?pZ0jzCl8+>P!=nzx7*UM<8EfDB?pI8+x9KFO=$1B@Y zJLsH9DB{d2+Prf!bH~ISiF2M~0jj(jDFs)iFR} z+L(*^a+D=OR$!FFNA4LfW((bDk^wywh%Z*-H|@C z2Su~f{UOH_@nNCI5|y8v3#hE+b!qGGEC2|br)MUpZEaF9@qhi&GyI~@fGlun{oHyX z+1A5rIIM7D5%XljcIV@E=dXPssRZuJNk54sq>4zb8-XZEIvqv&3F|miPnO&Tdf8ng zkWu8pj0VAh8$6o5KBdK7vB>IIlOWV8*QEnTgA3aFB@Ln`8Xq%u4;Av(0g13wZ$N?~ z&r7k$sL`r)^U+F&Y|*#!U=Xw|DQN#uH~Uz#|Ag4Zr~0p&gAdeBt-W96JNW)10&dh1 z;3}tmAt$xsMBt849;zuo%S409JH66O($Hyio}xN_2O>x1knr53bcs)3w%P&C%C^}g zP)QD5=`GwT0V*KHikOxGZDWAEgLlUh6x2SfQz{#2Kf;O;Dq%BX$c#!8BqGEyg8?cF zBn7N~e&dXne#1MTt0OV<0a8tL+rrKlsCOh=!?SspwP^WKwJ+^iMB)}&w+ zw;+}AQe7sCsVb~omzuU|tisM{uuVY}88kS?63Z7U$qpt<g+dle{%ZiB36Ppc|4Hd znO>jWe^Osg&i*;Qy12WO?uI^=ZY#MKi4;Y6OeEfhHpXDA@kQmF^=L}H03E{CcA3w* zER?%@k{Vg&Ymco=4Mfh61<8$}> z+!MWSWlFSSRgS0^rFQ5LtgJ&60EBmm{f0}c~!fyP{J=>Y`0vihsv!=lh4gx_9EMe92OF#%TT6EFHecj zMGe*I=X+M8@Q@tZn57G5vz(m@^M5R1s@SquIkpy=cA~{3UaXAbipKWgBFG zQLZDHKXQ(7zt{{SdY8+cG;s;LBysdM0=Y(}GD0B?hq6scANV+3Z}_MyBIyxZdA8wQ zDH%~`L1$KYiyca)={8X!_6RZ)K^^%GnBd4J0y6rCVLW8{N37zGf)UE1P{Kk6S$xYN zbF-3sAV-T<982wCgDBL1^VjTg zHL_d)bD>?$qbJS{ryoM3YZ-NwXp!A^?iJ@*2sQ_X@VYROJk@9esW>M<5}CDZ8syT& zoa{zu5Z0hN%3udvAYlx@-zv%4)uxge8YQe`P8c>Q>Y1eB@QBxaX+kKz+t1D8 zKHmFiv1uV=J|07;o2R;THnEe4n#pjX)EO<--z=T{4w!fjpUv!iZniLi;P-ne$%&8u zY;6YG;g#YISk~ZrVzUnY#9|-teCDY#jO<1gsno}kU2p|qx)=HQuLyD!W$MlG(UID3 zeX~Ea)xL~?`I?Q97qYlpv&^ONHA5k7;nbK0>RT zQ3X9?m4e%F0eYvCP%;=7L7jaWjH_aB_UhH)+k^4j!P#H&bbLHM9Gv6f-Rtr3 z;2b}_J~$X33@-3+_ztT+;Ni_XEc(EA$CL47@DUI14*7te-W(i_Uk^_3@P_YB_|x0B zSbvHK2z|!`j}Bks7bqw@h<6ErNlAaL4sY;60R6_bF5yk`l6J5-m*gE?ZwUY z?fvxXV-$XCYL-^Wwc^g7|8NUb5{tj5&oSWrH`#ac`Tp|yHie_`a_Y?y<|~jq2##d* zkGKz9b;T$FVl+Ik`vb9iF;{a+!~rIp4D_{Co<^@9uRg1fX-a<6&Pssj6H4OBlNLX~ z)hYU_xHtYc$fh?Q#=0 +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* I don't know where this number comes from, I admit that freely. A + wonderful human named Raine M. Ekman used it in a program that played + a tune at the console, and apparently, it's how the kernel likes its + sound requests to be phrased. If you see Raine, thank him for me. + + June 28, email from Peter Tirsek (peter at tirsek dot com): + + This number represents the fixed frequency of the original PC XT's + timer chip (the 8254 AFAIR), which is approximately 1.193 MHz. This + number is divided with the desired frequency to obtain a counter value, + that is subsequently fed into the timer chip, tied to the PC speaker. + The chip decreases this counter at every tick (1.193 MHz) and when it + reaches zero, it toggles the state of the speaker (on/off, or in/out), + resets the counter to the original value, and starts over. The end + result of this is a tone at approximately the desired frequency. :) +*/ +#ifndef CLOCK_TICK_RATE +#define CLOCK_TICK_RATE 1193180 +#endif + +#define VERSION_STRING "beep-1.2.2" +char *copyright = +"Copyright (C) Johnathan Nightingale, 2002. " +"Use and Distribution subject to GPL. " +"For information: http://www.gnu.org/copyleft/."; + +/* Meaningful Defaults */ +#define DEFAULT_FREQ 440.0 /* Middle A */ +#define DEFAULT_LENGTH 200 /* milliseconds */ +#define DEFAULT_REPS 1 +#define DEFAULT_DELAY 100 /* milliseconds */ +#define DEFAULT_END_DELAY NO_END_DELAY +#define DEFAULT_STDIN_BEEP NO_STDIN_BEEP + +/* Other Constants */ +#define NO_END_DELAY 0 +#define YES_END_DELAY 1 + +#define NO_STDIN_BEEP 0 +#define LINE_STDIN_BEEP 1 +#define CHAR_STDIN_BEEP 2 + +typedef struct beep_parms_t { + float freq; /* tone frequency (Hz) */ + int length; /* tone length (ms) */ + int reps; /* # of repetitions */ + int delay; /* delay between reps (ms) */ + int end_delay; /* do we delay after last rep? */ + int stdin_beep; /* are we using stdin triggers? We have three options: + - just beep and terminate (default) + - beep after a line of input + - beep after a character of input + In the latter two cases, pass the text back out again, + so that beep can be tucked appropriately into a text- + processing pipe. + */ + struct beep_parms_t *next; /* in case -n/--new is used. */ +} beep_parms_t; + +/* Momma taught me never to use globals, but we need something the signal + handlers can get at.*/ +int console_fd = -1; + +/* If we get interrupted, it would be nice to not leave the speaker beeping in + perpetuity. */ +void handle_signal(int signum) { + switch(signum) { + case SIGINT: + if(console_fd >= 0) { + /* Kill the sound, quit gracefully */ + ioctl(console_fd, KIOCSOUND, 0); + close(console_fd); + exit(signum); + } else { + /* Just quit gracefully */ + exit(signum); + } + } +} + +/* print usage and exit */ +void usage_bail(const char *executable_name) { + printf("Usage:\n%s [-f freq] [-l length] [-r reps] [-d delay] " + "[-D delay] [-s] [-c]\n", + executable_name); + printf("%s [Options...] [-n] [--new] [Options...] ... \n", executable_name); + printf("%s [-h] [--help]\n", executable_name); + printf("%s [-v] [-V] [--version]\n", executable_name); + exit(1); +} + + +/* Parse the command line. argv should be untampered, as passed to main. + * Beep parameters returned in result, subsequent parameters in argv will over- + * ride previous ones. + * + * Currently valid parameters: + * "-f " + * "-l " + * "-r " + * "-d " + * "-D " (similar to -d, but delay after last repetition as well) + * "-s" (beep after each line of input from stdin, echo line to stdout) + * "-c" (beep after each char of input from stdin, echo char to stdout) + * "-h/--help" + * "-v/-V/--version" + * "-n/--new" + * + * March 29, 2002 - Daniel Eisenbud points out that c should be int, not char, + * for correctness on platforms with unsigned chars. + */ +void parse_command_line(int argc, char **argv, beep_parms_t *result) { + int c; + + struct option opt_list[4] = {{"help", 0, NULL, 'h'}, + {"version", 0, NULL, 'V'}, + {"new", 0, NULL, 'n'}, + {0,0,0,0}}; + while((c = getopt_long(argc, argv, "f:l:r:d:D:schvVn", opt_list, NULL)) + != EOF) { + int argval = -1; /* handle parsed numbers for various arguments */ + float argfreq = -1; + switch(c) { + case 'f': /* freq */ + if(!sscanf(optarg, "%f", &argfreq) || (argfreq >= 20000 /* ack! */) || + (argfreq <= 0)) + usage_bail(argv[0]); + else + result->freq = argfreq; + break; + case 'l' : /* length */ + if(!sscanf(optarg, "%d", &argval) || (argval < 0)) + usage_bail(argv[0]); + else + result->length = argval; + break; + case 'r' : /* repetitions */ + if(!sscanf(optarg, "%d", &argval) || (argval < 0)) + usage_bail(argv[0]); + else + result->reps = argval; + break; + case 'd' : /* delay between reps - WITHOUT delay after last beep*/ + if(!sscanf(optarg, "%d", &argval) || (argval < 0)) + usage_bail(argv[0]); + else { + result->delay = argval; + result->end_delay = NO_END_DELAY; + } + break; + case 'D' : /* delay between reps - WITH delay after last beep */ + if(!sscanf(optarg, "%d", &argval) || (argval < 0)) + usage_bail(argv[0]); + else { + result->delay = argval; + result->end_delay = YES_END_DELAY; + } + break; + case 's' : + result->stdin_beep = LINE_STDIN_BEEP; + break; + case 'c' : + result->stdin_beep = CHAR_STDIN_BEEP; + break; + case 'v' : + case 'V' : /* also --version */ + printf("%s\n",VERSION_STRING); + exit(0); + break; + case 'n' : /* also --new - create another beep */ + result->next = (beep_parms_t *)malloc(sizeof(beep_parms_t)); + result->next->freq = DEFAULT_FREQ; + result->next->length = DEFAULT_LENGTH; + result->next->reps = DEFAULT_REPS; + result->next->delay = DEFAULT_DELAY; + result->next->end_delay = DEFAULT_END_DELAY; + result->next->stdin_beep = DEFAULT_STDIN_BEEP; + result->next->next = NULL; + result = result->next; /* yes, I meant to do that. */ + break; + case 'h' : /* notice that this is also --help */ + default : + usage_bail(argv[0]); + } + } +} + +void play_beep(beep_parms_t parms) { + int i; /* loop counter */ + + /* try to snag the console */ + if((console_fd = open("/dev/console", O_WRONLY)) == -1) { + fprintf(stderr, "Could not open /dev/console for writing.\n"); + printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ + perror("open"); + exit(1); + } + + /* Beep */ + for (i = 0; i < parms.reps; i++) { /* start beep */ + if(ioctl(console_fd, KIOCSOUND, (int)(CLOCK_TICK_RATE/parms.freq)) < 0) { + printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ + perror("ioctl"); + } + /* Look ma, I'm not ansi C compatible! */ + usleep(1000*parms.length); /* wait... */ + ioctl(console_fd, KIOCSOUND, 0); /* stop beep */ + if(parms.end_delay || (i+1 < parms.reps)) + usleep(1000*parms.delay); /* wait... */ + } /* repeat. */ + + close(console_fd); +} + + + +int main(int argc, char **argv) { + char sin[4096], *ptr; + + beep_parms_t *parms = (beep_parms_t *)malloc(sizeof(beep_parms_t)); + parms->freq = DEFAULT_FREQ; + parms->length = DEFAULT_LENGTH; + parms->reps = DEFAULT_REPS; + parms->delay = DEFAULT_DELAY; + parms->end_delay = DEFAULT_END_DELAY; + parms->stdin_beep = DEFAULT_STDIN_BEEP; + parms->next = NULL; + + signal(SIGINT, handle_signal); + parse_command_line(argc, argv, parms); + + /* this outermost while loop handles the possibility that -n/--new has been + used, i.e. that we have multiple beeps specified. Each iteration will + play, then free() one parms instance. */ + while(parms) { + beep_parms_t *next = parms->next; + + if(parms->stdin_beep) { + /* in this case, beep is probably part of a pipe, in which case POSIX + says stdin and out should be fuly buffered. This however means very + laggy performance with beep just twiddling it's thumbs until a buffer + fills. Thus, kill the buffering. In some situations, this too won't + be enough, namely if we're in the middle of a long pipe, and the + processes feeding us stdin are buffered, we'll have to wait for them, + not much to be done about that. */ + setvbuf(stdin, NULL, _IONBF, 0); + setvbuf(stdout, NULL, _IONBF, 0); + while(fgets(sin, 4096, stdin)) { + if(parms->stdin_beep==CHAR_STDIN_BEEP) { + for(ptr=sin;*ptr;ptr++) { + putchar(*ptr); + fflush(stdout); + play_beep(*parms); + } + } else { + fputs(sin, stdout); + play_beep(*parms); + } + } + } else { + play_beep(*parms); + } + + /* Junk each parms struct after playing it */ + free(parms); + parms = next; + } + + return EXIT_SUCCESS; +} From 0b72fe17e679c0b3c88448cc2fc6830d3db20f93 Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Mon, 6 Dec 2004 12:10:11 +0100 Subject: [PATCH 02/48] Imported Debian patch 1.2.2-14 --- Makefile | 2 +- beep.c | 12 ++-- debian/README.Debian | 9 +++ debian/changelog | 141 ++++++++++++++++++++++++++++++++++++++++ debian/config | 10 +++ debian/control | 17 +++++ debian/copyright | 22 +++++++ debian/po/POTFILES.in | 1 + debian/po/ca.po | 69 ++++++++++++++++++++ debian/po/de.po | 68 +++++++++++++++++++ debian/po/fr.po | 71 ++++++++++++++++++++ debian/po/it.po | 56 ++++++++++++++++ debian/po/ja.po | 69 ++++++++++++++++++++ debian/po/nl.po | 67 +++++++++++++++++++ debian/po/pt_BR.po | 69 ++++++++++++++++++++ debian/po/ru.po | 67 +++++++++++++++++++ debian/po/templates.pot | 59 +++++++++++++++++ debian/postinst | 43 ++++++++++++ debian/postrm | 7 ++ debian/rules | 92 ++++++++++++++++++++++++++ debian/templates | 14 ++++ debian/watch | 3 + 22 files changed, 962 insertions(+), 6 deletions(-) create mode 100644 debian/README.Debian create mode 100644 debian/changelog create mode 100644 debian/config create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/po/POTFILES.in create mode 100644 debian/po/ca.po create mode 100644 debian/po/de.po create mode 100644 debian/po/fr.po create mode 100644 debian/po/it.po create mode 100644 debian/po/ja.po create mode 100644 debian/po/nl.po create mode 100644 debian/po/pt_BR.po create mode 100644 debian/po/ru.po create mode 100644 debian/po/templates.pot create mode 100644 debian/postinst create mode 100644 debian/postrm create mode 100755 debian/rules create mode 100644 debian/templates create mode 100644 debian/watch diff --git a/Makefile b/Makefile index 5856f9f..cc359c4 100644 --- a/Makefile +++ b/Makefile @@ -15,5 +15,5 @@ beep : beep.c install : cp ${EXEC_NAME} ${INSTALL_DIR} - rm -f /usr/man/man1/beep.1.bz2 + # rm -f /usr/man/man1/beep.1.bz2 cp ${MAN_FILE} ${MAN_DIR} diff --git a/beep.c b/beep.c index f774b56..f80eb76 100644 --- a/beep.c +++ b/beep.c @@ -218,11 +218,13 @@ void play_beep(beep_parms_t parms) { int i; /* loop counter */ /* try to snag the console */ - if((console_fd = open("/dev/console", O_WRONLY)) == -1) { - fprintf(stderr, "Could not open /dev/console for writing.\n"); - printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ - perror("open"); - exit(1); + if((console_fd = open("/dev/tty0", O_WRONLY)) == -1) { + if((console_fd = open("/dev/vc/0", O_WRONLY)) == -1) { + fprintf(stderr, "Could not open /dev/tty0 or /dev/vc/0 for writing.\n"); + printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ + perror("open"); + exit(1); + } } /* Beep */ diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 0000000..4dfef2b --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,9 @@ +beep for Debian +--------------- + +The code is quite short so it should be clear that it's not exploitable. +I therefore think that "suid root with only group audio executeable" is an +acceptable default - you are of course able to change it anytime with +dpkg-reconfigure beep + + -- Gerfried Fuchs , Wed, 27 Feb 2002 12:48:26 +0100 diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..4366a9a --- /dev/null +++ b/debian/changelog @@ -0,0 +1,141 @@ +beep (1.2.2-14) unstable; urgency=medium + + * The "l10n R us" release. + * Added the following translations of the debconf files: + - Japanese, by Hideki Yamane (closes: #242415) + - Catalan, by Miguel Gea Milvaques (closes: #284151) + Thanks to all of them. + + -- Gerfried Fuchs Mon, 06 Dec 2004 12:10:11 +0100 + +beep (1.2.2-13) unstable; urgency=low + + * Added Italian debconf file from Stefano Melchior. + + -- Gerfried Fuchs Mon, 22 Mar 2004 21:50:36 +0100 + +beep (1.2.2-12) unstable; urgency=low + + * Added Dutch debconf file from Tim Vandermeersch (closes: #209118) + * Updated Russian template, thanks to Ilgiz Kalmetev. + * Updated to policy version 3.6.1, no changes needed. + * Switched to utf8 for the changelog.Debian. + + -- Gerfried Fuchs Thu, 02 Oct 2003 11:35:43 +0000 + +beep (1.2.2-11) unstable; urgency=low + + * Added the following translations of the debconf files: + - French, by Daniel Déchelotte (closes: #185067) + - Brazilian Portuguese, by Andre Luis Lopes (closes: #184955) + Thanks to all of them. + + -- Gerfried Fuchs Mon, 17 Mar 2003 16:23:03 +0100 + +beep (1.2.2-10) unstable; urgency=low + + * debian/rules: + - converted to po-debconf + - generalized the file a little bit more + * debian/control: + - updated to policy version 3.5.8, no changes needed. + + -- Gerfried Fuchs Sat, 08 Mar 2003 18:06:20 +0100 + +beep (1.2.2-9) unstable; urgency=low + + * Removed doubled sentence in english debconf templates file, and rewrote + parts of sentences in the german one. + + -- Gerfried Fuchs Thu, 24 Oct 2002 17:00:19 +0200 + +beep (1.2.2-8) unstable; urgency=low + + * Fixed typos in german templates.de file (closes: #163176). Thanks for + noticing them, Christian (although I won't remove the first , -- it's + there for rethorical reasons). + * Removed /usr/doc -> /usr/share/doc handling from maintainer scripts. + + -- Gerfried Fuchs Thu, 03 Oct 2002 11:59:05 +0200 + +beep (1.2.2-7) unstable; urgency=low + + * Updated to policy 3.5.7: support for DEB_BUILD_OPTIONS added. + + -- Gerfried Fuchs Sun, 08 Sep 2002 21:27:23 +0200 + +beep (1.2.2-6) unstable; urgency=low + + * Corrected Goswin's surname in previous changelog entry (sorry!). + (closes: #157900) + + -- Gerfried Fuchs Sat, 24 Aug 2002 15:59:57 +0200 + +beep (1.2.2-5) unstable; urgency=low + + * Applied devfs support patch from Goswin Brederlow (closes: #148884) + + -- Gerfried Fuchs Tue, 13 Aug 2002 21:27:56 +0200 + +beep (1.2.2-4) unstable; urgency=high + + * Missing Build-Depends: debconf-utils -- thanks, lamont (closes: #145547) + + -- Gerfried Fuchs Thu, 02 May 2002 16:18:22 +0200 + +beep (1.2.2-3) unstable; urgency=high + + * Install postrm file, too (no idea how I missed that, stupid me...) + * Installed only main debconf templates file, didn't merge them :-(( Do it + now -- no other changes, would be nice to have the translation in woody. + + -- Gerfried Fuchs Tue, 30 Apr 2002 20:24:20 +0200 + +beep (1.2.2-2) unstable; urgency=medium + + * Open /dev/tty0 instead of /dev/console (closes: #134015) + + -- Gerfried Fuchs Tue, 23 Apr 2002 17:33:29 +0200 + +beep (1.2.2-1) unstable; urgency=low + + * New upstream release + * printf("\a") now if it can't open /dev/console (closes: #134466) + * Put a sane paragraph into the copyright file, not only the location of the + GPL on Debian Systems. + + -- Gerfried Fuchs Tue, 02 Apr 2002 08:21:36 +0200 + +beep (1.2.1-5) unstable; urgency=low + + * Updated watchfile to uscan version=2. + + -- Gerfried Fuchs Mon, 18 Mar 2002 11:30:31 +0100 + +beep (1.2.1-4) unstable; urgency=medium + + * Added russion templates file -- thanks to Ilgiz Kalmetev (closes: #137619) + * changed from char to int to make it work on systems where char is unsigned + -- thanks to Daniel Eisenbud (closes: #136281) --> urgency reason + + -- Gerfried Fuchs Mon, 11 Mar 2002 12:52:08 +0100 + +beep (1.2.1-3) unstable; urgency=low + + * Rewrote the templates file with hints from JoeyH, dancer and Francesco -- + thanks, dudes (closes: #135866, #134811) + * Cleaned up rules file a little bit. + + -- Gerfried Fuchs Wed, 27 Feb 2002 12:47:54 +0100 + +beep (1.2.1-2) unstable; urgency=low + + * Un-debhepler-ized rules file. + + -- Gerfried Fuchs Wed, 13 Feb 2002 13:15:33 +0100 + +beep (1.2.1-1) unstable; urgency=low + + * Initial Release. + + -- Gerfried Fuchs Fri, 08 Feb 2002 12:38:28 +0100 diff --git a/debian/config b/debian/config new file mode 100644 index 0000000..aa95410 --- /dev/null +++ b/debian/config @@ -0,0 +1,10 @@ +#!/bin/sh -e + +# Source debconf library. +. /usr/share/debconf/confmodule + +# how to suid the beep program +db_input medium beep/suid_option || true +db_go + +exit 0 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..794054b --- /dev/null +++ b/debian/control @@ -0,0 +1,17 @@ +Source: beep +Section: sound +Priority: optional +Maintainer: Gerfried Fuchs +Build-Depends: po-debconf +Standards-Version: 3.6.1 + +Package: beep +Architecture: any +Depends: ${shlibs:Depends}, debconf (>= 0.5) +Description: Advanced pc-speaker beeper + beep does what you'd expect: it beeps. But unlike printf "\a" beep allows + you to control pitch, duration, and repetitions. Its job is to live inside + shell/perl scripts and allow more granularity than one has otherwise. It is + controlled completely through command line options. It's not supposed to be + complex, and it isn't - but it makes system monitoring (or whatever else it + gets hacked into) much more informative. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..407c4d1 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,22 @@ +This package was debianized by Gerfried Fuchs on +Thu, 18 Oct 2001 09:26:50 +0200. + +It was downloaded from http://www.johnath.com/beep/ + +Upstream Author: Johnathan Nightingale + +Copyright: +========== +This software is copyright (C) 2000 by Johnathan Nightingale. + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 dated June, 1991. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in new file mode 100644 index 0000000..cef83a3 --- /dev/null +++ b/debian/po/POTFILES.in @@ -0,0 +1 @@ +[type: gettext/rfc822deb] templates diff --git a/debian/po/ca.po b/debian/po/ca.po new file mode 100644 index 0000000..95cf8bd --- /dev/null +++ b/debian/po/ca.po @@ -0,0 +1,69 @@ +# translation of beep_1.2.2-12_templates.po to catalan +# +# 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. +# Jordi Fernández Mora , 2004. +# Miguel Gea Milvaques , 2004. +# +msgid "" +msgstr "" +"Project-Id-Version: ca\n" +"Report-Msgid-Bugs-To: beep@packages.debian.org\n" +"POT-Creation-Date: 2004-12-06 11:56+0100\n" +"PO-Revision-Date: 2004-11-22 21:36+0100\n" +"Last-Translator: Miguel Gea Milvaques \n" +"Language-Team: Catalan \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.9.1\n" + +#. Type: select +#. Choices +#: ../templates:3 +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ú " + +#. Type: select +#. Description +#: ../templates:5 +msgid "How to handle suid root for beep program?" +msgstr "Com es gestionarà l'atribut suid root pel programa beep?" + +#. 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 "" +"s'ha d'executar beep com a root ja que necessita accedir al maquinari del " +"speaker. Hi ha varies possibilitats de fer el programa usable: Només per " +"l'usuari root (no apareix el bit de suid), només executable pels usuaris del " +"grup audio, o executable per a tothom." + +#. Type: select +#. Description +#: ../templates:5 +msgid "" +"Because each program that is suid root is security risk this is not done by " +"default. However, the program is quite small (~150 lines of code) and is " +"fairly easy to verify the safety of the code yourself, if you don't trust my " +"judgement." +msgstr "" +"Ja que qualsevol programa que s'usa amb el suid root és un perill per la " +"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/de.po b/debian/po/de.po new file mode 100644 index 0000000..08e971f --- /dev/null +++ b/debian/po/de.po @@ -0,0 +1,68 @@ +# +# 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. +# +msgid "" +msgstr "" +"Project-Id-Version: beep 1.2.2-10\n" +"Report-Msgid-Bugs-To: beep@packages.debian.org\n" +"POT-Creation-Date: 2004-12-06 11:56+0100\n" +"PO-Revision-Date: 2003-03-08 17:54+0100\n" +"Last-Translator: Gerfried Fuchs \n" +"Language-Team: German \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#: ../templates:3 +msgid "" +"suid root for all, suid root with only group audio executable, not suid at " +"all" +msgstr "" +"suid root fr alle, suid root nur fr Gruppe audio ausfhrbar, nicht suid " +"gesetzt" + +#. Type: select +#. Description +#: ../templates:5 +msgid "How to handle suid root for beep program?" +msgstr "Wie soll beep suid root gesetzt werden?" + +#. 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 muss als root ausgefhrt werden, da es auf den Lautsprecher zugreifen " +"muss. Es gibt mehrere Mglichkeiten, das Programm benutzbar zu machen: " +"Entweder nur fr root (gar kein suid), benutzbar von den Mitgliedern der " +"Gruppe audio, oder fr alle benutzbar." + +#. Type: select +#. Description +#: ../templates:5 +msgid "" +"Because each program that is suid root is security risk this is not done by " +"default. However, the program is quite small (~150 lines of code) and is " +"fairly easy to verify the safety of the code yourself, if you don't trust my " +"judgement." +msgstr "" +"Da jedes Programm, das suid root gesetzt ist, ein potentielles " +"Sicherheitsproblem ist, wird dies daher nicht automatisch durchgefhrt. Das " +"Programm ist jedoch recht kurz (~150 Zeilen Code) und kann von Ihnen sehr " +"leicht geprft werden, falls Sie meiner Einschtzung nicht vertrauen." diff --git a/debian/po/fr.po b/debian/po/fr.po new file mode 100644 index 0000000..9797e2b --- /dev/null +++ b/debian/po/fr.po @@ -0,0 +1,71 @@ +# +# 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. +# +msgid "" +msgstr "" +"Project-Id-Version: beep 1.2.2-10\n" +"Report-Msgid-Bugs-To: beep@packages.debian.org\n" +"POT-Creation-Date: 2004-12-06 11:56+0100\n" +"PO-Revision-Date: 2003-03-13 22:18+0100\n" +"Last-Translator: Daniel Dchelotte \n" +"Language-Team: Debian-l10n-french \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#: ../templates:3 +msgid "" +"suid root for all, suid root with only group audio executable, not suid at " +"all" +msgstr "" +"bit suid positionn et excutable par tous, bit suid positionn mais " +"excutable uniquement par le groupe audio, pas de bit suid" + +#. Type: select +#. Description +#: ../templates:5 +msgid "How to handle suid root for beep program?" +msgstr "Comment grer les privilges spciaux du programme beep?" + +#. 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 "" +"Le programme beep doit tre lanc en tant que super-utilisateur (root) " +"pour pouvoir accder au haut-parleur. Cela est possible de plusieurs " +"faons: soit le bit suid est positionn et tout le monde peut excuter ce " +"programme, soit le bit suid est positionn et seuls les membres du groupe " +"audio peuvent excuter le programme, soit le bit suid n'est pas positionn " +"et beep n'est alors excutable que par le super-utilisateur." + +#. Type: select +#. Description +#: ../templates:5 +msgid "" +"Because each program that is suid root is security risk this is not done by " +"default. However, the program is quite small (~150 lines of code) and is " +"fairly easy to verify the safety of the code yourself, if you don't trust my " +"judgement." +msgstr "" +"Comme tout programme suid root reprsente un risque du point de vue de la " +"scurit, cela n'est pas fait par dfaut. Toutefois, ce programme est " +"vraiment petit (environ 150 lignes de code) et il est relativement facile de " +"vrifier par vous-mme que le code est sr, si vous ne me faites pas " +"confiance." diff --git a/debian/po/it.po b/debian/po/it.po new file mode 100644 index 0000000..55510e9 --- /dev/null +++ b/debian/po/it.po @@ -0,0 +1,56 @@ +msgid "" +msgstr "" +"Project-Id-Version: beep 1.2.2-12\n" +"Report-Msgid-Bugs-To: beep@packages.debian.org\n" +"POT-Creation-Date: 2004-12-06 11:56+0100\n" +"PO-Revision-Date: 2004-12-06 12:08+0100\n" +"Last-Translator: Stefano Melchior \n" +"Language-Team: Italian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#: ../templates:3 +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 audio del " +"gruppo, nient'affatto suid" + +#. Type: select +#. Description +#: ../templates:5 +msgid "How to handle suid root for beep program?" +msgstr "Come gestire suid root per il programma beep?" + +#. 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 deve essere lanciato come root dato che ha l'esigenza di accedere " +"fisicamente agli autoparlanti. Ci sono diverse possibilità di rendere il " +"programma fruibile: o solamente a root (non si usa affatto il bit suid), o " +"solamente agli utenti del gruppo audio, oppure a tutti." + +#. Type: select +#. Description +#: ../templates:5 +msgid "" +"Because each program that is suid root is security risk this is not done by " +"default. However, the program is quite small (~150 lines of code) and is " +"fairly easy to verify the safety of the code yourself, if you don't trust my " +"judgement." +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 abbastanza piccolo (circa 150 linee di codice) e semplice da " +"permettere la propria verifica della sicurezza del codice, qualora non ci si " +"fidasse del giudizio dell'autore." diff --git a/debian/po/ja.po b/debian/po/ja.po new file mode 100644 index 0000000..128edad --- /dev/null +++ b/debian/po/ja.po @@ -0,0 +1,69 @@ +# +# 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. +# +# +msgid "" +msgstr "" +"Project-Id-Version: beep 1.2.2-12\n" +"Report-Msgid-Bugs-To: beep@packages.debian.org\n" +"POT-Creation-Date: 2004-12-06 11:56+0100\n" +"PO-Revision-Date: 2004-03-08 00:02+0900\n" +"Last-Translator: Hideki Yamane \n" +"Language-Team: Japanese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=EUC-JP\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#: ../templates:3 +msgid "" +"suid root for all, suid root with only group audio executable, not suid at " +"all" +msgstr "" +"桼Ȥ褦 root suid , audio 롼פ¹ԤǤ褦" +" root suid , suid ʤ" + +#. Type: select +#. Description +#: ../templates:5 +msgid "How to handle suid root for beep program?" +msgstr "beep ץǤ root ؤ suid ɤΤ褦˼갷ޤ?" + +#. 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 root ȤƼ¹" +"ʤФʤޤ󡣥ץȤˤĤޤ: root " +"ߤˤ (suid Ȥʤ褦ˤ) audio 롼׽°Υ桼" +"褦ˤ롢ïǤȤ褦ˤ롢Τɤ줫Ǥ" + +#. Type: select +#. Description +#: ../templates:5 +msgid "" +"Because each program that is suid root is security risk this is not done by " +"default. However, the program is quite small (~150 lines of code) and is " +"fairly easy to verify the safety of the code yourself, if you don't trust my " +"judgement." +msgstr "" +"root suid 줿ץϥƥꥹˤʤΤǡǥեȤǤ " +"suid ޤ󡣤ʤ顢Υץ˾Τ (150٤" +"ɤǤ)ȽǤ򿮤ʤ硢ʤȤǥɤΰǧ" +"ΤϤȤƤñǤ" diff --git a/debian/po/nl.po b/debian/po/nl.po new file mode 100644 index 0000000..ec97ba0 --- /dev/null +++ b/debian/po/nl.po @@ -0,0 +1,67 @@ +# +# 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. +# +msgid "" +msgstr "" +"Project-Id-Version: beep 1.2.2-11\n" +"Report-Msgid-Bugs-To: beep@packages.debian.org\n" +"POT-Creation-Date: 2004-12-06 11:56+0100\n" +"PO-Revision-Date: 2003-09-07 20:58+0100\n" +"Last-Translator: Tim Vandermeersch \n" +"Language-Team: dutch \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#: ../templates:3 +msgid "" +"suid root for all, suid root with only group audio executable, not suid at " +"all" +msgstr "" +"suid root voor alles, suid root enkel met groep audio uitvoerbare bestanden, " +"geen suid" + +#. Type: select +#. Description +#: ../templates:5 +msgid "How to handle suid root for beep program?" +msgstr "Hoe suid root af te handelen voor beep programma?" + +#. 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 dient als root te draaien omdat het toegang nodig heeft tot de " +"luidspreker hardware. Er zijn verschillende mogelijkheden om het " +"programmabruikbaar te maken: Ofwel enkel voor root (geen suid bit), enkel " +"uitvoerbaar door gebruikers in de audio groep, of onbruikbaar voor iedereen." + +#. Type: select +#. Description +#: ../templates:5 +msgid "" +"Because each program that is suid root is security risk this is not done by " +"default. However, the program is quite small (~150 lines of code) and is " +"fairly easy to verify the safety of the code yourself, if you don't trust my " +"judgement." +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 verifiren, als u mijn oordeel niet vertrouwd." diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po new file mode 100644 index 0000000..9c3373f --- /dev/null +++ b/debian/po/pt_BR.po @@ -0,0 +1,69 @@ +# +# 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. +# +msgid "" +msgstr "" +"Project-Id-Version: beep-1.2.2-10\n" +"Report-Msgid-Bugs-To: beep@packages.debian.org\n" +"POT-Creation-Date: 2004-12-06 11:56+0100\n" +"PO-Revision-Date: 2003-03-15 22:56-0300\n" +"Last-Translator: Andr Lus Lopes \n" +"Language-Team: Debian-BR Project \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#: ../templates:3 +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 executvel, sem " +"suid" + +#. Type: select +#. Description +#: ../templates:5 +msgid "How to handle suid root for beep program?" +msgstr "Como gerenciar suid root para o programa beep ?" + +#. 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 "" +"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 utilizvel : somente executvel pelo root (sem suid), executvel " +"somente pelos usurios do grupo audio ou executvel para todos." + +#. Type: select +#. Description +#: ../templates:5 +msgid "" +"Because each program that is suid root is security risk this is not done by " +"default. However, the program is quite small (~150 lines of code) and 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 segurana isto no feito por padro. Porm, o programa " +"bastante pequeno (aproximadamente 150 linhas de cdigo) e muito fcil " +"verificar a segurana do cdigo caso voc no confie em no julgamento no " +"mantenedor deste pacote." diff --git a/debian/po/ru.po b/debian/po/ru.po new file mode 100644 index 0000000..30675c0 --- /dev/null +++ b/debian/po/ru.po @@ -0,0 +1,67 @@ +# +# 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. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: beep@packages.debian.org\n" +"POT-Creation-Date: 2004-12-06 11:56+0100\n" +"PO-Revision-Date: 2003-10-02 17:10+0500\n" +"Last-Translator: Ilgiz Kalmetev \n" +"Language-Team: Russian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=KOI8-R\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#: ../templates:3 +msgid "" +"suid root for all, suid root with only group audio executable, not suid at " +"all" +msgstr "" +"suid root , suid root audio, suid " + +#. Type: select +#. Description +#: ../templates:5 +msgid "How to handle suid root for beep program?" +msgstr " suid root beep?" + +#. 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 root, " +". : " +"root ( suid ), " +" audio, ." + +#. Type: select +#. Description +#: ../templates:5 +msgid "" +"Because each program that is suid root is security risk this is not done by " +"default. However, the program is quite small (~150 lines of code) and is " +"fairly easy to verify the safety of the code yourself, if you don't trust my " +"judgement." +msgstr "" +", suid root, , " +" suid- . , " +" (~150 ), " +" , ." diff --git a/debian/po/templates.pot b/debian/po/templates.pot new file mode 100644 index 0000000..703fd2a --- /dev/null +++ b/debian/po/templates.pot @@ -0,0 +1,59 @@ +# +# 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. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: beep@packages.debian.org\n" +"POT-Creation-Date: 2004-12-06 11:56+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#: ../templates:3 +msgid "" +"suid root for all, suid root with only group audio executable, not suid at " +"all" +msgstr "" + +#. Type: select +#. Description +#: ../templates:5 +msgid "How to handle suid root for beep program?" +msgstr "" + +#. 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 "" + +#. Type: select +#. Description +#: ../templates:5 +msgid "" +"Because each program that is suid root is security risk this is not done by " +"default. However, the program is quite small (~150 lines of code) and is " +"fairly easy to verify the safety of the code yourself, if you don't trust my " +"judgement." +msgstr "" diff --git a/debian/postinst b/debian/postinst new file mode 100644 index 0000000..9abee6f --- /dev/null +++ b/debian/postinst @@ -0,0 +1,43 @@ +#!/bin/sh -e +# postinst for beep + +# Source debconf library. +if [ -e /usr/share/debconf/confmodule ]; then + . /usr/share/debconf/confmodule +fi + +if [ "$1" != configure ]; then + exit 0 +fi + +suid=false +if [ -e /usr/share/debconf/confmodule ]; then + db_get beep/suid_option + suid="$RET" +fi + +# repair typo in option (see #135866) +if [ "$suid" = "suid root with only group audio executeable" ] ; then + db_set beep/suid_option "suid root with only group audio executable" + suid="suid root with only group audio executable" +fi + +if [ -x /usr/sbin/dpkg-statoverride ] ; then + if ! dpkg-statoverride --list /usr/bin/beep >/dev/null ; then + if [ "$suid" = "suid root for all" ] ; then + chmod 4755 /usr/bin/beep + elif [ "$suid" = "suid root with only group audio executable" ] ; then + chmod 4754 /usr/bin/beep + elif [ "$suid" = "not suid at all" ] ; then + chmod 0755 /usr/bin/beep + fi + fi +else + if [ "$suid" = "suid root for all" ] ; then + chmod 4755 /usr/bin/beep + elif [ "$suid" = "suid root with only group audio executable" ] ; then + chmod 4754 /usr/bin/beep + elif [ "$suid" = "not suid at all" ] ; then + chmod 0755 /usr/bin/beep + fi +fi diff --git a/debian/postrm b/debian/postrm new file mode 100644 index 0000000..9abaeca --- /dev/null +++ b/debian/postrm @@ -0,0 +1,7 @@ +#!/bin/sh -e +# postrm for beep + +if [ "$1" = purge -a -e /usr/share/debconf/confmodule ]; then + . /usr/share/debconf/confmodule + db_purge +fi diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..7e4bc96 --- /dev/null +++ b/debian/rules @@ -0,0 +1,92 @@ +#!/usr/bin/make -f +# debian/rules file for beep + +PACKAGE = beep +TMP = $(CURDIR)/debian/$(PACKAGE) + +FLAGS = -g -Wall +INSTALL = install +INSTALL_FILE = $(INSTALL) -p -oroot -groot -m644 +INSTALL_PROGRAM = $(INSTALL) -p -oroot -groot -m755 +INSTALL_SCRIPT = $(INSTALL) -p -oroot -groot -m755 +INSTALL_DIR = $(INSTALL) -p -d -oroot -groot -m755 + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + FLAGS += -O0 +else + FLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s + STRIP = true +endif + + +clean: + $(checkdir) + $(checkroot) + -rm -rf $(TMP) debian/substvars debian/files build-stamp + -$(MAKE) clean + + +build: build-stamp +build-stamp: + $(checkdir) + $(MAKE) FLAGS="$(FLAGS)" + touch build-stamp + + +install: build + $(checkdir) + $(checkroot) + -rm -rf $(TMP) debian/substvars + $(INSTALL_DIR) $(TMP) + cd $(TMP) && $(INSTALL_DIR) usr/bin usr/share/man/man1 \ + usr/share/doc/$(PACKAGE) + $(MAKE) install INSTALL_DIR=$(TMP)/usr/bin \ + MAN_DIR=$(TMP)/usr/share/man/man1 + -test "$(STRIP)" = "true" && \ + strip --remove-section=.comment --remove-section=.note \ + --strip-unneeded $(TMP)/usr/bin/beep + chown root.audio $(TMP)/usr/bin/beep + $(INSTALL_FILE) CREDITS README $(TMP)/usr/share/doc/$(PACKAGE) + $(INSTALL_FILE) CHANGELOG $(TMP)/usr/share/doc/$(PACKAGE)/changelog + cd $(TMP)/usr/share/doc/$(PACKAGE) && gzip -9 changelog README + + +# Build architecture-independent files here. +binary-indep: build +# We have nothing to do by default. + + +binary-arch: build install + $(checkdir) + $(checkroot) + $(INSTALL_DIR) $(TMP)/DEBIAN + $(INSTALL_FILE) debian/README.Debian debian/copyright \ + $(TMP)/usr/share/doc/$(PACKAGE) + $(INSTALL_FILE) debian/changelog \ + $(TMP)/usr/share/doc/$(PACKAGE)/changelog.Debian + gzip -9 $(TMP)/usr/share/doc/$(PACKAGE)/changelog.Debian + $(INSTALL_SCRIPT) debian/postinst debian/postrm debian/config \ + $(TMP)/DEBIAN + po2debconf debian/templates > $(TMP)/DEBIAN/templates + dpkg-shlibdeps -Tdebian/substvars -dDepends $(TMP)/usr/bin/beep + dpkg-gencontrol -ldebian/changelog -isp -Tdebian/substvars -p$(PACKAGE) \ + -P$(TMP) + cd $(TMP) && find * -type f ! -regex '^DEBIAN/.*' -print0 | \ + xargs -r0 md5sum > DEBIAN/md5sums + dpkg --build $(TMP) .. + + +binary: binary-arch + +define checkdir + test -f debian/rules +endef + +define checkroot + test root = "`whoami`" +endef + +.PHONY: clean build install binary-arch binary diff --git a/debian/templates b/debian/templates new file mode 100644 index 0000000..00001c6 --- /dev/null +++ b/debian/templates @@ -0,0 +1,14 @@ +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 to handle suid root for beep program? + 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. + . + Because each program that is suid root is security risk this is not done + by default. However, the program is quite small (~150 lines of code) and + is fairly easy to verify the safety of the code yourself, if you don't + trust my judgement. diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..0c6fea3 --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=2 +# Site/Directory Pattern Version Script +http://www.johnath.com/beep/ beep-([\d\.]*)\.tar\.gz debian uupdate From fc55d59d9c0454650a71cf394ef3abc736e66333 Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Thu, 12 May 2005 10:18:50 +0200 Subject: [PATCH 03/48] Imported Debian patch 1.2.2-15 --- debian/changelog | 7 +++++ debian/po/cs.po | 67 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 debian/po/cs.po diff --git a/debian/changelog b/debian/changelog index 4366a9a..449477d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +beep (1.2.2-15) unstable; urgency=high + + * Added additional debconf translation: + - Czech by Miroslav Kure (closes: #293000) + + -- Gerfried Fuchs Thu, 12 May 2005 10:18:50 +0200 + beep (1.2.2-14) unstable; urgency=medium * The "l10n R us" release. diff --git a/debian/po/cs.po b/debian/po/cs.po new file mode 100644 index 0000000..a59c1fa --- /dev/null +++ b/debian/po/cs.po @@ -0,0 +1,67 @@ +# +# 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. +# +msgid "" +msgstr "" +"Project-Id-Version: beep\n" +"Report-Msgid-Bugs-To: beep@packages.debian.org\n" +"POT-Creation-Date: 2004-12-06 11:56+0100\n" +"PO-Revision-Date: 2005-01-31 17:13+0100\n" +"Last-Translator: Miroslav Kure \n" +"Language-Team: Czech \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#: ../templates:3 +msgid "" +"suid root for all, suid root with only group audio executable, not suid at " +"all" +msgstr "" +"suid root pro vechny, suid root spustiteln skupinou audio, bez suid bitu" + +#. Type: select +#. Description +#: ../templates:5 +msgid "How to handle suid root for beep program?" +msgstr "Jak nastavit suid root bit pro program beep?" + +#. 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 mus bet pod uivatelem root, protoe mus mt pstup ke zvukovmu " +"hardwaru. Existuje nkolik monost, jak toho doshnout: bu bude pouiteln " +"jen pro uivatele root (bez suid bitu), spustiteln uivateli skupiny audio, " +"nebo bude spustiteln pro vechny." + +#. Type: select +#. Description +#: ../templates:5 +msgid "" +"Because each program that is suid root is security risk this is not done by " +"default. However, the program is quite small (~150 lines of code) and is " +"fairly easy to verify the safety of the code yourself, if you don't trust my " +"judgement." +msgstr "" +"Protoe je kad suid root program bezpenostnm rizikem, nen posledn " +"monost implicitn. Tento program je vak velmi mal (~150 dk kdu) a " +"pokud nevte autorovi, celkem jednodue si mete bezpenost kdu " +"prostudovat sami." From d82bbe9fb63cd32ec0f6e255e592264de106165d Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Wed, 19 Oct 2005 11:58:56 +0200 Subject: [PATCH 04/48] Imported Debian patch 1.2.2-16 --- beep.c | 25 ++++++++++-- debian/beep.1.diff | 37 ++++++++++++++++++ debian/changelog | 27 +++++++++++++ debian/control | 8 ++-- debian/po/ca.po | 19 +++++----- debian/po/cs.po | 36 +++++++++--------- debian/po/de.po | 26 ++++++------- debian/po/es.po | 84 +++++++++++++++++++++++++++++++++++++++++ debian/po/fr.po | 38 +++++++++---------- debian/po/it.po | 24 ++++++------ debian/po/ja.po | 26 ++++++------- debian/po/nl.po | 14 ++++--- debian/po/pt_BR.po | 14 ++++--- debian/po/ru.po | 14 ++++--- debian/po/sv.po | 64 +++++++++++++++++++++++++++++++ debian/po/templates.pot | 14 +++---- debian/po/vi.po | 63 +++++++++++++++++++++++++++++++ debian/rules | 6 ++- debian/templates | 6 +-- 19 files changed, 423 insertions(+), 122 deletions(-) create mode 100644 debian/beep.1.diff create mode 100644 debian/po/es.po create mode 100644 debian/po/sv.po create mode 100644 debian/po/vi.po diff --git a/beep.c b/beep.c index f80eb76..6b5b885 100644 --- a/beep.c +++ b/beep.c @@ -83,6 +83,7 @@ typedef struct beep_parms_t { so that beep can be tucked appropriately into a text- processing pipe. */ + int verbose; /* verbose output? */ struct beep_parms_t *next; /* in case -n/--new is used. */ } beep_parms_t; @@ -131,6 +132,7 @@ void usage_bail(const char *executable_name) { * "-D " (similar to -d, but delay after last repetition as well) * "-s" (beep after each line of input from stdin, echo line to stdout) * "-c" (beep after each char of input from stdin, echo char to stdout) + * "--verbose/--debug" * "-h/--help" * "-v/-V/--version" * "-n/--new" @@ -141,9 +143,11 @@ void usage_bail(const char *executable_name) { void parse_command_line(int argc, char **argv, beep_parms_t *result) { int c; - struct option opt_list[4] = {{"help", 0, NULL, 'h'}, + struct option opt_list[6] = {{"help", 0, NULL, 'h'}, {"version", 0, NULL, 'V'}, {"new", 0, NULL, 'n'}, + {"verbose", 0, NULL, 'X'}, + {"debug", 0, NULL, 'X'}, {0,0,0,0}}; while((c = getopt_long(argc, argv, "f:l:r:d:D:schvVn", opt_list, NULL)) != EOF) { @@ -155,6 +159,9 @@ void parse_command_line(int argc, char **argv, beep_parms_t *result) { (argfreq <= 0)) usage_bail(argv[0]); else + if (result->freq != 0) + fprintf(stderr, "WARNING: multiple -f values given, only last " + "one is used.\n"); result->freq = argfreq; break; case 'l' : /* length */ @@ -197,16 +204,22 @@ void parse_command_line(int argc, char **argv, beep_parms_t *result) { exit(0); break; case 'n' : /* also --new - create another beep */ + if (result->freq == 0) + result->freq = DEFAULT_FREQ; result->next = (beep_parms_t *)malloc(sizeof(beep_parms_t)); - result->next->freq = DEFAULT_FREQ; + result->next->freq = 0; result->next->length = DEFAULT_LENGTH; result->next->reps = DEFAULT_REPS; result->next->delay = DEFAULT_DELAY; result->next->end_delay = DEFAULT_END_DELAY; result->next->stdin_beep = DEFAULT_STDIN_BEEP; + result->next->verbose = result->verbose; result->next->next = NULL; result = result->next; /* yes, I meant to do that. */ break; + case 'X' : /* --debug / --verbose */ + result->verbose = 1; + break; case 'h' : /* notice that this is also --help */ default : usage_bail(argv[0]); @@ -217,6 +230,11 @@ void parse_command_line(int argc, char **argv, beep_parms_t *result) { void play_beep(beep_parms_t parms) { int i; /* loop counter */ + if(parms.verbose == 1) + fprintf(stderr, "[DEBUG] %d times %d ms beeps (%d delay between, " + "%d delay after) @ %.2f Hz\n", + parms.reps, parms.length, parms.delay, parms.end_delay, parms.freq); + /* try to snag the console */ if((console_fd = open("/dev/tty0", O_WRONLY)) == -1) { if((console_fd = open("/dev/vc/0", O_WRONLY)) == -1) { @@ -249,12 +267,13 @@ int main(int argc, char **argv) { char sin[4096], *ptr; beep_parms_t *parms = (beep_parms_t *)malloc(sizeof(beep_parms_t)); - parms->freq = DEFAULT_FREQ; + parms->freq = 0; parms->length = DEFAULT_LENGTH; parms->reps = DEFAULT_REPS; parms->delay = DEFAULT_DELAY; parms->end_delay = DEFAULT_END_DELAY; parms->stdin_beep = DEFAULT_STDIN_BEEP; + parms->verbose = 0; parms->next = NULL; signal(SIGINT, handle_signal); diff --git a/debian/beep.1.diff b/debian/beep.1.diff new file mode 100644 index 0000000..c9a31fc --- /dev/null +++ b/debian/beep.1.diff @@ -0,0 +1,37 @@ +--- beep.1.orig 2005-10-18 19:44:09.000000000 +0200 ++++ beep.1 2005-10-18 19:55:39.000000000 +0200 +@@ -1,9 +1,9 @@ +-.TH BEEP 1 "March 2002" ++.TH BEEP 1 "October 2005" + .SH NAME + beep \- beep the pc speaker any number of ways + .SH SYNOPSIS + .B beep +-[\-f N] [\-l N] [\-r N] [\-d N] [\-D N] [\-s] [\-c] ++[\-\-verbose | \-\-debug] [\-f N] [\-l N] [\-r N] [\-d N] [\-D N] [\-s] [\-c] + .HP + .B beep + [ OPTIONS ] [-n] [--new] [ OPTIONS ] +@@ -20,6 +20,12 @@ + All options have default values, meaning that just typing '\fBbeep\fR' will work. If an option is specified more than once on the command line, subsequent options override their predecessors. So '\fBbeep\fR \-f 200 \-f 300' will beep at 300Hz. + .SH OPTIONS + .TP ++\fB\-\-verbose\fR, \fB\-\-debug\fR ++enable debug output. This option prints a line like the following before each ++beep: ++ ++[DEBUG] 5 times 200 ms beeps (100 delay between, 0 delay after) @ 1000.00 Hz ++.TP + \fB\-f\fR N + beep at N Hz, where 0 < N < 20000. As a general ballpark, the regular terminal beep is around 750Hz. N is not, incidentally, restricted to whole numbers. + .TP +@@ -59,7 +65,8 @@ + .TP + As part of a log-watching pipeline + +-tail -f /var/log/xferlog | grep 'passwd' | \fBbeep\fR -f 1000 -r 5 -s ++tail -f /var/log/xferlog | grep --line-buffered 'passwd' | \\ ++\fBbeep\fR -f 1000 -r 5 -s + .TP + When using -c mode, I recommend using a short -D, and a shorter -l, so that the beeps don't blur together. Something like this will get you a cheesy 1970's style beep-as-you-type-each-letter effect + diff --git a/debian/changelog b/debian/changelog index 449477d..2ed1709 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,30 @@ +beep (1.2.2-16) unstable; urgency=low + + * The "update for the masses" release. + * Added debconf alternative for debconf-2.0 to Depends (closes: #331759) + * Added suggestions by Clytie Siddall to debian/templates file. + * Added additional debconf translations: + - Vietnamese by Clytie Siddall (closes: #313153) + - Swedish by Daniel Nylander (closes: #330941) + - Spanish by César Gómez Martín (closes: #333878) + * Updated debconf translation: + - Czech by Miroslav Kure + - German by myself + - Japanese by Hideki Yamane + - Catalan by Miguel Gea Milvaques (closes: #334199) + - Italian by Stefano Melchior (closes: #334240) + - French by Daniel Déchelotte (closes: #334486) + * Use ":" as seperator in chown instead of deprecated ".". + * Build-Depends patch added to be able to fix the wrong example in the + manpage (closes: #330020) + * Patched beep to accept an --verbose or --debug option, patched manpage + accordingly (closes: #297791) + * Print warning on multiple -f values (closes: #270056) + * Finally lowercased synopsis. + * Updated Standards-Version to 3.6.2, no changes needed. + + -- Gerfried Fuchs Wed, 19 Oct 2005 11:58:56 +0200 + beep (1.2.2-15) unstable; urgency=high * Added additional debconf translation: diff --git a/debian/control b/debian/control index 794054b..21a84f5 100644 --- a/debian/control +++ b/debian/control @@ -2,13 +2,13 @@ Source: beep Section: sound Priority: optional Maintainer: Gerfried Fuchs -Build-Depends: po-debconf -Standards-Version: 3.6.1 +Build-Depends: po-debconf, patch +Standards-Version: 3.6.2 Package: beep Architecture: any -Depends: ${shlibs:Depends}, debconf (>= 0.5) -Description: Advanced pc-speaker beeper +Depends: ${shlibs:Depends}, debconf (>= 0.5) | debconf-2.0 +Description: advanced pc-speaker beeper beep does what you'd expect: it beeps. But unlike printf "\a" beep allows you to control pitch, duration, and repetitions. Its job is to live inside shell/perl scripts and allow more granularity than one has otherwise. It is diff --git a/debian/po/ca.po b/debian/po/ca.po index 95cf8bd..6c165aa 100644 --- a/debian/po/ca.po +++ b/debian/po/ca.po @@ -16,14 +16,13 @@ msgid "" msgstr "" "Project-Id-Version: ca\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2004-12-06 11:56+0100\n" -"PO-Revision-Date: 2004-11-22 21:36+0100\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 \n" "Language-Team: Catalan \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.9.1\n" #. Type: select #. Choices @@ -37,8 +36,8 @@ msgstr "" #. Type: select #. Description #: ../templates:5 -msgid "How to handle suid root for beep program?" -msgstr "Com es gestionarà l'atribut suid root pel programa beep?" +msgid "How do you want to handle suid root for the beep program?" +msgstr "Com voleu gestionar l'atribut suid root pel programa beep?" #. Type: select #. Description @@ -58,12 +57,12 @@ msgstr "" #. Description #: ../templates:5 msgid "" -"Because each program that is suid root is security risk this is not done by " -"default. However, the program is quite small (~150 lines of code) and is " -"fairly easy to verify the safety of the code yourself, if you don't trust my " -"judgement." +"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 "" -"Ja que qualsevol programa que s'usa amb el suid root és un perill per la " +"Ja que qualsevol programa amb el suid root pot ser un perill per la " "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 a59c1fa..41e4b9d 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po @@ -15,12 +15,12 @@ msgid "" msgstr "" "Project-Id-Version: beep\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2004-12-06 11:56+0100\n" -"PO-Revision-Date: 2005-01-31 17:13+0100\n" +"POT-Creation-Date: 2005-06-14 00:09+0200\n" +"PO-Revision-Date: 2005-10-10 12:34+0200\n" "Last-Translator: Miroslav Kure \n" -"Language-Team: Czech \n" +"Language-Team: Czech \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-2\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #. Type: select @@ -30,13 +30,13 @@ msgid "" "suid root for all, suid root with only group audio executable, not suid at " "all" msgstr "" -"suid root pro vechny, suid root spustiteln skupinou audio, bez suid bitu" +"suid root pro všechny, suid root spustitelný skupinou audio, bez suid bitu" #. Type: select #. Description #: ../templates:5 -msgid "How to handle suid root for beep program?" -msgstr "Jak nastavit suid root bit pro program beep?" +msgid "How do you want to handle suid root for the beep program?" +msgstr "Jak chcete nastavit suid root bit pro program beep?" #. Type: select #. Description @@ -47,21 +47,21 @@ msgid "" "root (no suid bit at all), executable only by users of the group audio, or " "usable for all." msgstr "" -"beep mus bet pod uivatelem root, protoe mus mt pstup ke zvukovmu " -"hardwaru. Existuje nkolik monost, jak toho doshnout: bu bude pouiteln " -"jen pro uivatele root (bez suid bitu), spustiteln uivateli skupiny audio, " -"nebo bude spustiteln pro vechny." +"beep musí běžet pod uživatelem root, protože musí mít 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." #. Type: select #. Description #: ../templates:5 msgid "" -"Because each program that is suid root is security risk this is not done by " -"default. However, the program is quite small (~150 lines of code) and is " -"fairly easy to verify the safety of the code yourself, if you don't trust my " -"judgement." +"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 "" -"Protoe je kad suid root program bezpenostnm rizikem, nen posledn " -"monost implicitn. Tento program je vak velmi mal (~150 dk kdu) a " -"pokud nevte autorovi, celkem jednodue si mete bezpenost kdu " +"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 " "prostudovat sami." diff --git a/debian/po/de.po b/debian/po/de.po index 08e971f..7d739aa 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -13,12 +13,12 @@ # msgid "" msgstr "" -"Project-Id-Version: beep 1.2.2-10\n" +"Project-Id-Version: beep 1.2.2-16\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2004-12-06 11:56+0100\n" -"PO-Revision-Date: 2003-03-08 17:54+0100\n" +"POT-Creation-Date: 2005-06-14 00:09+0200\n" +"PO-Revision-Date: 2005-06-14 08:54+0200\n" "Last-Translator: Gerfried Fuchs \n" -"Language-Team: German \n" +"Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" @@ -36,8 +36,8 @@ msgstr "" #. Type: select #. Description #: ../templates:5 -msgid "How to handle suid root for beep program?" -msgstr "Wie soll beep suid root gesetzt werden?" +msgid "How do you want to handle suid root for the beep program?" +msgstr "Wie wollen Sie suid root fr das beep-Programm behandeln?" #. Type: select #. Description @@ -57,12 +57,12 @@ msgstr "" #. Description #: ../templates:5 msgid "" -"Because each program that is suid root is security risk this is not done by " -"default. However, the program is quite small (~150 lines of code) and is " -"fairly easy to verify the safety of the code yourself, if you don't trust my " -"judgement." +"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 "" "Da jedes Programm, das suid root gesetzt ist, ein potentielles " -"Sicherheitsproblem ist, wird dies daher nicht automatisch durchgefhrt. Das " -"Programm ist jedoch recht kurz (~150 Zeilen Code) und kann von Ihnen sehr " -"leicht geprft werden, falls Sie meiner Einschtzung nicht vertrauen." +"Sicherheitsproblem sein kann, wird dies nicht automatisch durchgefhrt. Das " +"Programm ist jedoch recht kurz (~150 Zeilen Code) und kann daher von Ihnen " +"sehr leicht berprft werden, falls Sie meiner Einschtzung nicht vertrauen." diff --git a/debian/po/es.po b/debian/po/es.po new file mode 100644 index 0000000..dadb82e --- /dev/null +++ b/debian/po/es.po @@ -0,0 +1,84 @@ +# beep po-debconf translation to Spanish +# Copyright (C) 2005 Software in the Public Interest +# This file is distributed under the same license as the beep package. +# +# Changes: +# - Initial translation +# César Gómez Martín +# +# Traductores, si no conoce el formato PO, merece la pena leer la +# documentación de gettext, especialmente las secciones dedicadas a este +# formato, por ejemplo ejecutando: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Equipo de traducción al español, por favor, lean antes de traducir +# los siguientes documentos: +# +# - El proyecto de traducción de Debian al español +# http://www.debian.org/intl/spanish/ +# especialmente las notas de traducción en +# http://www.debian.org/intl/spanish/notas +# +# - La guía de traducción de po's de debconf: +# /usr/share/doc/po-debconf/README-trans +# o http://www.debian.org/intl/l10n/po-debconf/README-trans +# +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 \n" +"Language-Team: Debian l10n spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Spanish\n" +"X-Poedit-Country: SPAIN\n" +"X-Poedit-SourceCharset: utf-8\n" + +#. Type: select +#. Choices +#: ../templates:3 +msgid "" +"suid root for all, suid root with only group audio executable, not suid at " +"all" +msgstr "" +"activar el bit «suid root» para todos, sólo para el grupo «audio», no " +"activarlo en absoluto" + +#. 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?" + +#. 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 "" +"El programa beep debe ejecutarse como root porque necesita acceder al " +"hardware del altavoz. No obstante, existen varias posibilidades para usar el " +"programa: que lo use sólo root (sin «bit suid»), los usuarios que " +"pertenezcan al grupo «audio», o todos." + +#. 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 "" +"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 " +"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 9797e2b..3f6ed84 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: beep 1.2.2-10\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2004-12-06 11:56+0100\n" +"POT-Creation-Date: 2005-06-14 00:09+0200\n" "PO-Revision-Date: 2003-03-13 22:18+0100\n" "Last-Translator: Daniel Dchelotte \n" "Language-Team: Debian-l10n-french \n" @@ -29,15 +29,13 @@ msgstr "" msgid "" "suid root for all, suid root with only group audio executable, not suid at " "all" -msgstr "" -"bit suid positionn et excutable par tous, bit suid positionn mais " -"excutable uniquement par le groupe audio, pas de bit suid" +msgstr "Excution par tous en setuid root, Excution par le seul groupe audio en setuid root, Pas de setuid root" #. Type: select #. Description #: ../templates:5 -msgid "How to handle suid root for beep program?" -msgstr "Comment grer les privilges spciaux du programme beep?" +msgid "How do you want to handle suid root for the beep program?" +msgstr "Gestion des privilges spciaux du programme beep:" #. Type: select #. Description @@ -48,24 +46,24 @@ msgid "" "root (no suid bit at all), executable only by users of the group audio, or " "usable for all." msgstr "" -"Le programme beep doit tre lanc en tant que super-utilisateur (root) " +"Le programme beep doit tre lanc avec les privilges du superutilisateur " "pour pouvoir accder au haut-parleur. Cela est possible de plusieurs " -"faons: soit le bit suid est positionn et tout le monde peut excuter ce " -"programme, soit le bit suid est positionn et seuls les membres du groupe " -"audio peuvent excuter le programme, soit le bit suid n'est pas positionn " -"et beep n'est alors excutable que par le super-utilisateur." +"faons: soit le bit setuid est positionn et tout le monde peut excuter ce " +"programme, soit le bit setuid est positionn et seuls les membres du groupe " +"audio peuvent excuter le programme, soit le bit setuid n'est pas positionn " +"et beep n'est alors excutable que par le superutilisateur." #. Type: select #. Description #: ../templates:5 msgid "" -"Because each program that is suid root is security risk this is not done by " -"default. However, the program is quite small (~150 lines of code) and is " -"fairly easy to verify the safety of the code yourself, if you don't trust my " -"judgement." +"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 "" -"Comme tout programme suid root reprsente un risque du point de vue de la " -"scurit, cela n'est pas fait par dfaut. Toutefois, ce programme est " -"vraiment petit (environ 150 lignes de code) et il est relativement facile de " -"vrifier par vous-mme que le code est sr, si vous ne me faites pas " -"confiance." +"Comme tout programme setuid root reprsente a priori un risque du point " +"de vue de la scurit, cela n'est pas fait par dfaut. Toutefois, ce " +"programme est vraiment petit (environ 150 lignes de code) et il est " +"relativement facile de vrifier par vous-mme que le code est sr, en cas de " +"doute." diff --git a/debian/po/it.po b/debian/po/it.po index 55510e9..e0f533d 100644 --- a/debian/po/it.po +++ b/debian/po/it.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: beep 1.2.2-12\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2004-12-06 11:56+0100\n" -"PO-Revision-Date: 2004-12-06 12:08+0100\n" +"POT-Creation-Date: 2005-06-14 00:09+0200\n" +"PO-Revision-Date: 2005-10-15 12:08+0100\n" "Last-Translator: Stefano Melchior \n" "Language-Team: Italian \n" "MIME-Version: 1.0\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 audio del " -"gruppo, 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 to handle suid root for beep program?" -msgstr "Come gestire suid root per il programma beep?" +msgid "How do you want to handle suid root for the beep program?" +msgstr "Come si vuole gestire suid root per il programma beep?" #. Type: select #. Description @@ -44,13 +44,13 @@ msgstr "" #. Description #: ../templates:5 msgid "" -"Because each program that is suid root is security risk this is not done by " -"default. However, the program is quite small (~150 lines of code) and is " -"fairly easy to verify the safety of the code yourself, if you don't trust my " -"judgement." +"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 "" "Dal momento che ogni programma che usa suid root è un rischio per la " "sicurezza, questo non viene abilitato come opzione predefinita. Comunque, il " -"programma abbastanza piccolo (circa 150 linee di codice) e semplice da " -"permettere la propria verifica della sicurezza del codice, qualora non ci si " +"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." diff --git a/debian/po/ja.po b/debian/po/ja.po index 128edad..f026f12 100644 --- a/debian/po/ja.po +++ b/debian/po/ja.po @@ -16,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: beep 1.2.2-12\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2004-12-06 11:56+0100\n" -"PO-Revision-Date: 2004-03-08 00:02+0900\n" -"Last-Translator: Hideki Yamane \n" +"POT-Creation-Date: 2005-06-14 00:09+0200\n" +"PO-Revision-Date: 2005-10-17 12:32+0200\n" +"Last-Translator: Hideki Yamane \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=EUC-JP\n" @@ -37,8 +37,8 @@ msgstr "" #. Type: select #. Description #: ../templates:5 -msgid "How to handle suid root for beep program?" -msgstr "beep ץǤ root ؤ suid ɤΤ褦˼갷ޤ?" +msgid "How do you want to handle suid root for the beep program?" +msgstr "beep ץؤ suid root ɤޤ?" #. Type: select #. Description @@ -58,12 +58,12 @@ msgstr "" #. Description #: ../templates:5 msgid "" -"Because each program that is suid root is security risk this is not done by " -"default. However, the program is quite small (~150 lines of code) and is " -"fairly easy to verify the safety of the code yourself, if you don't trust my " -"judgement." +"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 "" -"root suid 줿ץϥƥꥹˤʤΤǡǥեȤǤ " -"suid ޤ󡣤ʤ顢Υץ˾Τ (150٤" -"ɤǤ)ȽǤ򿮤ʤ硢ʤȤǥɤΰǧ" -"ΤϤȤƤñǤ" +"ƥץ root suid ΤϥƥꥹˤʤΤǡǥե" +"ǤϤˡϺΤޤ󡣤ʤ顢Υץ˾Τ (150" +"٤ΥɤǤ)ȽǤ򿮤ʤ硢ʤȤǥɤΰ" +"ǧΤϤȤƤñǤ" diff --git a/debian/po/nl.po b/debian/po/nl.po index ec97ba0..54f869a 100644 --- 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: 2004-12-06 11:56+0100\n" +"POT-Creation-Date: 2005-06-14 00:09+0200\n" "PO-Revision-Date: 2003-09-07 20:58+0100\n" "Last-Translator: Tim Vandermeersch \n" "Language-Team: dutch \n" @@ -36,7 +36,8 @@ msgstr "" #. Type: select #. Description #: ../templates:5 -msgid "How to handle suid root for beep program?" +#, fuzzy +msgid "How do you want to handle suid root for the beep program?" msgstr "Hoe suid root af te handelen voor beep programma?" #. Type: select @@ -56,11 +57,12 @@ msgstr "" #. Type: select #. Description #: ../templates:5 +#, fuzzy msgid "" -"Because each program that is suid root is security risk this is not done by " -"default. However, the program is quite small (~150 lines of code) and is " -"fairly easy to verify the safety of the code yourself, if you don't trust my " -"judgement." +"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 "" "Omdat elk suid root programma een veiligheids risico is wordt dit niet " "standaard gedaan. Het programma is vrij klein (~150 regels code) en is " diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po index 9c3373f..d6cef10 100644 --- a/debian/po/pt_BR.po +++ b/debian/po/pt_BR.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: beep-1.2.2-10\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2004-12-06 11:56+0100\n" +"POT-Creation-Date: 2005-06-14 00:09+0200\n" "PO-Revision-Date: 2003-03-15 22:56-0300\n" "Last-Translator: Andr Lus Lopes \n" "Language-Team: Debian-BR Project \n" @@ -36,7 +36,8 @@ msgstr "" #. Type: select #. Description #: ../templates:5 -msgid "How to handle suid root for beep program?" +#, fuzzy +msgid "How do you want to handle suid root for the beep program?" msgstr "Como gerenciar suid root para o programa beep ?" #. Type: select @@ -56,11 +57,12 @@ msgstr "" #. Type: select #. Description #: ../templates:5 +#, fuzzy msgid "" -"Because each program that is suid root is security risk this is not done by " -"default. However, the program is quite small (~150 lines of code) and is " -"fairly easy to verify the safety of the code yourself, if you don't trust my " -"judgement." +"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 segurana isto no feito por padro. Porm, o programa " diff --git a/debian/po/ru.po b/debian/po/ru.po index 30675c0..c40a830 100644 --- 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: 2004-12-06 11:56+0100\n" +"POT-Creation-Date: 2005-06-14 00:09+0200\n" "PO-Revision-Date: 2003-10-02 17:10+0500\n" "Last-Translator: Ilgiz Kalmetev \n" "Language-Team: Russian \n" @@ -35,7 +35,8 @@ msgstr "" #. Type: select #. Description #: ../templates:5 -msgid "How to handle suid root for beep program?" +#, fuzzy +msgid "How do you want to handle suid root for the beep program?" msgstr " suid root beep?" #. Type: select @@ -55,11 +56,12 @@ msgstr "" #. Type: select #. Description #: ../templates:5 +#, fuzzy msgid "" -"Because each program that is suid root is security risk this is not done by " -"default. However, the program is quite small (~150 lines of code) and is " -"fairly easy to verify the safety of the code yourself, if you don't trust my " -"judgement." +"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 "" ", suid root, , " " suid- . , " diff --git a/debian/po/sv.po b/debian/po/sv.po new file mode 100644 index 0000000..aa66db3 --- /dev/null +++ b/debian/po/sv.po @@ -0,0 +1,64 @@ +# 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. +# , fuzzy +# +# +msgid "" +msgstr "" +"Project-Id-Version: beep 1.2.2-15\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" +"Last-Translator: Daniel Nylander \n" +"Language-Team: Swedish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#: ../templates:3 +msgid "" +"suid root for all, suid root with only group audio executable, not suid at " +"all" +msgstr "suid root fr alla, suid root bara fr 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 fr programmet 'beep'?" + +#. 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 mste kras som root eftersom den behver tillgng till " +"hgtalarhrdvaran. Det finns flera stt att gra programmet anvndbart: " +"Antingen bara fr root (ingen suid bit alls), exekverbar bara fr anvndare " +"i gruppen 'audio' eller anvndbar fr alla (suid)." + +#. 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 skerhetsrisk grs detta " +"inte som standard. Programmet r ganska litet (~150 rader kod) och r ltt " +"att verifiera skerheten i koden om du inte litar p mitt omdmme." diff --git a/debian/po/templates.pot b/debian/po/templates.pot index 703fd2a..d6afafc 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -14,9 +14,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: beep 1.2.2-16\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2004-12-06 11:56+0100\n" +"POT-Creation-Date: 2005-06-14 00:09+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -35,7 +35,7 @@ msgstr "" #. Type: select #. Description #: ../templates:5 -msgid "How to handle suid root for beep program?" +msgid "How do you want to handle suid root for the beep program?" msgstr "" #. Type: select @@ -52,8 +52,8 @@ msgstr "" #. Description #: ../templates:5 msgid "" -"Because each program that is suid root is security risk this is not done by " -"default. However, the program is quite small (~150 lines of code) and is " -"fairly easy to verify the safety of the code yourself, if you don't trust my " -"judgement." +"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 "" diff --git a/debian/po/vi.po b/debian/po/vi.po new file mode 100644 index 0000000..78139d3 --- /dev/null +++ b/debian/po/vi.po @@ -0,0 +1,63 @@ +# Vietnamese translation for beep. +# Copyright © 2005 Free Software Foundation, Inc. +# Clytie Siddall , 2005. +# +msgid "" +msgstr "" +"Project-Id-Version: beep 1.2.2-15\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-12 18:01+0930\n" +"Last-Translator: Clytie Siddall \n" +"Language-Team: Vietnamese \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" + +#. Type: select +#. Choices +#: ../templates:3 +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»" + +#. Type: select +#. Description +#: ../templates:5 +#, fuzzy +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?" + +#. 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 "" +"Trình beep phải chạy là 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" +"• chỉ cho phép người dùng trong nhóm audio chạy trình này\n" +"• cho phép mọi người truy cập trình này." + +#. 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 "" +"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ế." diff --git a/debian/rules b/debian/rules index 7e4bc96..7130855 100755 --- a/debian/rules +++ b/debian/rules @@ -48,7 +48,11 @@ install: build -test "$(STRIP)" = "true" && \ strip --remove-section=.comment --remove-section=.note \ --strip-unneeded $(TMP)/usr/bin/beep - chown root.audio $(TMP)/usr/bin/beep + gunzip $(TMP)/usr/share/man/man1/beep.1.gz + cd $(TMP)/usr/share/man/man1 && patch beep.1 $(TMP)/../beep.1.diff + -rm -f $(TMP)/usr/share/man/man1/beep.1.orig + gzip --best $(TMP)/usr/share/man/man1/beep.1 + chown root:audio $(TMP)/usr/bin/beep $(INSTALL_FILE) CREDITS README $(TMP)/usr/share/doc/$(PACKAGE) $(INSTALL_FILE) CHANGELOG $(TMP)/usr/share/doc/$(PACKAGE)/changelog cd $(TMP)/usr/share/doc/$(PACKAGE) && gzip -9 changelog README diff --git a/debian/templates b/debian/templates index 00001c6..10a6d6f 100644 --- a/debian/templates +++ b/debian/templates @@ -2,13 +2,13 @@ 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 to handle suid root for beep program? +_Description: How do you want to handle suid root for the beep program? 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. . - Because each program that is suid root is security risk this is not done - by default. However, the program is quite small (~150 lines of code) and + 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. From af0b92b12831800bd50da166c187620d18c969b2 Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Tue, 14 Feb 2006 01:27:06 +0100 Subject: [PATCH 05/48] Imported Debian patch 1.2.2-17 --- beep.c | 80 ++++++++++++++++++++++++++++++++++++---------- debian/beep.1.diff | 16 ++++++---- debian/changelog | 13 ++++++++ debian/control | 11 +++++++ debian/po/pt.po | 59 ++++++++++++++++++++++++++++++++++ debian/po/vi.po | 21 ++++++------ debian/rules | 68 ++++++++++++++++++++++----------------- 7 files changed, 206 insertions(+), 62 deletions(-) create mode 100644 debian/po/pt.po diff --git a/beep.c b/beep.c index 6b5b885..814a0b3 100644 --- a/beep.c +++ b/beep.c @@ -26,6 +26,7 @@ #include #include #include +#include /* I don't know where this number comes from, I admit that freely. A wonderful human named Raine M. Ekman used it in a program that played @@ -87,18 +88,48 @@ typedef struct beep_parms_t { struct beep_parms_t *next; /* in case -n/--new is used. */ } beep_parms_t; +enum { BEEP_TYPE_CONSOLE, BEEP_TYPE_EVDEV }; + /* Momma taught me never to use globals, but we need something the signal handlers can get at.*/ int console_fd = -1; +int console_type = BEEP_TYPE_CONSOLE; +char *console_device = NULL; + + +void do_beep(int freq) { + if (console_type == BEEP_TYPE_CONSOLE) { + if(ioctl(console_fd, KIOCSOUND, freq != 0 + ? (int)(CLOCK_TICK_RATE/freq) + : freq) < 0) { + printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ + perror("ioctl"); + } + } else { + /* BEEP_TYPE_EVDEV */ + struct input_event e; + + e.type = EV_SND; + e.code = SND_TONE; + e.value = freq; + + write(console_fd, &e, sizeof(struct input_event)); + } +} + /* If we get interrupted, it would be nice to not leave the speaker beeping in perpetuity. */ void handle_signal(int signum) { + + if(console_device) + free(console_device); + switch(signum) { case SIGINT: if(console_fd >= 0) { /* Kill the sound, quit gracefully */ - ioctl(console_fd, KIOCSOUND, 0); + do_beep(0); close(console_fd); exit(signum); } else { @@ -111,7 +142,7 @@ void handle_signal(int signum) { /* print usage and exit */ void usage_bail(const char *executable_name) { printf("Usage:\n%s [-f freq] [-l length] [-r reps] [-d delay] " - "[-D delay] [-s] [-c]\n", + "[-D delay] [-s] [-c] [-e device]\n", executable_name); printf("%s [Options...] [-n] [--new] [Options...] ... \n", executable_name); printf("%s [-h] [--help]\n", executable_name); @@ -143,13 +174,14 @@ void usage_bail(const char *executable_name) { void parse_command_line(int argc, char **argv, beep_parms_t *result) { int c; - struct option opt_list[6] = {{"help", 0, NULL, 'h'}, + struct option opt_list[7] = {{"help", 0, NULL, 'h'}, {"version", 0, NULL, 'V'}, {"new", 0, NULL, 'n'}, {"verbose", 0, NULL, 'X'}, {"debug", 0, NULL, 'X'}, + {"device", 1, NULL, 'e'}, {0,0,0,0}}; - while((c = getopt_long(argc, argv, "f:l:r:d:D:schvVn", opt_list, NULL)) + while((c = getopt_long(argc, argv, "f:l:r:d:D:schvVne:", opt_list, NULL)) != EOF) { int argval = -1; /* handle parsed numbers for various arguments */ float argfreq = -1; @@ -220,11 +252,16 @@ void parse_command_line(int argc, char **argv, beep_parms_t *result) { case 'X' : /* --debug / --verbose */ result->verbose = 1; break; + case 'e' : /* also --device */ + console_device = strdup(optarg); + break; case 'h' : /* notice that this is also --help */ default : usage_bail(argv[0]); } } + if (result->freq == 0) + result->freq = DEFAULT_FREQ; } void play_beep(beep_parms_t parms) { @@ -236,24 +273,32 @@ void play_beep(beep_parms_t parms) { parms.reps, parms.length, parms.delay, parms.end_delay, parms.freq); /* try to snag the console */ - if((console_fd = open("/dev/tty0", O_WRONLY)) == -1) { - if((console_fd = open("/dev/vc/0", O_WRONLY)) == -1) { - fprintf(stderr, "Could not open /dev/tty0 or /dev/vc/0 for writing.\n"); - printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ - perror("open"); - exit(1); - } + 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 == -1) { + fprintf(stderr, "Could not open %s for writing\n", + console_device != NULL ? console_device : "/dev/tty0 or /dev/vc/0"); + printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ + perror("open"); + exit(1); } + + if (ioctl(console_fd, EVIOCGSND(0)) != -1) + console_type = BEEP_TYPE_EVDEV; + else + console_type = BEEP_TYPE_CONSOLE; /* Beep */ for (i = 0; i < parms.reps; i++) { /* start beep */ - if(ioctl(console_fd, KIOCSOUND, (int)(CLOCK_TICK_RATE/parms.freq)) < 0) { - printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ - perror("ioctl"); - } + do_beep(parms.freq); /* Look ma, I'm not ansi C compatible! */ usleep(1000*parms.length); /* wait... */ - ioctl(console_fd, KIOCSOUND, 0); /* stop beep */ + do_beep(0); if(parms.end_delay || (i+1 < parms.reps)) usleep(1000*parms.delay); /* wait... */ } /* repeat. */ @@ -316,5 +361,8 @@ int main(int argc, char **argv) { parms = next; } + if(console_device) + free(console_device); + return EXIT_SUCCESS; } diff --git a/debian/beep.1.diff b/debian/beep.1.diff index c9a31fc..fb9611c 100644 --- a/debian/beep.1.diff +++ b/debian/beep.1.diff @@ -1,18 +1,18 @@ ---- beep.1.orig 2005-10-18 19:44:09.000000000 +0200 -+++ beep.1 2005-10-18 19:55:39.000000000 +0200 +--- beep.1.orig 2006-02-14 00:21:35.000000000 +0100 ++++ beep.1 2006-02-14 00:25:37.000000000 +0100 @@ -1,9 +1,9 @@ -.TH BEEP 1 "March 2002" -+.TH BEEP 1 "October 2005" ++.TH BEEP 1 "February 2006" .SH NAME beep \- beep the pc speaker any number of ways .SH SYNOPSIS .B beep -[\-f N] [\-l N] [\-r N] [\-d N] [\-D N] [\-s] [\-c] -+[\-\-verbose | \-\-debug] [\-f N] [\-l N] [\-r N] [\-d N] [\-D N] [\-s] [\-c] ++[\-\-verbose | \-\-debug] [\-e device | \-\-device device] [\-f N] [\-l N] [\-r N] [\-d N] [\-D N] [\-s] [\-c] .HP .B beep [ OPTIONS ] [-n] [--new] [ OPTIONS ] -@@ -20,6 +20,12 @@ +@@ -20,6 +20,15 @@ All options have default values, meaning that just typing '\fBbeep\fR' will work. If an option is specified more than once on the command line, subsequent options override their predecessors. So '\fBbeep\fR \-f 200 \-f 300' will beep at 300Hz. .SH OPTIONS .TP @@ -21,16 +21,20 @@ +beep: + +[DEBUG] 5 times 200 ms beeps (100 delay between, 0 delay after) @ 1000.00 Hz ++.TP ++\fB\-e\fR device, \fB\-\-device\fR device ++use device as event device. If the switch isn't used, /dev/input/event0, /dev/tty0 and /dev/vc/0 are tried in turn. +.TP \fB\-f\fR N beep at N Hz, where 0 < N < 20000. As a general ballpark, the regular terminal beep is around 750Hz. N is not, incidentally, restricted to whole numbers. .TP -@@ -59,7 +65,8 @@ +@@ -59,7 +68,9 @@ .TP As part of a log-watching pipeline -tail -f /var/log/xferlog | grep 'passwd' | \fBbeep\fR -f 1000 -r 5 -s +tail -f /var/log/xferlog | grep --line-buffered 'passwd' | \\ ++.br +\fBbeep\fR -f 1000 -r 5 -s .TP When using -c mode, I recommend using a short -D, and a shorter -l, so that the beeps don't blur together. Something like this will get you a cheesy 1970's style beep-as-you-type-each-letter effect diff --git a/debian/changelog b/debian/changelog index 2ed1709..afd8229 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +beep (1.2.2-17) unstable; urgency=low + + * Added additional debconf translations: + - Portuguese by Miguel Figueiredo (closes: #344676) + * Updated debconf translation: + - Vietnamese by Clytie Siddall (closes: #343851) + * Fixed breakage raised with --verbose patch (closes: #335027) + * Added udev generation (closes: #350220) + * Applied patch from Alessandro Zummo for evdev and general device node + support (closes: #350214) + + -- Gerfried Fuchs Tue, 14 Feb 2006 01:27:06 +0100 + beep (1.2.2-16) unstable; urgency=low * The "update for the masses" release. diff --git a/debian/control b/debian/control index 21a84f5..dc36b5e 100644 --- a/debian/control +++ b/debian/control @@ -15,3 +15,14 @@ Description: advanced pc-speaker beeper controlled completely through command line options. It's not supposed to be complex, and it isn't - but it makes system monitoring (or whatever else it gets hacked into) much more informative. + +Package: beep-udeb +Architecture: any +Section: debian-installer +Depends: ${shlibs:Depends} +Description: advanced pc-speaker beeper + beep does what you'd expect: it beeps. However, it offers various + additional features, such as the ability to control pitch, duration, + and repetitions. + . + beep-udeb is a minimal package used by debian-installer. diff --git a/debian/po/pt.po b/debian/po/pt.po new file mode 100644 index 0000000..fdec786 --- /dev/null +++ b/debian/po/pt.po @@ -0,0 +1,59 @@ +# Portuguese translation for beep's debconf messages. +# 2005, Miguel Figueiredo +# +# 2005-12-24 - Initial translation +# +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" +"Last-Translator: Miguel Figueiredo \n" +"Language-Team: Portuguese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#: ../templates:3 +msgid "" +"suid root for all, suid root with only group audio executable, not suid at " +"all" +msgstr "" +"suid root para todos, suid root apenas com o grupo audio executável, sem suid" + +#. 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?" + +#. 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 "" +"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 +#: ../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 "" +"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/vi.po b/debian/po/vi.po index 78139d3..8a30482 100644 --- a/debian/po/vi.po +++ b/debian/po/vi.po @@ -1,19 +1,20 @@ -# Vietnamese translation for beep. +# Vietnamese translation for Beep. # Copyright © 2005 Free Software Foundation, Inc. # Clytie Siddall , 2005. # msgid "" msgstr "" -"Project-Id-Version: beep 1.2.2-15\n" +"Project-Id-Version: beep 1.2.2\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-12 18:01+0930\n" +"PO-Revision-Date: 2005-12-30 12:48+0100\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \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 @@ -22,15 +23,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 có thể chạy âm thanh " +"nhóm, không có « suid root »" #. Type: select #. Description #: ../templates:5 -#, fuzzy 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?" +msgstr "Bạn có muốn quản lý « suid root » cho chương trình beep như thế nào?" #. Type: select #. Description @@ -41,16 +41,15 @@ msgid "" "root (no suid bit at all), executable only by users of the group audio, or " "usable for all." msgstr "" -"Trình beep phải chạy là 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" +"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" -"• chỉ cho phép người dùng trong nhóm audio chạy trình này\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." #. 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 " diff --git a/debian/rules b/debian/rules index 7130855..bed40c8 100755 --- a/debian/rules +++ b/debian/rules @@ -1,8 +1,13 @@ #!/usr/bin/make -f # debian/rules file for beep -PACKAGE = beep -TMP = $(CURDIR)/debian/$(PACKAGE) +PKG1 = beep +TMP1 = $(CURDIR)/debian/$(PKG1) +PKG2 = beep-udeb +TMP2 = $(CURDIR)/debian/$(PKG2) + +VERSION = $(shell dpkg-parsechangelog | grep "^Version:" | cut -d" " -f 2) +ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH) FLAGS = -g -Wall INSTALL = install @@ -25,7 +30,7 @@ endif clean: $(checkdir) $(checkroot) - -rm -rf $(TMP) debian/substvars debian/files build-stamp + -rm -rf $(TMP1) $(TMP2) debian/substvars debian/files build-stamp -$(MAKE) clean @@ -39,23 +44,25 @@ build-stamp: install: build $(checkdir) $(checkroot) - -rm -rf $(TMP) debian/substvars - $(INSTALL_DIR) $(TMP) - cd $(TMP) && $(INSTALL_DIR) usr/bin usr/share/man/man1 \ - usr/share/doc/$(PACKAGE) - $(MAKE) install INSTALL_DIR=$(TMP)/usr/bin \ - MAN_DIR=$(TMP)/usr/share/man/man1 + -rm -rf $(TMP1) $(TMP2) debian/substvars + $(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 $(TMP)/usr/bin/beep - gunzip $(TMP)/usr/share/man/man1/beep.1.gz - cd $(TMP)/usr/share/man/man1 && patch beep.1 $(TMP)/../beep.1.diff - -rm -f $(TMP)/usr/share/man/man1/beep.1.orig - gzip --best $(TMP)/usr/share/man/man1/beep.1 - chown root:audio $(TMP)/usr/bin/beep - $(INSTALL_FILE) CREDITS README $(TMP)/usr/share/doc/$(PACKAGE) - $(INSTALL_FILE) CHANGELOG $(TMP)/usr/share/doc/$(PACKAGE)/changelog - cd $(TMP)/usr/share/doc/$(PACKAGE) && gzip -9 changelog README + --strip-unneeded $(TMP1)/usr/bin/beep + 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 + gzip --best $(TMP1)/usr/share/man/man1/beep.1 + chown root:audio $(TMP1)/usr/bin/beep + $(INSTALL_FILE) CREDITS README $(TMP1)/usr/share/doc/$(PKG1) + $(INSTALL_FILE) CHANGELOG $(TMP1)/usr/share/doc/$(PKG1)/changelog + cd $(TMP1)/usr/share/doc/$(PKG1) && gzip -9 changelog README + $(INSTALL_DIR) $(TMP2)/usr/bin + $(INSTALL_PROGRAM) beep $(TMP2)/usr/bin # Build architecture-independent files here. @@ -66,21 +73,24 @@ binary-indep: build binary-arch: build install $(checkdir) $(checkroot) - $(INSTALL_DIR) $(TMP)/DEBIAN + $(INSTALL_DIR) $(TMP1)/DEBIAN $(TMP2)/DEBIAN $(INSTALL_FILE) debian/README.Debian debian/copyright \ - $(TMP)/usr/share/doc/$(PACKAGE) + $(TMP1)/usr/share/doc/$(PKG1) $(INSTALL_FILE) debian/changelog \ - $(TMP)/usr/share/doc/$(PACKAGE)/changelog.Debian - gzip -9 $(TMP)/usr/share/doc/$(PACKAGE)/changelog.Debian + $(TMP1)/usr/share/doc/$(PKG1)/changelog.Debian + gzip -9 $(TMP1)/usr/share/doc/$(PKG1)/changelog.Debian $(INSTALL_SCRIPT) debian/postinst debian/postrm debian/config \ - $(TMP)/DEBIAN - po2debconf debian/templates > $(TMP)/DEBIAN/templates - dpkg-shlibdeps -Tdebian/substvars -dDepends $(TMP)/usr/bin/beep - dpkg-gencontrol -ldebian/changelog -isp -Tdebian/substvars -p$(PACKAGE) \ - -P$(TMP) - cd $(TMP) && find * -type f ! -regex '^DEBIAN/.*' -print0 | \ + $(TMP1)/DEBIAN + po2debconf debian/templates > $(TMP1)/DEBIAN/templates + dpkg-shlibdeps -Tdebian/substvars -dDepends $(TMP1)/usr/bin/beep + dpkg-gencontrol -ldebian/changelog -isp -Tdebian/substvars -p$(PKG1) \ + -P$(TMP1) + cd $(TMP1) && find * -type f ! -regex '^DEBIAN/.*' -print0 | \ xargs -r0 md5sum > DEBIAN/md5sums - dpkg --build $(TMP) .. + dpkg --build $(TMP1) .. + dpkg-gencontrol -ldebian/changelog -isp -Tdebian/substvars -p$(PKG2) \ + -P$(TMP2) -n$(PKG2)_$(VERSION)_$(ARCH).udeb + dpkg --build $(TMP2) ../$(PKG2)_$(VERSION)_$(ARCH).udeb binary: binary-arch From 37ef60ac9891a4bddc7d6a4bdba24837e10abd0f Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Sun, 25 Jun 2006 11:12:11 -0500 Subject: [PATCH 06/48] Imported Debian patch 1.2.2-18 --- beep.c | 5 ++--- debian/changelog | 21 +++++++++++++++++- debian/control | 2 +- debian/overrides | 1 + debian/po/ca.po | 23 ++++++++++---------- debian/po/cs.po | 18 ++++++++-------- debian/po/de.po | 10 ++++----- debian/po/es.po | 22 ++++++++++--------- debian/po/fr.po | 12 ++++++----- debian/po/it.po | 19 +++++++++------- debian/po/ja.po | 13 ++++++----- debian/po/nl.po | 11 ++++++---- debian/po/pt.po | 28 +++++++++++------------- debian/po/pt_BR.po | 41 +++++++++++++++++++---------------- debian/po/ru.po | 11 ++++++---- debian/po/sv.po | 48 ++++++++++++++--------------------------- debian/po/templates.pot | 22 ++++++------------- debian/po/vi.po | 33 ++++++++++++++-------------- debian/postrm | 2 +- debian/rules | 13 ++++++----- debian/templates | 2 +- 21 files changed, 185 insertions(+), 172 deletions(-) create mode 100644 debian/overrides diff --git a/beep.c b/beep.c index 814a0b3..e421e8f 100644 --- 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 afd8229..f1aa8f3 100644 --- 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 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 dc36b5e..c7f0ba8 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: sound Priority: optional Maintainer: Gerfried Fuchs 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 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 6c165aa..3b66077 100644 --- 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 , 2004. -# Miguel Gea Milvaques , 2004. # +# Jordi Fernández Mora , 2004. +# Miguel Gea Milvaques , 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 \n" -"Language-Team: Catalan \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 \n" +"Language-Team: catalan \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 41e4b9d..91e906b 100644 --- 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 \n" -"Language-Team: Czech \n" +"Language-Team: Czech \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 7d739aa..16cd0d1 100644 --- 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 \n" "Language-Team: German \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 fr 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 dadb82e..b640cd0 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -4,7 +4,9 @@ # # Changes: # - Initial translation -# César Gómez Martín +# César Gómez Martín , 2005. +# - Updates: +# David Martínez Moreno , 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 \n" -"Language-Team: Debian l10n spanish \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 \n" +"Language-Team: Debian l10n Spanish \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 3f6ed84..9c91f2e 100644 --- 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 Dchelotte \n" "Language-Team: Debian-l10n-french \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 "Excution par tous en setuid root, Excution par le seul groupe audio en setuid root, Pas de setuid root" +msgstr "" +"Excution par tous en setuid root, Excution 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 privilges spciaux 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 e0f533d..d642007 100644 --- 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 \n" "Language-Team: Italian \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 f026f12..c3d2e6d 100644 --- 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 \n" "Language-Team: Japanese \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 54f869a..bdc1a12 100644 --- 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 \n" "Language-Team: dutch \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 verifiren, 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 fdec786..b880900 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -1,14 +1,12 @@ # Portuguese translation for beep's debconf messages. -# 2005, Miguel Figueiredo -# -# 2005-12-24 - Initial translation +# 2005-2006, Miguel Figueiredo # 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 \n" "Language-Team: Portuguese \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 d6cef10..a73eb2f 100644 --- 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 , 2003 +# Felipe Augusto van de Wiel (faw) , 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 Lus Lopes \n" -"Language-Team: Debian-BR Project \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) \n" +"Language-Team: l10n portuguese \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 executvel, 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 utilizvel : somente executvel pelo root (sem suid), executvel " -"somente pelos usurios do grupo audio ou executvel 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 segurana isto no feito por padro. Porm, o programa " -"bastante pequeno (aproximadamente 150 linhas de cdigo) e muito fcil " -"verificar a segurana do cdigo caso voc no 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 c40a830..457364f 100644 --- 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 \n" "Language-Team: Russian \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 aa66db3..903a07a 100644 --- 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 , 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 \n" -"Language-Team: Swedish \n" +"Language-Team: Swedish \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 fr alla, suid root bara fr gruppen 'audio', inte suid alls" +msgid "suid root for all, suid root with only group audio executable, not suid at all" +msgstr "suid root fr alla, suid root endast fr 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 fr 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 mste kras som root eftersom den behver tillgng till " -"hgtalarhrdvaran. Det finns flera stt att gra programmet anvndbart: " -"Antingen bara fr root (ingen suid bit alls), exekverbar bara fr anvndare " -"i gruppen 'audio' eller anvndbar fr 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 mste kras som root eftersom den behver tkomst till hgtalarhrdvaran. Det finns flera stt att gra programmet anvndbart: Antingen endast fr root (ingen suid-bit alls), krbar endast fr anvndare i gruppen \"audio\" eller anvndbar fr 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 skerhetsrisk grs detta " -"inte som standard. Programmet r ganska litet (~150 rader kod) och r ltt " -"att verifiera skerheten i koden om du inte litar p mitt omdmme." +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 skerhetsrisk kommer detta inte gras som standard. Programmet r ganska litet (~150 rader kod) och r ltt att validera skerheten i koden om du inte litar p mitt omdme." diff --git a/debian/po/templates.pot b/debian/po/templates.pot index d6afafc..637a4d5 100644 --- 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 +# This file is distributed under the same license as the beep package. +# FIRST AUTHOR , 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 \n" "Language-Team: LANGUAGE \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 8a30482..6ddea2a 100644 --- 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 , 2005. +# Copyright © 2006 Free Software Foundation, Inc. +# Clytie Siddall , 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 \n" -"Language-Team: Vietnamese \n" +"Language-Team: Vietnamese \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 9abaeca..fa9ecee 100644 --- 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 bed40c8..56cae22 100755 --- 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 10a6d6f..117d6c4 100644 --- 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 From 11c8159d307fbde222e528ea93fc21eafb0e2f9d Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Tue, 20 Feb 2007 23:53:27 +0100 Subject: [PATCH 07/48] Imported Debian patch 1.2.2-19 --- debian/beep.1.diff | 4 ++-- debian/changelog | 8 ++++++++ debian/po/ca.po | 16 +++++++-------- debian/po/cs.po | 12 +++++------ debian/po/de.po | 12 +++++------ debian/po/es.po | 16 +++++++-------- debian/po/fr.po | 12 +++++------ debian/po/it.po | 12 +++++------ debian/po/ja.po | 44 ++++++++++++++++++++--------------------- debian/po/nl.po | 12 +++++------ debian/po/pt.po | 12 +++++------ debian/po/pt_BR.po | 12 +++++------ debian/po/ru.po | 12 +++++------ debian/po/sv.po | 42 ++++++++++++++++++++++++++++----------- debian/po/templates.pot | 20 +++++++++---------- debian/po/vi.po | 12 +++++------ 16 files changed, 142 insertions(+), 116 deletions(-) diff --git a/debian/beep.1.diff b/debian/beep.1.diff index fb9611c..c22b284 100644 --- a/debian/beep.1.diff +++ b/debian/beep.1.diff @@ -2,7 +2,7 @@ +++ beep.1 2006-02-14 00:25:37.000000000 +0100 @@ -1,9 +1,9 @@ -.TH BEEP 1 "March 2002" -+.TH BEEP 1 "February 2006" ++.TH BEEP 1 "November 2006" .SH NAME beep \- beep the pc speaker any number of ways .SH SYNOPSIS @@ -23,7 +23,7 @@ +[DEBUG] 5 times 200 ms beeps (100 delay between, 0 delay after) @ 1000.00 Hz +.TP +\fB\-e\fR device, \fB\-\-device\fR device -+use device as event device. If the switch isn't used, /dev/input/event0, /dev/tty0 and /dev/vc/0 are tried in turn. ++use device as event device. If the switch isn't used, /dev/tty0 and /dev/vc/0 are tried in turn. +.TP \fB\-f\fR N beep at N Hz, where 0 < N < 20000. As a general ballpark, the regular terminal beep is around 750Hz. N is not, incidentally, restricted to whole numbers. diff --git a/debian/changelog b/debian/changelog index f1aa8f3..ebe6cd6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +beep (1.2.2-19) unstable; urgency=low + + * Translation update: Japanese (Hideki Yamane, closes: #392171) + * Refixed manpage with respect to the event device handling + (closes: #397680) + + -- Gerfried Fuchs Tue, 20 Feb 2007 23:53:27 +0100 + beep (1.2.2-18) unstable; urgency=low * Use install instead of make install which just copies over the files... diff --git a/debian/po/ca.po b/debian/po/ca.po index 3b66077..8f938bc 100644 --- a/debian/po/ca.po +++ b/debian/po/ca.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: ca\n" -"Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2006-06-21 05:05-0500\n" +"Report-Msgid-Bugs-To: alfie@debian.org\n" +"POT-Creation-Date: 2007-02-20 23:46+0100\n" "PO-Revision-Date: 2006-06-21 08:40-0500\n" "Last-Translator: Miguel Gea Milvaques \n" "Language-Team: catalan \n" @@ -27,21 +27,22 @@ msgstr "" #. Type: select #. Choices -#: ../templates:3 +#: ../templates:1001 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 +#: ../templates:1002 msgid "Install beep as:" msgstr "Instal·lar beep com:" #. Type: select #. Description -#: ../templates:5 +#: ../templates:1002 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 " @@ -55,7 +56,7 @@ msgstr "" #. Type: select #. Description -#: ../templates:5 +#: ../templates:1002 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 " @@ -66,4 +67,3 @@ 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 91e906b..9168c9b 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: beep\n" -"Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2006-06-21 05:05-0500\n" +"Report-Msgid-Bugs-To: alfie@debian.org\n" +"POT-Creation-Date: 2007-02-20 23:46+0100\n" "PO-Revision-Date: 2006-06-21 14:23+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -25,7 +25,7 @@ msgstr "" #. Type: select #. Choices -#: ../templates:3 +#: ../templates:1001 msgid "" "suid root for all, suid root with only group audio executable, not suid at " "all" @@ -34,13 +34,13 @@ msgstr "" #. Type: select #. Description -#: ../templates:5 +#: ../templates:1002 msgid "Install beep as:" msgstr "Instalovat beep jako:" #. Type: select #. Description -#: ../templates:5 +#: ../templates:1002 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 " @@ -54,7 +54,7 @@ msgstr "" #. Type: select #. Description -#: ../templates:5 +#: ../templates:1002 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 " diff --git a/debian/po/de.po b/debian/po/de.po index 16cd0d1..e2303f1 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: beep 1.2.2-18\n" -"Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2006-06-21 05:05-0500\n" +"Report-Msgid-Bugs-To: alfie@debian.org\n" +"POT-Creation-Date: 2007-02-20 23:46+0100\n" "PO-Revision-Date: 2006-06-21 05:07-0500\n" "Last-Translator: Gerfried Fuchs \n" "Language-Team: German \n" @@ -25,7 +25,7 @@ msgstr "" #. Type: select #. Choices -#: ../templates:3 +#: ../templates:1001 msgid "" "suid root for all, suid root with only group audio executable, not suid at " "all" @@ -35,13 +35,13 @@ msgstr "" #. Type: select #. Description -#: ../templates:5 +#: ../templates:1002 msgid "Install beep as:" msgstr "beep installieren als:" #. Type: select #. Description -#: ../templates:5 +#: ../templates:1002 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 " @@ -55,7 +55,7 @@ msgstr "" #. Type: select #. Description -#: ../templates:5 +#: ../templates:1002 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 " diff --git a/debian/po/es.po b/debian/po/es.po index b640cd0..9f84654 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -28,8 +28,8 @@ msgid "" msgstr "" "Project-Id-Version: beep\n" -"Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2006-06-21 05:05-0500\n" +"Report-Msgid-Bugs-To: alfie@debian.org\n" +"POT-Creation-Date: 2007-02-20 23:46+0100\n" "PO-Revision-Date: 2006-06-28 02:06-0500\n" "Last-Translator: David Martínez Moreno \n" "Language-Team: Debian l10n Spanish \n" @@ -42,7 +42,7 @@ msgstr "" #. Type: select #. Choices -#: ../templates:3 +#: ../templates:1001 msgid "" "suid root for all, suid root with only group audio executable, not suid at " "all" @@ -52,13 +52,13 @@ msgstr "" #. Type: select #. Description -#: ../templates:5 +#: ../templates:1002 msgid "Install beep as:" msgstr "Instalar beep de la siguiente manera:" #. Type: select #. Description -#: ../templates:5 +#: ../templates:1002 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 " @@ -72,15 +72,15 @@ msgstr "" #. Type: select #. Description -#: ../templates:5 +#: ../templates:1002 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 "" -"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 " +"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 9c91f2e..35fca39 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: beep 1.2.2-10\n" -"Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2006-06-21 05:05-0500\n" +"Report-Msgid-Bugs-To: alfie@debian.org\n" +"POT-Creation-Date: 2007-02-20 23:46+0100\n" "PO-Revision-Date: 2006-06-28 02:06-0500\n" "Last-Translator: Daniel Dchelotte \n" "Language-Team: Debian-l10n-french \n" @@ -25,7 +25,7 @@ msgstr "" #. Type: select #. Choices -#: ../templates:3 +#: ../templates:1001 msgid "" "suid root for all, suid root with only group audio executable, not suid at " "all" @@ -35,13 +35,13 @@ msgstr "" #. Type: select #. Description -#: ../templates:5 +#: ../templates:1002 msgid "Install beep as:" msgstr "Installer beep en:" #. Type: select #. Description -#: ../templates:5 +#: ../templates:1002 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 " @@ -57,7 +57,7 @@ msgstr "" #. Type: select #. Description -#: ../templates:5 +#: ../templates:1002 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 " diff --git a/debian/po/it.po b/debian/po/it.po index d642007..9fcb1e4 100644 --- a/debian/po/it.po +++ b/debian/po/it.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: beep 1.2.2-12\n" -"Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2006-06-21 05:05-0500\n" +"Report-Msgid-Bugs-To: alfie@debian.org\n" +"POT-Creation-Date: 2007-02-20 23:46+0100\n" "PO-Revision-Date: 2005-10-15 12:08+0100\n" "Last-Translator: Stefano Melchior \n" "Language-Team: Italian \n" @@ -12,7 +12,7 @@ msgstr "" #. Type: select #. Choices -#: ../templates:3 +#: ../templates:1001 msgid "" "suid root for all, suid root with only group audio executable, not suid at " "all" @@ -22,13 +22,13 @@ msgstr "" #. Type: select #. Description -#: ../templates:5 +#: ../templates:1002 msgid "Install beep as:" msgstr "" #. Type: select #. Description -#: ../templates:5 +#: ../templates:1002 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 " @@ -42,7 +42,7 @@ msgstr "" #. Type: select #. Description -#: ../templates:5 +#: ../templates:1002 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 " diff --git a/debian/po/ja.po b/debian/po/ja.po index c3d2e6d..2fd31da 100644 --- a/debian/po/ja.po +++ b/debian/po/ja.po @@ -14,59 +14,59 @@ # msgid "" msgstr "" -"Project-Id-Version: beep 1.2.2-12\n" -"Report-Msgid-Bugs-To: beep@packages.debian.org\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 \n" +"Project-Id-Version: beep 1.2.2-18\n" +"Report-Msgid-Bugs-To: alfie@debian.org\n" +"POT-Creation-Date: 2007-02-20 23:46+0100\n" +"PO-Revision-Date: 2006-10-11 00:08+0900\n" +"Last-Translator: Hideki Yamane (Debian-JP) \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=EUC-JP\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #. Type: select #. Choices -#: ../templates:3 +#: ../templates:1001 msgid "" "suid root for all, suid root with only group audio executable, not suid at " "all" msgstr "" -"桼Ȥ褦 root suid , audio 롼פ¹ԤǤ褦" -" root suid , suid ʤ" +"全ユーザが使えるように root に suid する, audio グループだけが実行できるよう" +"に root に suid する, suid しない" #. Type: select #. Description -#: ../templates:5 +#: ../templates:1002 msgid "Install beep as:" -msgstr "" +msgstr "beep のインストール時設定について:" #. Type: select #. Description -#: ../templates:5 +#: ../templates:1002 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 root ȤƼ¹" -"ʤФʤޤ󡣥ץȤˤĤޤ: root " -"ߤˤ (suid Ȥʤ褦ˤ) audio 롼׽°Υ桼" -"褦ˤ롢ïǤȤ褦ˤ롢Τɤ줫Ǥ" +"スピーカーのハードウェアにアクセスする必要があるので beep は root として実行" +"しなければなりません。プログラムを使うためにやり方がいくつかあります: root の" +"みにする (suid を全く使わないようにする) 、audio グループ所属のユーザだけが使" +"えるようにする、誰でも使えるようにする、のどれかです。" #. Type: select #. Description -#: ../templates:5 +#: ../templates:1002 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 "" -"ƥץ root suid ΤϥƥꥹˤʤΤǡǥե" -"ǤϤˡϺΤޤ󡣤ʤ顢Υץ˾Τ (150" -"٤ΥɤǤ)ȽǤ򿮤ʤ硢ʤȤǥɤΰ" -"ɳǧΤϤȤƤñǤ" +"各プログラムを root に suid するのはセキュリティリスクになるので、デフォルト" +"ではこの方法は採りません。しかしながら、このプログラムは非常に小さいので (150" +"行程度のコードです)、私の判断を信じられない場合、あなた自身でコードの安全性" +"を”確認するのはとても簡単です。" #~ msgid "How do you want to handle suid root for the beep program?" -#~ msgstr "beep ץؤ suid root ɤޤ?" +#~ msgstr "beep プログラムへの suid root 設定をどうしますか?" diff --git a/debian/po/nl.po b/debian/po/nl.po index bdc1a12..c154270 100644 --- a/debian/po/nl.po +++ b/debian/po/nl.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: beep 1.2.2-11\n" -"Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2006-06-21 05:05-0500\n" +"Report-Msgid-Bugs-To: alfie@debian.org\n" +"POT-Creation-Date: 2007-02-20 23:46+0100\n" "PO-Revision-Date: 2003-09-07 20:58+0100\n" "Last-Translator: Tim Vandermeersch \n" "Language-Team: dutch \n" @@ -25,7 +25,7 @@ msgstr "" #. Type: select #. Choices -#: ../templates:3 +#: ../templates:1001 msgid "" "suid root for all, suid root with only group audio executable, not suid at " "all" @@ -35,13 +35,13 @@ msgstr "" #. Type: select #. Description -#: ../templates:5 +#: ../templates:1002 msgid "Install beep as:" msgstr "" #. Type: select #. Description -#: ../templates:5 +#: ../templates:1002 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 " @@ -55,7 +55,7 @@ msgstr "" #. Type: select #. Description -#: ../templates:5 +#: ../templates:1002 #, fuzzy msgid "" "Since each program set as suid root can be a security risk this is not done " diff --git a/debian/po/pt.po b/debian/po/pt.po index b880900..a72aac8 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: beep 1.2.2-16\n" -"Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2006-06-21 05:05-0500\n" +"Report-Msgid-Bugs-To: alfie@debian.org\n" +"POT-Creation-Date: 2007-02-20 23:46+0100\n" "PO-Revision-Date: 2006-06-28 02:07-0500\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" @@ -15,7 +15,7 @@ msgstr "" #. Type: select #. Choices -#: ../templates:3 +#: ../templates:1001 msgid "" "suid root for all, suid root with only group audio executable, not suid at " "all" @@ -24,13 +24,13 @@ msgstr "" #. Type: select #. Description -#: ../templates:5 +#: ../templates:1002 msgid "Install beep as:" msgstr "Instalar beep como:" #. Type: select #. Description -#: ../templates:5 +#: ../templates:1002 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 " @@ -44,7 +44,7 @@ msgstr "" #. Type: select #. Description -#: ../templates:5 +#: ../templates:1002 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 " diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po index a73eb2f..382b928 100644 --- a/debian/po/pt_BR.po +++ b/debian/po/pt_BR.po @@ -18,8 +18,8 @@ msgid "" msgstr "" "Project-Id-Version: beep-1.2.2-10\n" -"Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2006-06-21 05:05-0500\n" +"Report-Msgid-Bugs-To: alfie@debian.org\n" +"POT-Creation-Date: 2007-02-20 23:46+0100\n" "PO-Revision-Date: 2006-06-28 02:06-0500\n" "Last-Translator: Felipe Augusto van de Wiel (faw) \n" @@ -32,7 +32,7 @@ msgstr "" #. Type: select #. Choices -#: ../templates:3 +#: ../templates:1001 msgid "" "suid root for all, suid root with only group audio executable, not suid at " "all" @@ -42,13 +42,13 @@ msgstr "" #. Type: select #. Description -#: ../templates:5 +#: ../templates:1002 msgid "Install beep as:" msgstr "Instalar beep como:" #. Type: select #. Description -#: ../templates:5 +#: ../templates:1002 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 " @@ -62,7 +62,7 @@ msgstr "" #. Type: select #. Description -#: ../templates:5 +#: ../templates:1002 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 " diff --git a/debian/po/ru.po b/debian/po/ru.po index 457364f..cae262f 100644 --- a/debian/po/ru.po +++ b/debian/po/ru.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2006-06-21 05:05-0500\n" +"Report-Msgid-Bugs-To: alfie@debian.org\n" +"POT-Creation-Date: 2007-02-20 23:46+0100\n" "PO-Revision-Date: 2003-10-02 17:10+0500\n" "Last-Translator: Ilgiz Kalmetev \n" "Language-Team: Russian \n" @@ -25,7 +25,7 @@ msgstr "" #. Type: select #. Choices -#: ../templates:3 +#: ../templates:1001 msgid "" "suid root for all, suid root with only group audio executable, not suid at " "all" @@ -34,13 +34,13 @@ msgstr "" #. Type: select #. Description -#: ../templates:5 +#: ../templates:1002 msgid "Install beep as:" msgstr "" #. Type: select #. Description -#: ../templates:5 +#: ../templates:1002 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 " @@ -54,7 +54,7 @@ msgstr "" #. Type: select #. Description -#: ../templates:5 +#: ../templates:1002 #, fuzzy msgid "" "Since each program set as suid root can be a security risk this is not done " diff --git a/debian/po/sv.po b/debian/po/sv.po index 903a07a..96e1b37 100644 --- a/debian/po/sv.po +++ b/debian/po/sv.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: beep\n" -"Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2006-06-21 05:05-0500\n" +"Report-Msgid-Bugs-To: alfie@debian.org\n" +"POT-Creation-Date: 2007-02-20 23:46+0100\n" "PO-Revision-Date: 2006-06-21 12:49-0500\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -25,24 +25,42 @@ 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 fr alla, suid root endast fr gruppen \"audio\", inte suid alls" +#: ../templates:1001 +msgid "" +"suid root for all, suid root with only group audio executable, not suid at " +"all" +msgstr "" +"suid root fr alla, suid root endast fr gruppen \"audio\", inte suid alls" #. Type: select #. Description -#: ../templates:5 +#: ../templates:1002 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 mste kras som root eftersom den behver tkomst till hgtalarhrdvaran. Det finns flera stt att gra programmet anvndbart: Antingen endast fr root (ingen suid-bit alls), krbar endast fr anvndare i gruppen \"audio\" eller anvndbar fr alla." +#: ../templates:1002 +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 mste kras som root eftersom den behver tkomst till " +"hgtalarhrdvaran. Det finns flera stt att gra programmet anvndbart: " +"Antingen endast fr root (ingen suid-bit alls), krbar endast fr anvndare " +"i gruppen \"audio\" eller anvndbar fr 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 de program som r suid root kan vara en skerhetsrisk kommer detta inte gras som standard. Programmet r ganska litet (~150 rader kod) och r ltt att validera skerheten i koden om du inte litar p mitt omdme." +#: ../templates:1002 +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 skerhetsrisk kommer detta " +"inte gras som standard. Programmet r ganska litet (~150 rader kod) och r " +"ltt att validera skerheten i koden om du inte litar p mitt omdme." diff --git a/debian/po/templates.pot b/debian/po/templates.pot index 637a4d5..9869bc1 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -1,14 +1,14 @@ -# debconf translation for the beep package. -# Copyright (C) 2002-2006 Gerfried Fuchs -# This file is distributed under the same license as the beep package. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: beep VERSION\n" -"Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2006-06-21 05:05-0500\n" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: alfie@debian.org\n" +"POT-Creation-Date: 2007-02-20 23:46+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,7 +18,7 @@ msgstr "" #. Type: select #. Choices -#: ../templates:3 +#: ../templates:1001 msgid "" "suid root for all, suid root with only group audio executable, not suid at " "all" @@ -26,13 +26,13 @@ msgstr "" #. Type: select #. Description -#: ../templates:5 +#: ../templates:1002 msgid "Install beep as:" msgstr "" #. Type: select #. Description -#: ../templates:5 +#: ../templates:1002 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 " @@ -42,7 +42,7 @@ msgstr "" #. Type: select #. Description -#: ../templates:5 +#: ../templates:1002 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 " diff --git a/debian/po/vi.po b/debian/po/vi.po index 6ddea2a..b6ab358 100644 --- a/debian/po/vi.po +++ b/debian/po/vi.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: beep 1.2.2-18\n" -"Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2006-06-21 05:05-0500\n" +"Report-Msgid-Bugs-To: alfie@debian.org\n" +"POT-Creation-Date: 2007-02-20 23:46+0100\n" "PO-Revision-Date: 2006-06-23 03:49-0500\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -17,7 +17,7 @@ msgstr "" #. Type: select #. Choices -#: ../templates:3 +#: ../templates:1001 msgid "" "suid root for all, suid root with only group audio executable, not suid at " "all" @@ -27,13 +27,13 @@ msgstr "" #. Type: select #. Description -#: ../templates:5 +#: ../templates:1002 msgid "Install beep as:" msgstr "Cài đặt beep dạng:" #. Type: select #. Description -#: ../templates:5 +#: ../templates:1002 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 " @@ -48,7 +48,7 @@ msgstr "" #. Type: select #. Description -#: ../templates:5 +#: ../templates:1002 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 " From 66999915b78ac05671fbadae5acd7be710cf2773 Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Wed, 3 Oct 2007 19:46:07 +0200 Subject: [PATCH 08/48] Imported Debian patch 1.2.2-20 --- Makefile | 2 +- beep.c | 94 +++-------------- debian/changelog | 15 +++ debian/control | 5 +- debian/copyright | 19 ++-- debian/patches/01_makefile-fixup | 11 ++ debian/patches/02_verbose-option | 76 ++++++++++++++ debian/patches/03_multiple-freq | 44 ++++++++ debian/patches/04_serial-console-fix | 15 +++ debian/patches/05_devfs-fix | 21 ++++ debian/patches/06_event-option | 151 +++++++++++++++++++++++++++ debian/patches/series | 6 ++ debian/po/ca.po | 2 +- debian/po/cs.po | 2 +- debian/po/de.po | 2 +- debian/po/es.po | 2 +- debian/po/fr.po | 2 +- debian/po/it.po | 7 +- debian/po/ja.po | 7 +- debian/po/nl.po | 8 +- debian/po/pt.po | 2 +- debian/po/pt_BR.po | 2 +- debian/po/ru.po | 8 +- debian/po/sv.po | 2 +- debian/po/templates.pot | 6 +- debian/po/vi.po | 2 +- debian/rules | 8 +- 27 files changed, 392 insertions(+), 129 deletions(-) create mode 100644 debian/patches/01_makefile-fixup create mode 100644 debian/patches/02_verbose-option create mode 100644 debian/patches/03_multiple-freq create mode 100644 debian/patches/04_serial-console-fix create mode 100644 debian/patches/05_devfs-fix create mode 100644 debian/patches/06_event-option create mode 100644 debian/patches/series diff --git a/Makefile b/Makefile index cc359c4..5856f9f 100644 --- a/Makefile +++ b/Makefile @@ -15,5 +15,5 @@ beep : beep.c install : cp ${EXEC_NAME} ${INSTALL_DIR} - # rm -f /usr/man/man1/beep.1.bz2 + rm -f /usr/man/man1/beep.1.bz2 cp ${MAN_FILE} ${MAN_DIR} diff --git a/beep.c b/beep.c index e421e8f..f774b56 100644 --- a/beep.c +++ b/beep.c @@ -26,7 +26,6 @@ #include #include #include -#include /* I don't know where this number comes from, I admit that freely. A wonderful human named Raine M. Ekman used it in a program that played @@ -84,52 +83,21 @@ typedef struct beep_parms_t { so that beep can be tucked appropriately into a text- processing pipe. */ - int verbose; /* verbose output? */ struct beep_parms_t *next; /* in case -n/--new is used. */ } beep_parms_t; -enum { BEEP_TYPE_CONSOLE, BEEP_TYPE_EVDEV }; - /* Momma taught me never to use globals, but we need something the signal handlers can get at.*/ int console_fd = -1; -int console_type = BEEP_TYPE_CONSOLE; -char *console_device = NULL; - - -void do_beep(int freq) { - if (console_type == BEEP_TYPE_CONSOLE) { - if(ioctl(console_fd, KIOCSOUND, freq != 0 - ? (int)(CLOCK_TICK_RATE/freq) - : freq) < 0) { - printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ - perror("ioctl"); - } - } else { - /* BEEP_TYPE_EVDEV */ - struct input_event e; - - e.type = EV_SND; - e.code = SND_TONE; - e.value = freq; - - write(console_fd, &e, sizeof(struct input_event)); - } -} - /* If we get interrupted, it would be nice to not leave the speaker beeping in perpetuity. */ void handle_signal(int signum) { - - if(console_device) - free(console_device); - switch(signum) { case SIGINT: if(console_fd >= 0) { /* Kill the sound, quit gracefully */ - do_beep(0); + ioctl(console_fd, KIOCSOUND, 0); close(console_fd); exit(signum); } else { @@ -142,7 +110,7 @@ void handle_signal(int signum) { /* print usage and exit */ void usage_bail(const char *executable_name) { printf("Usage:\n%s [-f freq] [-l length] [-r reps] [-d delay] " - "[-D delay] [-s] [-c] [-e device]\n", + "[-D delay] [-s] [-c]\n", executable_name); printf("%s [Options...] [-n] [--new] [Options...] ... \n", executable_name); printf("%s [-h] [--help]\n", executable_name); @@ -163,7 +131,6 @@ void usage_bail(const char *executable_name) { * "-D " (similar to -d, but delay after last repetition as well) * "-s" (beep after each line of input from stdin, echo line to stdout) * "-c" (beep after each char of input from stdin, echo char to stdout) - * "--verbose/--debug" * "-h/--help" * "-v/-V/--version" * "-n/--new" @@ -174,14 +141,11 @@ void usage_bail(const char *executable_name) { void parse_command_line(int argc, char **argv, beep_parms_t *result) { int c; - struct option opt_list[7] = {{"help", 0, NULL, 'h'}, + struct option opt_list[4] = {{"help", 0, NULL, 'h'}, {"version", 0, NULL, 'V'}, {"new", 0, NULL, 'n'}, - {"verbose", 0, NULL, 'X'}, - {"debug", 0, NULL, 'X'}, - {"device", 1, NULL, 'e'}, {0,0,0,0}}; - while((c = getopt_long(argc, argv, "f:l:r:d:D:schvVne:", opt_list, NULL)) + while((c = getopt_long(argc, argv, "f:l:r:d:D:schvVn", opt_list, NULL)) != EOF) { int argval = -1; /* handle parsed numbers for various arguments */ float argfreq = -1; @@ -191,9 +155,6 @@ void parse_command_line(int argc, char **argv, beep_parms_t *result) { (argfreq <= 0)) usage_bail(argv[0]); else - if (result->freq != 0) - fprintf(stderr, "WARNING: multiple -f values given, only last " - "one is used.\n"); result->freq = argfreq; break; case 'l' : /* length */ @@ -236,68 +197,43 @@ void parse_command_line(int argc, char **argv, beep_parms_t *result) { exit(0); break; case 'n' : /* also --new - create another beep */ - if (result->freq == 0) - result->freq = DEFAULT_FREQ; result->next = (beep_parms_t *)malloc(sizeof(beep_parms_t)); - result->next->freq = 0; + result->next->freq = DEFAULT_FREQ; result->next->length = DEFAULT_LENGTH; result->next->reps = DEFAULT_REPS; result->next->delay = DEFAULT_DELAY; result->next->end_delay = DEFAULT_END_DELAY; result->next->stdin_beep = DEFAULT_STDIN_BEEP; - result->next->verbose = result->verbose; result->next->next = NULL; result = result->next; /* yes, I meant to do that. */ break; - case 'X' : /* --debug / --verbose */ - result->verbose = 1; - break; - case 'e' : /* also --device */ - console_device = strdup(optarg); - break; case 'h' : /* notice that this is also --help */ default : usage_bail(argv[0]); } } - if (result->freq == 0) - result->freq = DEFAULT_FREQ; } void play_beep(beep_parms_t parms) { int i; /* loop counter */ - if(parms.verbose == 1) - fprintf(stderr, "[DEBUG] %d times %d ms beeps (%d delay between, " - "%d delay after) @ %.2f Hz\n", - parms.reps, parms.length, parms.delay, parms.end_delay, parms.freq); - /* try to snag the console */ - if(console_device) - console_fd = open(console_device, O_WRONLY); - else - 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", - console_device != NULL ? console_device : "/dev/tty0 or /dev/vc/0"); + if((console_fd = open("/dev/console", O_WRONLY)) == -1) { + fprintf(stderr, "Could not open /dev/console for writing.\n"); printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ perror("open"); exit(1); } - - if (ioctl(console_fd, EVIOCGSND(0)) != -1) - console_type = BEEP_TYPE_EVDEV; - else - console_type = BEEP_TYPE_CONSOLE; /* Beep */ for (i = 0; i < parms.reps; i++) { /* start beep */ - do_beep(parms.freq); + if(ioctl(console_fd, KIOCSOUND, (int)(CLOCK_TICK_RATE/parms.freq)) < 0) { + printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ + perror("ioctl"); + } /* Look ma, I'm not ansi C compatible! */ usleep(1000*parms.length); /* wait... */ - do_beep(0); + ioctl(console_fd, KIOCSOUND, 0); /* stop beep */ if(parms.end_delay || (i+1 < parms.reps)) usleep(1000*parms.delay); /* wait... */ } /* repeat. */ @@ -311,13 +247,12 @@ int main(int argc, char **argv) { char sin[4096], *ptr; beep_parms_t *parms = (beep_parms_t *)malloc(sizeof(beep_parms_t)); - parms->freq = 0; + parms->freq = DEFAULT_FREQ; parms->length = DEFAULT_LENGTH; parms->reps = DEFAULT_REPS; parms->delay = DEFAULT_DELAY; parms->end_delay = DEFAULT_END_DELAY; parms->stdin_beep = DEFAULT_STDIN_BEEP; - parms->verbose = 0; parms->next = NULL; signal(SIGINT, handle_signal); @@ -360,8 +295,5 @@ int main(int argc, char **argv) { parms = next; } - if(console_device) - free(console_device); - return EXIT_SUCCESS; } diff --git a/debian/changelog b/debian/changelog index ebe6cd6..1a1e84c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +beep (1.2.2-20) unstable; urgency=low + + * Added Homepage: control field. + * Moved patches to quilt, split them into: + - makefile-fixup: don't try to remove something outside the build place + - verbose-option: enable --verbose/--debug for getting info on what's + getting done + - multiple-freq: produce a warning on multiple frequency parameters + - serial-console-fix: use /dev/tty0 instead of /dev/console + - devfs-fix: try /dev/vc/0 too + - event-option: enable --event switch for specifying a special device + * Updated copyright file with the actual header from the code. + + -- Gerfried Fuchs Wed, 03 Oct 2007 19:46:07 +0200 + beep (1.2.2-19) unstable; urgency=low * Translation update: Japanese (Hideki Yamane, closes: #392171) diff --git a/debian/control b/debian/control index c7f0ba8..694a7ff 100644 --- a/debian/control +++ b/debian/control @@ -1,9 +1,10 @@ Source: beep Section: sound Priority: optional -Maintainer: Gerfried Fuchs -Build-Depends: po-debconf, patch +Maintainer: Gerfried Fuchs +Build-Depends: po-debconf, patch, quilt Standards-Version: 3.7.2 +Homepage: http://johnath.com/beep/ Package: beep Architecture: any diff --git a/debian/copyright b/debian/copyright index 407c4d1..c51ed8b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -This package was debianized by Gerfried Fuchs on +This package was debianized by Gerfried Fuchs on Thu, 18 Oct 2001 09:26:50 +0200. It was downloaded from http://www.johnath.com/beep/ @@ -9,14 +9,15 @@ Copyright: ========== This software is copyright (C) 2000 by Johnathan Nightingale. - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 dated June, 1991. + This code may distributed only under the terms of the GNU Public + License which can be found at http://www.gnu.org/copyleft or in + the file COPYING supplied with this code. - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + This code is not distributed with warranties of any kind, including + implied warranties of merchantability or fitness for a particular use + or ability to breed pandas in captivity, it just can't be done. On Debian GNU/Linux systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL'. +Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'. +Later versions which the GNU project publishes on the above mentioned URL can +be found in the same directory. diff --git a/debian/patches/01_makefile-fixup b/debian/patches/01_makefile-fixup new file mode 100644 index 0000000..76e67ee --- /dev/null +++ b/debian/patches/01_makefile-fixup @@ -0,0 +1,11 @@ +Index: beep-1.2.2/Makefile +=================================================================== +--- beep-1.2.2.orig/Makefile ++++ beep-1.2.2/Makefile +@@ -15,5 +15,5 @@ beep : beep.c + + install : + cp ${EXEC_NAME} ${INSTALL_DIR} +- rm -f /usr/man/man1/beep.1.bz2 ++ # rm -f /usr/man/man1/beep.1.bz2 + cp ${MAN_FILE} ${MAN_DIR} diff --git a/debian/patches/02_verbose-option b/debian/patches/02_verbose-option new file mode 100644 index 0000000..7a3cb89 --- /dev/null +++ b/debian/patches/02_verbose-option @@ -0,0 +1,76 @@ +Index: beep-1.2.2/beep.c +=================================================================== +--- beep-1.2.2.orig/beep.c ++++ beep-1.2.2/beep.c +@@ -83,6 +83,7 @@ typedef struct beep_parms_t { + so that beep can be tucked appropriately into a text- + processing pipe. + */ ++ int verbose; /* verbose output? */ + struct beep_parms_t *next; /* in case -n/--new is used. */ + } beep_parms_t; + +@@ -110,7 +111,7 @@ void handle_signal(int signum) { + /* print usage and exit */ + void usage_bail(const char *executable_name) { + printf("Usage:\n%s [-f freq] [-l length] [-r reps] [-d delay] " +- "[-D delay] [-s] [-c]\n", ++ "[-D delay] [-s] [-c] [--verbose | --debug]\n", + executable_name); + printf("%s [Options...] [-n] [--new] [Options...] ... \n", executable_name); + printf("%s [-h] [--help]\n", executable_name); +@@ -131,6 +132,7 @@ void usage_bail(const char *executable_n + * "-D " (similar to -d, but delay after last repetition as well) + * "-s" (beep after each line of input from stdin, echo line to stdout) + * "-c" (beep after each char of input from stdin, echo char to stdout) ++ * "--verbose/--debug" + * "-h/--help" + * "-v/-V/--version" + * "-n/--new" +@@ -141,9 +143,11 @@ void usage_bail(const char *executable_n + void parse_command_line(int argc, char **argv, beep_parms_t *result) { + int c; + +- struct option opt_list[4] = {{"help", 0, NULL, 'h'}, ++ struct option opt_list[6] = {{"help", 0, NULL, 'h'}, + {"version", 0, NULL, 'V'}, + {"new", 0, NULL, 'n'}, ++ {"verbose", 0, NULL, 'X'}, ++ {"debug", 0, NULL, 'X'}, + {0,0,0,0}}; + while((c = getopt_long(argc, argv, "f:l:r:d:D:schvVn", opt_list, NULL)) + != EOF) { +@@ -204,9 +208,13 @@ void parse_command_line(int argc, char * + result->next->delay = DEFAULT_DELAY; + result->next->end_delay = DEFAULT_END_DELAY; + result->next->stdin_beep = DEFAULT_STDIN_BEEP; ++ result->next->verbose = result->verbose; + result->next->next = NULL; + result = result->next; /* yes, I meant to do that. */ + break; ++ case 'X' : /* --debug / --verbose */ ++ result->verbose = 1; ++ break; + case 'h' : /* notice that this is also --help */ + default : + usage_bail(argv[0]); +@@ -217,6 +225,11 @@ void parse_command_line(int argc, char * + void play_beep(beep_parms_t parms) { + int i; /* loop counter */ + ++ if(parms.verbose == 1) ++ fprintf(stderr, "[DEBUG] %d times %d ms beeps (%d delay between, " ++ "%d delay after) @ %.2f Hz\n", ++ parms.reps, parms.length, parms.delay, parms.end_delay, parms.freq); ++ + /* try to snag the console */ + if((console_fd = open("/dev/console", O_WRONLY)) == -1) { + fprintf(stderr, "Could not open /dev/console for writing.\n"); +@@ -253,6 +266,7 @@ int main(int argc, char **argv) { + parms->delay = DEFAULT_DELAY; + parms->end_delay = DEFAULT_END_DELAY; + parms->stdin_beep = DEFAULT_STDIN_BEEP; ++ parms->verbose = 0; + parms->next = NULL; + + signal(SIGINT, handle_signal); diff --git a/debian/patches/03_multiple-freq b/debian/patches/03_multiple-freq new file mode 100644 index 0000000..2be1dc0 --- /dev/null +++ b/debian/patches/03_multiple-freq @@ -0,0 +1,44 @@ +Index: beep-1.2.2/beep.c +=================================================================== +--- beep-1.2.2.orig/beep.c ++++ beep-1.2.2/beep.c +@@ -159,6 +159,9 @@ void parse_command_line(int argc, char * + (argfreq <= 0)) + usage_bail(argv[0]); + else ++ if (result->freq != 0) ++ fprintf(stderr, "WARNING: multiple -f values given, only last " ++ "one is used.\n"); + result->freq = argfreq; + break; + case 'l' : /* length */ +@@ -201,8 +204,10 @@ void parse_command_line(int argc, char * + exit(0); + break; + case 'n' : /* also --new - create another beep */ ++ if (result->freq == 0) ++ result->freq = DEFAULT_FREQ; + result->next = (beep_parms_t *)malloc(sizeof(beep_parms_t)); +- result->next->freq = DEFAULT_FREQ; ++ result->next->freq = 0; + result->next->length = DEFAULT_LENGTH; + result->next->reps = DEFAULT_REPS; + result->next->delay = DEFAULT_DELAY; +@@ -220,6 +225,8 @@ void parse_command_line(int argc, char * + usage_bail(argv[0]); + } + } ++ if (result->freq == 0) ++ result->freq = DEFAULT_FREQ; + } + + void play_beep(beep_parms_t parms) { +@@ -260,7 +267,7 @@ int main(int argc, char **argv) { + char sin[4096], *ptr; + + beep_parms_t *parms = (beep_parms_t *)malloc(sizeof(beep_parms_t)); +- parms->freq = DEFAULT_FREQ; ++ parms->freq = 0; + parms->length = DEFAULT_LENGTH; + parms->reps = DEFAULT_REPS; + parms->delay = DEFAULT_DELAY; diff --git a/debian/patches/04_serial-console-fix b/debian/patches/04_serial-console-fix new file mode 100644 index 0000000..f07856b --- /dev/null +++ b/debian/patches/04_serial-console-fix @@ -0,0 +1,15 @@ +Index: beep-1.2.2/beep.c +=================================================================== +--- beep-1.2.2.orig/beep.c ++++ beep-1.2.2/beep.c +@@ -238,8 +238,8 @@ void play_beep(beep_parms_t parms) { + parms.reps, parms.length, parms.delay, parms.end_delay, parms.freq); + + /* try to snag the console */ +- if((console_fd = open("/dev/console", O_WRONLY)) == -1) { +- fprintf(stderr, "Could not open /dev/console for writing.\n"); ++ if((console_fd = open("/dev/tty0", O_WRONLY)) == -1) { ++ fprintf(stderr, "Could not open /dev/tty0 for writing.\n"); + printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ + perror("open"); + exit(1); diff --git a/debian/patches/05_devfs-fix b/debian/patches/05_devfs-fix new file mode 100644 index 0000000..e82858a --- /dev/null +++ b/debian/patches/05_devfs-fix @@ -0,0 +1,21 @@ +Index: beep-1.2.2/beep.c +=================================================================== +--- beep-1.2.2.orig/beep.c ++++ beep-1.2.2/beep.c +@@ -239,10 +239,12 @@ void play_beep(beep_parms_t parms) { + + /* try to snag the console */ + if((console_fd = open("/dev/tty0", O_WRONLY)) == -1) { +- fprintf(stderr, "Could not open /dev/tty0 for writing.\n"); +- printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ +- perror("open"); +- exit(1); ++ if((console_fd = open("/dev/vc/0", O_WRONLY)) == -1) { ++ fprintf(stderr, "Could not open /dev/tty0 or /dev/vc/0 for writing.\n"); ++ printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ ++ perror("open"); ++ exit(1); ++ } + } + + /* Beep */ diff --git a/debian/patches/06_event-option b/debian/patches/06_event-option new file mode 100644 index 0000000..e96c093 --- /dev/null +++ b/debian/patches/06_event-option @@ -0,0 +1,151 @@ +Index: beep-1.2.2/beep.c +=================================================================== +--- beep-1.2.2.orig/beep.c ++++ beep-1.2.2/beep.c +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + + /* I don't know where this number comes from, I admit that freely. A + wonderful human named Raine M. Ekman used it in a program that played +@@ -87,18 +88,48 @@ typedef struct beep_parms_t { + struct beep_parms_t *next; /* in case -n/--new is used. */ + } beep_parms_t; + ++enum { BEEP_TYPE_CONSOLE, BEEP_TYPE_EVDEV }; ++ + /* Momma taught me never to use globals, but we need something the signal + handlers can get at.*/ + int console_fd = -1; ++int console_type = BEEP_TYPE_CONSOLE; ++char *console_device = NULL; ++ ++ ++void do_beep(int freq) { ++ if (console_type == BEEP_TYPE_CONSOLE) { ++ if(ioctl(console_fd, KIOCSOUND, freq != 0 ++ ? (int)(CLOCK_TICK_RATE/freq) ++ : freq) < 0) { ++ printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ ++ perror("ioctl"); ++ } ++ } else { ++ /* BEEP_TYPE_EVDEV */ ++ struct input_event e; ++ ++ e.type = EV_SND; ++ e.code = SND_TONE; ++ e.value = freq; ++ ++ write(console_fd, &e, sizeof(struct input_event)); ++ } ++} ++ + + /* If we get interrupted, it would be nice to not leave the speaker beeping in + perpetuity. */ + void handle_signal(int signum) { ++ ++ if(console_device) ++ free(console_device); ++ + switch(signum) { + case SIGINT: + if(console_fd >= 0) { + /* Kill the sound, quit gracefully */ +- ioctl(console_fd, KIOCSOUND, 0); ++ do_beep(0); + close(console_fd); + exit(signum); + } else { +@@ -111,7 +142,7 @@ void handle_signal(int signum) { + /* print usage and exit */ + void usage_bail(const char *executable_name) { + printf("Usage:\n%s [-f freq] [-l length] [-r reps] [-d delay] " +- "[-D delay] [-s] [-c] [--verbose | --debug]\n", ++ "[-D delay] [-s] [-c] [--verbose | --debug] [-e device]\n", + executable_name); + printf("%s [Options...] [-n] [--new] [Options...] ... \n", executable_name); + printf("%s [-h] [--help]\n", executable_name); +@@ -143,13 +174,14 @@ void usage_bail(const char *executable_n + void parse_command_line(int argc, char **argv, beep_parms_t *result) { + int c; + +- struct option opt_list[6] = {{"help", 0, NULL, 'h'}, ++ struct option opt_list[7] = {{"help", 0, NULL, 'h'}, + {"version", 0, NULL, 'V'}, + {"new", 0, NULL, 'n'}, + {"verbose", 0, NULL, 'X'}, + {"debug", 0, NULL, 'X'}, ++ {"device", 1, NULL, 'e'}, + {0,0,0,0}}; +- while((c = getopt_long(argc, argv, "f:l:r:d:D:schvVn", opt_list, NULL)) ++ while((c = getopt_long(argc, argv, "f:l:r:d:D:schvVne:", opt_list, NULL)) + != EOF) { + int argval = -1; /* handle parsed numbers for various arguments */ + float argfreq = -1; +@@ -220,6 +252,9 @@ void parse_command_line(int argc, char * + case 'X' : /* --debug / --verbose */ + result->verbose = 1; + break; ++ case 'e' : /* also --device */ ++ console_device = strdup(optarg); ++ break; + case 'h' : /* notice that this is also --help */ + default : + usage_bail(argv[0]); +@@ -238,24 +273,31 @@ void play_beep(beep_parms_t parms) { + parms.reps, parms.length, parms.delay, parms.end_delay, parms.freq); + + /* try to snag the console */ +- if((console_fd = open("/dev/tty0", O_WRONLY)) == -1) { +- if((console_fd = open("/dev/vc/0", O_WRONLY)) == -1) { +- fprintf(stderr, "Could not open /dev/tty0 or /dev/vc/0 for writing.\n"); +- printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ +- perror("open"); +- exit(1); +- } ++ if(console_device) ++ console_fd = open(console_device, O_WRONLY); ++ else ++ 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", ++ console_device != NULL ? console_device : "/dev/tty0 or /dev/vc/0"); ++ printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ ++ perror("open"); ++ exit(1); + } ++ ++ if (ioctl(console_fd, EVIOCGSND(0)) != -1) ++ console_type = BEEP_TYPE_EVDEV; ++ else ++ console_type = BEEP_TYPE_CONSOLE; + + /* Beep */ + for (i = 0; i < parms.reps; i++) { /* start beep */ +- if(ioctl(console_fd, KIOCSOUND, (int)(CLOCK_TICK_RATE/parms.freq)) < 0) { +- printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ +- perror("ioctl"); +- } ++ do_beep(parms.freq); + /* Look ma, I'm not ansi C compatible! */ + usleep(1000*parms.length); /* wait... */ +- ioctl(console_fd, KIOCSOUND, 0); /* stop beep */ ++ do_beep(0); /* stop beep */ + if(parms.end_delay || (i+1 < parms.reps)) + usleep(1000*parms.delay); /* wait... */ + } /* repeat. */ +@@ -318,5 +360,8 @@ int main(int argc, char **argv) { + parms = next; + } + ++ if(console_device) ++ free(console_device); ++ + return EXIT_SUCCESS; + } diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..d9cc348 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,6 @@ +01_makefile-fixup +02_verbose-option +03_multiple-freq +04_serial-console-fix +05_devfs-fix +06_event-option diff --git a/debian/po/ca.po b/debian/po/ca.po index 8f938bc..0352823 100644 --- a/debian/po/ca.po +++ b/debian/po/ca.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: ca\n" -"Report-Msgid-Bugs-To: alfie@debian.org\n" +"Report-Msgid-Bugs-To: beep@packages.debian.org\n" "POT-Creation-Date: 2007-02-20 23:46+0100\n" "PO-Revision-Date: 2006-06-21 08:40-0500\n" "Last-Translator: Miguel Gea Milvaques \n" diff --git a/debian/po/cs.po b/debian/po/cs.po index 9168c9b..6db6b70 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: beep\n" -"Report-Msgid-Bugs-To: alfie@debian.org\n" +"Report-Msgid-Bugs-To: beep@packages.debian.org\n" "POT-Creation-Date: 2007-02-20 23:46+0100\n" "PO-Revision-Date: 2006-06-21 14:23+0200\n" "Last-Translator: Miroslav Kure \n" diff --git a/debian/po/de.po b/debian/po/de.po index e2303f1..eb05036 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: beep 1.2.2-18\n" -"Report-Msgid-Bugs-To: alfie@debian.org\n" +"Report-Msgid-Bugs-To: beep@packages.debian.org\n" "POT-Creation-Date: 2007-02-20 23:46+0100\n" "PO-Revision-Date: 2006-06-21 05:07-0500\n" "Last-Translator: Gerfried Fuchs \n" diff --git a/debian/po/es.po b/debian/po/es.po index 9f84654..97f1182 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -28,7 +28,7 @@ msgid "" msgstr "" "Project-Id-Version: beep\n" -"Report-Msgid-Bugs-To: alfie@debian.org\n" +"Report-Msgid-Bugs-To: beep@packages.debian.org\n" "POT-Creation-Date: 2007-02-20 23:46+0100\n" "PO-Revision-Date: 2006-06-28 02:06-0500\n" "Last-Translator: David Martínez Moreno \n" diff --git a/debian/po/fr.po b/debian/po/fr.po index 35fca39..7598bf5 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: beep 1.2.2-10\n" -"Report-Msgid-Bugs-To: alfie@debian.org\n" +"Report-Msgid-Bugs-To: beep@packages.debian.org\n" "POT-Creation-Date: 2007-02-20 23:46+0100\n" "PO-Revision-Date: 2006-06-28 02:06-0500\n" "Last-Translator: Daniel Dchelotte \n" diff --git a/debian/po/it.po b/debian/po/it.po index 9fcb1e4..09ee8ff 100644 --- a/debian/po/it.po +++ b/debian/po/it.po @@ -1,9 +1,9 @@ msgid "" msgstr "" "Project-Id-Version: beep 1.2.2-12\n" -"Report-Msgid-Bugs-To: alfie@debian.org\n" +"Report-Msgid-Bugs-To: beep@packages.debian.org\n" "POT-Creation-Date: 2007-02-20 23:46+0100\n" -"PO-Revision-Date: 2005-10-15 12:08+0100\n" +"PO-Revision-Date: 2007-10-03 19:01+0200\n" "Last-Translator: Stefano Melchior \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" @@ -54,6 +54,3 @@ msgstr "" "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 2fd31da..1f8ceae 100644 --- a/debian/po/ja.po +++ b/debian/po/ja.po @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: beep 1.2.2-18\n" -"Report-Msgid-Bugs-To: alfie@debian.org\n" +"Report-Msgid-Bugs-To: beep@packages.debian.org\n" "POT-Creation-Date: 2007-02-20 23:46+0100\n" -"PO-Revision-Date: 2006-10-11 00:08+0900\n" +"PO-Revision-Date: 2007-10-03 19:01+0200\n" "Last-Translator: Hideki Yamane (Debian-JP) \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" @@ -67,6 +67,3 @@ msgstr "" "ではこの方法は採りません。しかしながら、このプログラムは非常に小さいので (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 c154270..3516bfd 100644 --- a/debian/po/nl.po +++ b/debian/po/nl.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: beep 1.2.2-11\n" -"Report-Msgid-Bugs-To: alfie@debian.org\n" +"Report-Msgid-Bugs-To: beep@packages.debian.org\n" "POT-Creation-Date: 2007-02-20 23:46+0100\n" -"PO-Revision-Date: 2003-09-07 20:58+0100\n" +"PO-Revision-Date: 2007-10-03 19:02+0200\n" "Last-Translator: Tim Vandermeersch \n" "Language-Team: dutch \n" "MIME-Version: 1.0\n" @@ -66,7 +66,3 @@ 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 verifiren, 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 a72aac8..932375c 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: beep 1.2.2-16\n" -"Report-Msgid-Bugs-To: alfie@debian.org\n" +"Report-Msgid-Bugs-To: beep@packages.debian.org\n" "POT-Creation-Date: 2007-02-20 23:46+0100\n" "PO-Revision-Date: 2006-06-28 02:07-0500\n" "Last-Translator: Miguel Figueiredo \n" diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po index 382b928..c81eda9 100644 --- a/debian/po/pt_BR.po +++ b/debian/po/pt_BR.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: beep-1.2.2-10\n" -"Report-Msgid-Bugs-To: alfie@debian.org\n" +"Report-Msgid-Bugs-To: beep@packages.debian.org\n" "POT-Creation-Date: 2007-02-20 23:46+0100\n" "PO-Revision-Date: 2006-06-28 02:06-0500\n" "Last-Translator: Felipe Augusto van de Wiel (faw) \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -66,7 +66,3 @@ 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 96e1b37..3b11aa7 100644 --- a/debian/po/sv.po +++ b/debian/po/sv.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: beep\n" -"Report-Msgid-Bugs-To: alfie@debian.org\n" +"Report-Msgid-Bugs-To: beep@packages.debian.org\n" "POT-Creation-Date: 2007-02-20 23:46+0100\n" "PO-Revision-Date: 2006-06-21 12:49-0500\n" "Last-Translator: Daniel Nylander \n" diff --git a/debian/po/templates.pot b/debian/po/templates.pot index 9869bc1..46954c7 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -1,13 +1,13 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# This file is distributed under the same license as the beep package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: alfie@debian.org\n" +"Project-Id-Version: beep 1.2.2-18\n" +"Report-Msgid-Bugs-To: beep@packages.debian.org\n" "POT-Creation-Date: 2007-02-20 23:46+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" diff --git a/debian/po/vi.po b/debian/po/vi.po index b6ab358..d3e544b 100644 --- a/debian/po/vi.po +++ b/debian/po/vi.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: beep 1.2.2-18\n" -"Report-Msgid-Bugs-To: alfie@debian.org\n" +"Report-Msgid-Bugs-To: beep@packages.debian.org\n" "POT-Creation-Date: 2007-02-20 23:46+0100\n" "PO-Revision-Date: 2006-06-23 03:49-0500\n" "Last-Translator: Clytie Siddall \n" diff --git a/debian/rules b/debian/rules index 56cae22..ba09d0a 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,7 @@ #!/usr/bin/make -f # debian/rules file for beep +# copyright 2002++ by Gerfried Fuchs +# Licenced the same way as beep itself PKG1 = beep TMP1 = $(CURDIR)/debian/$(PKG1) @@ -26,7 +28,9 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) endif -clean: +include /usr/share/quilt/quilt.make + +clean: unpatch $(checkdir) $(checkroot) -rm -rf $(TMP1) $(TMP2) debian/substvars debian/files build-stamp @@ -34,7 +38,7 @@ clean: build: build-stamp -build-stamp: +build-stamp: patch $(checkdir) $(MAKE) FLAGS="$(FLAGS)" touch build-stamp From 9e8d18de54fb7e483d6a041c40b781e34fa630ca Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Thu, 10 Jul 2008 15:14:18 +0200 Subject: [PATCH 09/48] Imported Debian patch 1.2.2-21 --- debian/README.source | 2 ++ debian/changelog | 10 ++++++++ debian/control | 2 +- debian/po/gl.po | 59 ++++++++++++++++++++++++++++++++++++++++++++ debian/rules | 6 ++++- 5 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 debian/README.source create mode 100644 debian/po/gl.po diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..3556bbc --- /dev/null +++ b/debian/README.source @@ -0,0 +1,2 @@ +This package uses quilt for its patch management, see +/usr/share/doc/quilt/README.source if you are unfamiliar with it. diff --git a/debian/changelog b/debian/changelog index 1a1e84c..efa5c68 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +beep (1.2.2-21) unstable; urgency=low + + * Don't ignore make clean errors anymore. + * New debconf translation: Galician by Jacobo Tarrio (closes: #481751) + * Updated to Standards-Version to 3.8.0, add README.source file (referencing + quilt's). + * Also strip sections .comment and .note (closes: #490163) + + -- Gerfried Fuchs Thu, 10 Jul 2008 15:14:18 +0200 + beep (1.2.2-20) unstable; urgency=low * Added Homepage: control field. diff --git a/debian/control b/debian/control index 694a7ff..a4c5428 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: sound Priority: optional Maintainer: Gerfried Fuchs Build-Depends: po-debconf, patch, quilt -Standards-Version: 3.7.2 +Standards-Version: 3.8.0 Homepage: http://johnath.com/beep/ Package: beep diff --git a/debian/po/gl.po b/debian/po/gl.po new file mode 100644 index 0000000..72b99e9 --- /dev/null +++ b/debian/po/gl.po @@ -0,0 +1,59 @@ +# Galician translation of beep's debconf templates +# This file is distributed under the same license as the beep package. +# Jacobo Tarrio , 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: beep\n" +"Report-Msgid-Bugs-To: beep@packages.debian.org\n" +"POT-Creation-Date: 2007-02-20 23:46+0100\n" +"PO-Revision-Date: 2008-05-18 12:37+0100\n" +"Last-Translator: Jacobo Tarrio \n" +"Language-Team: Galician \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "" +"suid root for all, suid root with only group audio executable, not suid at " +"all" +msgstr "" +"suid root para todos, suid root só executable para o grupo audio, non suid " +"en absoluto" + +#. Type: select +#. Description +#: ../templates:1002 +msgid "Install beep as:" +msgstr "Instalar beep coma:" + +#. Type: select +#. Description +#: ../templates:1002 +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 "" +"Débese executar \"beep\" coma administrador, xa que precisa de acceder ao " +"hardware do altoparlante. Hai varias posibilidade para facer o programa " +"utilizable: só para o administrador (sen bit suid en absoluto), executable " +"só polos usuarios do grupo \"audio\", ou utilizable por todos." + +#. Type: select +#. Description +#: ../templates:1002 +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 "" +"Xa que os programas \"suid root\" poden ser riscos de seguridade, isto non " +"se fai por defecto. Nembargantes, o programa é bastante pequeno (unhas 150 " +"liñas de código), así que é bastante doado verificar vostede mesmo a " +"seguridade do código, se non confía no xuízo do mantedor do paquete." diff --git a/debian/rules b/debian/rules index ba09d0a..b21dd92 100755 --- a/debian/rules +++ b/debian/rules @@ -25,6 +25,7 @@ else endif ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) INSTALL_PROGRAM += -s + STRIP = true endif @@ -34,7 +35,7 @@ clean: unpatch $(checkdir) $(checkroot) -rm -rf $(TMP1) $(TMP2) debian/substvars debian/files build-stamp - -$(MAKE) clean + [ ! -f beep ] || $(MAKE) clean build: build-stamp @@ -63,6 +64,9 @@ install: build cd $(TMP1)/usr/share/doc/$(PKG1) && gzip -9 changelog README $(INSTALL_DIR) $(TMP2)/usr/bin $(INSTALL_PROGRAM) beep $(TMP2)/usr/bin + test "$(STRIP)" != true || strip \ + --remove-section=.comment --remove-section=.note \ + $(TMP1)/usr/bin/beep $(TMP2)/usr/bin/beep # Build architecture-independent files here. From f438efb3ce3b64df78ea007fa2c321a49201e117 Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Tue, 12 Aug 2008 12:00:46 -0300 Subject: [PATCH 10/48] Imported Debian patch 1.2.2-22 --- debian/beep.1.diff | 56 ++++++++++++++++++++++++++++------ debian/changelog | 28 +++++++++++++++++ debian/overrides | 1 - debian/po/ca.po | 29 +++++++++++++----- debian/po/cs.po | 17 +++++------ debian/po/de.po | 33 ++++++++++----------- debian/po/es.po | 35 +++++++++++++++------- debian/po/eu.po | 58 ++++++++++++++++++++++++++++++++++++ debian/po/fi.po | 37 +++++++++++++++++++++++ debian/po/fr.po | 42 ++++++++++++-------------- debian/po/gl.po | 18 +++++------ debian/po/it.po | 31 ++++++++++++++----- debian/po/ja.po | 50 +++++++++++++++---------------- debian/po/nl.po | 37 +++++++++++------------ debian/po/pt.po | 20 ++++++------- debian/po/pt_BR.po | 33 +++++++++------------ debian/po/ro.po | 66 +++++++++++++++++++++++++++++++++++++++++ debian/po/ru.po | 48 ++++++++++++++++-------------- debian/po/sv.po | 21 +++++++------ debian/po/templates.pot | 14 ++++----- debian/po/vi.po | 34 ++++++++++++++------- debian/postinst | 27 +++++++++++++---- debian/rules | 7 ++--- debian/templates | 6 ++-- 24 files changed, 511 insertions(+), 237 deletions(-) delete mode 100644 debian/overrides create mode 100644 debian/po/eu.po create mode 100644 debian/po/fi.po create mode 100644 debian/po/ro.po diff --git a/debian/beep.1.diff b/debian/beep.1.diff index c22b284..8c3d857 100644 --- a/debian/beep.1.diff +++ b/debian/beep.1.diff @@ -1,8 +1,8 @@ ---- beep.1.orig 2006-02-14 00:21:35.000000000 +0100 -+++ beep.1 2006-02-14 00:25:37.000000000 +0100 -@@ -1,9 +1,9 @@ +--- beep.1.orig 2008-07-28 19:20:08.000000000 +0200 ++++ beep.1 2008-07-28 19:25:05.000000000 +0200 +@@ -1,12 +1,12 @@ -.TH BEEP 1 "March 2002" -+.TH BEEP 1 "November 2006" ++.TH BEEP 1 "July 2008" .SH NAME beep \- beep the pc speaker any number of ways .SH SYNOPSIS @@ -11,7 +11,11 @@ +[\-\-verbose | \-\-debug] [\-e device | \-\-device device] [\-f N] [\-l N] [\-r N] [\-d N] [\-D N] [\-s] [\-c] .HP .B beep - [ OPTIONS ] [-n] [--new] [ OPTIONS ] +-[ OPTIONS ] [-n] [--new] [ OPTIONS ] ++[ OPTIONS ] [\-n] [\-\-new] [ OPTIONS ] + .HP + .B beep + [\-h] [\-\-help] @@ -20,6 +20,15 @@ All options have default values, meaning that just typing '\fBbeep\fR' will work. If an option is specified more than once on the command line, subsequent options override their predecessors. So '\fBbeep\fR \-f 200 \-f 300' will beep at 300Hz. .SH OPTIONS @@ -28,14 +32,48 @@ \fB\-f\fR N beep at N Hz, where 0 < N < 20000. As a general ballpark, the regular terminal beep is around 750Hz. N is not, incidentally, restricted to whole numbers. .TP -@@ -59,7 +68,9 @@ +@@ -35,12 +44,12 @@ + \fB\-n\fR, \fB\-\-new\fR + this option allows you to break the command line up into specifying multiple beeps. Each time this option is used, beep starts treating all further arguments as though they were for a new beep. So for example: + +-\fBbeep\fR -f 1000 -n -f 2000 -n -f 1500 ++\fBbeep\fR \-f 1000 \-n \-f 2000 \-n \-f 1500 + +-would produce a sequence of three beeps, the first with a frequency of 1000Hz (and otherwise default values), then a second beep with a frequency of 2000Hz (again, with things like delay and reps being set to their defaults), then a third beep, at 1500Hz. This is different from specifying a -r value, since -r repeats the same beep multiple times, whereas -n allows you to specify different beeps. After a -n, the new beep is created with all the default values, and any of these can be specified without altering values for preceeding (or later) beeps. See the \fBEXAMPLES\fR section if this managed to confuse you. ++would produce a sequence of three beeps, the first with a frequency of 1000Hz (and otherwise default values), then a second beep with a frequency of 2000Hz (again, with things like delay and reps being set to their defaults), then a third beep, at 1500Hz. This is different from specifying a \-r value, since \-r repeats the same beep multiple times, whereas \-n allows you to specify different beeps. After a \-n, the new beep is created with all the default values, and any of these can be specified without altering values for preceeding (or later) beeps. See the \fBEXAMPLES\fR section if this managed to confuse you. + .TP + \fB\-s\fR, \fB\-c\fR +-these options put \fBbeep\fR into input-processing mode. -s tells \fBbeep\fR to read from stdin, and beep after each newline, and -c tells it to do so after every character. In both cases, the program will also echo the input back out to stdout, which makes it easy to slip \fBbeep\fR into a text-processing pipeline, see the \fBEXAMPLES\fR section. ++these options put \fBbeep\fR into input-processing mode. \-s tells \fBbeep\fR to read from stdin, and beep after each newline, and \-c tells it to do so after every character. In both cases, the program will also echo the input back out to stdout, which makes it easy to slip \fBbeep\fR into a text-processing pipeline, see the \fBEXAMPLES\fR section. + .TP + \fB\-h\fR, \fB\-\-help\fR + display usage info and exit +@@ -55,20 +64,22 @@ + .TP + A more interesting standalone setup + +-\fBbeep\fR -f 300.7 -r 2 -d 100 -l 400 ++\fBbeep\fR \-f 300.7 \-r 2 \-d 100 \-l 400 .TP As part of a log-watching pipeline -tail -f /var/log/xferlog | grep 'passwd' | \fBbeep\fR -f 1000 -r 5 -s -+tail -f /var/log/xferlog | grep --line-buffered 'passwd' | \\ ++tail \-f /var/log/xferlog | grep \-\-line\-buffered passwd | \\ +.br -+\fBbeep\fR -f 1000 -r 5 -s ++\fBbeep\fR \-f 1000 \-r 5 \-s + .TP +-When using -c mode, I recommend using a short -D, and a shorter -l, so that the beeps don't blur together. Something like this will get you a cheesy 1970's style beep-as-you-type-each-letter effect ++When using \-c mode, I recommend using a short \-D, and a shorter \-l, so that the beeps don't blur together. Something like this will get you a cheesy 1970's style beep-as-you-type-each-letter effect + +-cat file | \fBbeep\fR -c -f 400 -D 50 -l 10 ++cat file | \fBbeep\fR \-c \-f 400 \-D 50 \-l 10 + .TP - When using -c mode, I recommend using a short -D, and a shorter -l, so that the beeps don't blur together. Something like this will get you a cheesy 1970's style beep-as-you-type-each-letter effect +-A highly contrived example of -n/--new usage ++A highly contrived example of \-n/\-\-new usage + +-\fBbeep\fR -f 1000 -r 2 -n -r 5 -l 10 --new ++\fBbeep\fR \-f 1000 \-r 2 \-n \-r 5 \-l 10 \-\-new + will produce first two 1000Hz beeps, then 5 beeps at the default tone, but only 10ms long each, followed by a third beep using all the default settings (since none are specified). + .PP See also the \fBFREQUENCY TABLE\fR below. diff --git a/debian/changelog b/debian/changelog index efa5c68..c8d5add 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,31 @@ +beep (1.2.2-22) unstable; urgency=low + + * Remove Homepage control field from udeb. + * s/my/the package maintainer's/ in debian/templates, users have no concept + of "my" when they see the debconf question (removing overrides file). + * Updated templates file with more suggestion sent in by Esko Arajärvi, + thanks. + * Update debian/beep.1.diff to escape hyphens where they actually do mean + the minus sign. + * debian/po/vi.po: Removed the Language-Team as it bounces (or moderates, + can't read Vietnamese). + * New translation: + - Finish by Esko Arajärvi (closes: #492724, #493220) + - Romanian by Eddy Petrișor (closes: #493764) + - Euskara by Piarres Beobide (closes: #493842) + * Updated translations: + - Galician by Jacobo Tarrio (closes: #492792, #493305) + - Japanese by Hideki Yamane (closes: #492969, #493535) + - French by Daniel Déchelotte (closes: #493072, #494490) + - Swedish by Martin Bagge (closes: #493344) + - Portuguese by Miguel Figueiredo (closes: #493264) + - Russian by Yuri Kozlov (closes: #493280) + - Czech by Miroslav Kure (closes: #493596) + - Dutch by Thijs Kinkhorst (closes: #494093) + - Brazilian Portuguese by Felipe Augusto van de Wiel + + -- Gerfried Fuchs Tue, 12 Aug 2008 12:00:46 -0300 + beep (1.2.2-21) unstable; urgency=low * Don't ignore make clean errors anymore. diff --git a/debian/overrides b/debian/overrides deleted file mode 100644 index cff3c45..0000000 --- a/debian/overrides +++ /dev/null @@ -1 +0,0 @@ -beep: using-first-person-in-templates beep/suid_option diff --git a/debian/po/ca.po b/debian/po/ca.po index 0352823..f83ee37 100644 --- a/debian/po/ca.po +++ b/debian/po/ca.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: ca\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2007-02-20 23:46+0100\n" +"POT-Creation-Date: 2008-07-28 19:33+0200\n" "PO-Revision-Date: 2006-06-21 08:40-0500\n" "Last-Translator: Miguel Gea Milvaques \n" "Language-Team: catalan \n" @@ -28,11 +28,8 @@ msgstr "" #. Type: select #. Choices #: ../templates:1001 -msgid "" -"suid root for all, suid root with only group audio executable, not suid at " -"all" +msgid "usable for all, usable for group audio, usable only for root" msgstr "" -"suid root per a tothom, suid root només pel grup audio, suid per a ningú " #. Type: select #. Description @@ -43,9 +40,15 @@ msgstr "Instal·lar beep com:" #. Type: select #. Description #: ../templates:1002 +#, fuzzy +#| 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." 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 " +"There are several possibilities 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 "" @@ -57,13 +60,25 @@ msgstr "" #. Type: select #. Description #: ../templates:1002 +#, 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." 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." +"the package maintainer's judgement." msgstr "" "Ja que qualsevol programa amb el suid root pot ser un perill per la " "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." + +#~ 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ú " diff --git a/debian/po/cs.po b/debian/po/cs.po index 6db6b70..863df1c 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: beep\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2007-02-20 23:46+0100\n" -"PO-Revision-Date: 2006-06-21 14:23+0200\n" +"POT-Creation-Date: 2008-07-28 19:33+0200\n" +"PO-Revision-Date: 2008-08-03 16:32+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" @@ -26,11 +26,10 @@ msgstr "" #. Type: select #. Choices #: ../templates:1001 -msgid "" -"suid root for all, suid root with only group audio executable, not suid at " -"all" +msgid "usable for all, usable for group audio, usable only for root" msgstr "" -"suid root pro všechny, suid root spustitelný skupinou audio, bez suid bitu" +"použitelný pro všechny, použitelný pro skupinu audio, použitelný pouze pro " +"uživatele root" #. Type: select #. Description @@ -43,7 +42,7 @@ msgstr "Instalovat beep jako:" #: ../templates:1002 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 " +"There are several possibilities 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 "" @@ -59,9 +58,9 @@ 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." +"the package maintainer's 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 " +"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 eb05036..db4bb55 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -15,23 +15,19 @@ msgid "" msgstr "" "Project-Id-Version: beep 1.2.2-18\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2007-02-20 23:46+0100\n" -"PO-Revision-Date: 2006-06-21 05:07-0500\n" -"Last-Translator: Gerfried Fuchs \n" +"POT-Creation-Date: 2008-07-28 19:33+0200\n" +"PO-Revision-Date: 2008-07-28 19:39+0200\n" +"Last-Translator: Gerfried Fuchs \n" "Language-Team: German \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-15\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #. Type: select #. Choices #: ../templates:1001 -msgid "" -"suid root for all, suid root with only group audio executable, not suid at " -"all" -msgstr "" -"suid root fr alle, suid root nur fr Gruppe audio ausfhrbar, nicht suid " -"gesetzt" +msgid "usable for all, usable for group audio, usable only for root" +msgstr "für alle benutzbar, für Gruppe audio benutzbar, nur für root benutzbar" #. Type: select #. Description @@ -44,14 +40,14 @@ msgstr "beep installieren als:" #: ../templates:1002 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 " +"There are several possibilities 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 muss als root ausgefhrt werden, da es auf den Lautsprecher zugreifen " -"muss. Es gibt mehrere Mglichkeiten, das Programm benutzbar zu machen: " -"Entweder nur fr root (gar kein suid), benutzbar von den Mitgliedern der " -"Gruppe audio, oder fr alle benutzbar." +"beep muss als root ausgeführt werden, da es auf den Lautsprecher zugreifen " +"muss. Es gibt mehrere Möglichkeiten, das Programm benutzbar zu machen: " +"Entweder nur für root (gar kein suid), benutzbar von den Mitgliedern der " +"Gruppe audio, oder für alle benutzbar." #. Type: select #. Description @@ -60,9 +56,10 @@ 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." +"the package maintainer's judgement." msgstr "" "Da jedes Programm, das suid root gesetzt ist, ein potentielles " -"Sicherheitsproblem sein kann, wird dies nicht automatisch durchgefhrt. Das " +"Sicherheitsproblem sein kann, wird dies nicht automatisch durchgeführt. Das " "Programm ist jedoch recht kurz (~150 Zeilen Code) und kann daher von Ihnen " -"sehr leicht berprft werden, falls Sie meiner Einschtzung nicht vertrauen." +"sehr leicht überprüft werden, falls Sie der Einschätzung des Paketbetreuers " +"nicht vertrauen." diff --git a/debian/po/es.po b/debian/po/es.po index 97f1182..575fbca 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -29,7 +29,7 @@ msgid "" msgstr "" "Project-Id-Version: beep\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2007-02-20 23:46+0100\n" +"POT-Creation-Date: 2008-07-28 19:33+0200\n" "PO-Revision-Date: 2006-06-28 02:06-0500\n" "Last-Translator: David Martínez Moreno \n" "Language-Team: Debian l10n Spanish \n" @@ -43,12 +43,8 @@ msgstr "" #. Type: select #. Choices #: ../templates:1001 -msgid "" -"suid root for all, suid root with only group audio executable, not suid at " -"all" +msgid "usable for all, usable for group audio, usable only for root" msgstr "" -"activar el bit «suid root» para todos, sólo para el grupo «audio», no " -"activarlo en absoluto" #. Type: select #. Description @@ -59,28 +55,47 @@ msgstr "Instalar beep de la siguiente manera:" #. Type: select #. Description #: ../templates:1002 +#, fuzzy +#| 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." 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 " +"There are several possibilities 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 "" "El programa beep debe ejecutarse como root porque necesita acceder al " "hardware del altavoz. No obstante, existen varias posibilidades para usar el " -"programa: que lo use sólo root (sin «bit suid»), los usuarios que " -"pertenezcan al grupo «audio», o todos." +"programa: que lo use sólo root (sin «bit suid»), los usuarios que pertenezcan " +"al grupo «audio», o todos." #. Type: select #. Description #: ../templates:1002 +#, 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." 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." +"the package maintainer's judgement." msgstr "" "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." + +#~ msgid "" +#~ "suid root for all, suid root with only group audio executable, not suid " +#~ "at all" +#~ msgstr "" +#~ "activar el bit «suid root» para todos, sólo para el grupo «audio», no " +#~ "activarlo en absoluto" diff --git a/debian/po/eu.po b/debian/po/eu.po new file mode 100644 index 0000000..36adafb --- /dev/null +++ b/debian/po/eu.po @@ -0,0 +1,58 @@ +# translation of beep-eu.po to Euskara +# Copyright (C) 2003-2008 Gerfried Fuchs +# This file is distributed under the same license as the beep package. +# +# Piarres Beobide , 2008. +msgid "" +msgstr "" +"Project-Id-Version: beep-eu\n" +"Report-Msgid-Bugs-To: beep@packages.debian.org\n" +"POT-Creation-Date: 2008-07-28 19:33+0200\n" +"PO-Revision-Date: 2008-08-05 11:48+0200\n" +"Last-Translator: Piarres Beobide \n" +"Language-Team: Euskara \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable for all, usable for group audio, usable only for root" +msgstr "denentzat erabilgarri, audio taldearentzat erabilgarri, root-entzat bakarrik erabilgarri" + +#. Type: select +#. Description +#: ../templates:1002 +msgid "Install beep as:" +msgstr "Instalatu beep honela:" + +#. Type: select +#. Description +#: ../templates:1002 +msgid "" +"beep must be run as root since it needs to access the speaker hardware. " +"There are several possibilities 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 "" +"bepp root gisa exekutatu behar da bozgorailu hardwarea atzitu behar bait du. " +"Aukera ezberdinak dauden programa erabilgarri egiteko: Edo root-entzat bakarrik " +"(suid bit gabe), audio taldeko erabiltzaileentzat bakarrik erabilgarri edo denentzat " +"erabilgarri." + +#. Type: select +#. Description +#: ../templates:1002 +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 " +"the package maintainer's judgement." +msgstr "" +"Suid bit-a ezarririk duen edozein programa segurtasun ahulune bat izan " +"daitekeenez ez da lehenespen bezala egingo. Hala ere programa nahiko txikia " +"denez (150 kode lerro inguru), beraz nahiko erraza da kodearen segurtasuna " +"zure kabuz egiaztatzea ez bazara pakete mantentzelariaren erabakietaz fidatzen." + diff --git a/debian/po/fi.po b/debian/po/fi.po new file mode 100644 index 0000000..66da8d7 --- /dev/null +++ b/debian/po/fi.po @@ -0,0 +1,37 @@ +msgid "" +msgstr "" +"Project-Id-Version: beep\n" +"Report-Msgid-Bugs-To: beep@packages.debian.org\n" +"POT-Creation-Date: 2008-07-28 19:33+0200\n" +"PO-Revision-Date: 2008-08-01 15:06+0200\n" +"Last-Translator: Esko Arajärvi \n" +"Language-Team: Finnish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Country: FINLAND\n" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable for all, usable for group audio, usable only for root" +msgstr "kaikkien käyttöön, ryhmän audio käyttöön, vain pääkäyttäjän käyttöön" + +#. Type: select +#. Description +#: ../templates:1002 +msgid "Install beep as:" +msgstr "Asenna beep:" + +#. Type: select +#. Description +#: ../templates:1002 +msgid "beep must be run as root since it needs to access the speaker hardware. There are several possibilities 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 "Ohjelmaa beep täytyy ajaa pääkäyttäjänä, koska sen täytyy voida käyttää koneen kaiutinta. Ohjelma voidaan asentaa useammalla tavalla: kaikkien käyttöön (suid root), vain ryhmän audio käyttöön (suid root ryhmälle audio) tai vain pääkäyttäjän käyttöön." + +#. Type: select +#. Description +#: ../templates:1002 +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 the package maintainer's judgement." +msgstr "Koska mikä tahansa suid-bitin kanssa asennettu ohjelma voi olla tietoturvariski, sitä ei oletuksena aseteta. Koska ohjelma kuitenkin on melko pieni (noin 150 riviä koodia), sen turvallisuus on melko helppo tarkistaa tarvittaessa itse." + diff --git a/debian/po/fr.po b/debian/po/fr.po index 7598bf5..8c5540a 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -15,45 +15,41 @@ msgid "" msgstr "" "Project-Id-Version: beep 1.2.2-10\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2007-02-20 23:46+0100\n" -"PO-Revision-Date: 2006-06-28 02:06-0500\n" -"Last-Translator: Daniel Dchelotte \n" +"POT-Creation-Date: 2008-07-28 19:33+0200\n" +"PO-Revision-Date: 2008-08-09 19:54-0300\n" +"Last-Translator: Daniel Déchelotte \n" "Language-Team: Debian-l10n-french \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-15\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #. Type: select #. Choices #: ../templates:1001 -msgid "" -"suid root for all, suid root with only group audio executable, not suid at " -"all" -msgstr "" -"Excution par tous en setuid root, Excution par le seul groupe audio en " -"setuid root, Pas de setuid root" +msgid "usable for all, usable for group audio, usable only for root" +msgstr "Utilisable par tous, Utilisable seulement par les membres du " +"groupe « audio », Réservé au superutilisateur" #. Type: select #. Description #: ../templates:1002 msgid "Install beep as:" -msgstr "Installer beep en:" +msgstr "Installer beep de sorte qu'il soit :" #. Type: select #. Description #: ../templates:1002 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 " +"There are several possibilities 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 "" -"Le programme beep doit tre lanc avec les privilges du superutilisateur " -"pour pouvoir accder au haut-parleur. Cela est possible de plusieurs " -"faons: soit le bit setuid est positionn et tout le monde peut excuter ce " -"programme, soit le bit setuid est positionn et seuls les membres du groupe " -"audio peuvent excuter le programme, soit le bit setuid n'est pas positionn " -"et beep n'est alors excutable que par le superutilisateur." +"Le programme beep doit posséder les privilèges du superutilisateur " +"pour pouvoir accéder au haut-parleur. Cela est possible de plusieurs " +"façons : soit permettre de le lancer avec les privilèges du superutilisateur (« setuid root ») " +"par tous ou uniquement par les membres du groupe « audio », " +"soit réserver l'exécution du programme au superutilisateur." #. Type: select #. Description @@ -62,10 +58,10 @@ 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." +"the package maintainer's judgement." msgstr "" -"Comme tout programme setuid root reprsente a priori un risque du point " -"de vue de la scurit, cela n'est pas fait par dfaut. Toutefois, ce " -"programme est vraiment petit (environ 150 lignes de code) et il est " -"relativement facile de vrifier par vous-mme que le code est sr, en cas de " +"Tout programme qui s'exécute avec les privilèges du superutilisateur peut présenter un risque " +"pour la sécurité du système. Toutefois, ce " +"programme est vraiment petit (environ 150 lignes de code) et il est " +"relativement facile de vérifier par vous-même que le code est sûr, en cas de " "doute." diff --git a/debian/po/gl.po b/debian/po/gl.po index 72b99e9..145fdc2 100644 --- a/debian/po/gl.po +++ b/debian/po/gl.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: beep\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2007-02-20 23:46+0100\n" -"PO-Revision-Date: 2008-05-18 12:37+0100\n" +"POT-Creation-Date: 2008-07-28 19:33+0200\n" +"PO-Revision-Date: 2008-08-01 23:23+0100\n" "Last-Translator: Jacobo Tarrio \n" "Language-Team: Galician \n" "MIME-Version: 1.0\n" @@ -17,12 +17,10 @@ msgstr "" #. Type: select #. Choices #: ../templates:1001 -msgid "" -"suid root for all, suid root with only group audio executable, not suid at " -"all" +msgid "usable for all, usable for group audio, usable only for root" msgstr "" -"suid root para todos, suid root só executable para o grupo audio, non suid " -"en absoluto" +"utilizable por todos, utilizable polo grupo audio, utilizable só polo " +"administrador" #. Type: select #. Description @@ -35,12 +33,12 @@ msgstr "Instalar beep coma:" #: ../templates:1002 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 " +"There are several possibilities 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 "" "Débese executar \"beep\" coma administrador, xa que precisa de acceder ao " -"hardware do altoparlante. Hai varias posibilidade para facer o programa " +"hardware do altoparlante. Hai varias posibilidades para facer o programa " "utilizable: só para o administrador (sen bit suid en absoluto), executable " "só polos usuarios do grupo \"audio\", ou utilizable por todos." @@ -51,7 +49,7 @@ 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." +"the package maintainer's judgement." msgstr "" "Xa que os programas \"suid root\" poden ser riscos de seguridade, isto non " "se fai por defecto. Nembargantes, o programa é bastante pequeno (unhas 150 " diff --git a/debian/po/it.po b/debian/po/it.po index 09ee8ff..ae5866a 100644 --- 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: 2007-02-20 23:46+0100\n" +"POT-Creation-Date: 2008-07-28 19:33+0200\n" "PO-Revision-Date: 2007-10-03 19:01+0200\n" "Last-Translator: Stefano Melchior \n" "Language-Team: Italian \n" @@ -13,12 +13,8 @@ msgstr "" #. Type: select #. Choices #: ../templates:1001 -msgid "" -"suid root for all, suid root with only group audio executable, not suid at " -"all" +msgid "usable for all, usable for group audio, usable only for root" msgstr "" -"suid root per tutti, suid root solamente con gli eseguibili del gruppo " -"audio, nient'affatto suid" #. Type: select #. Description @@ -29,9 +25,15 @@ msgstr "" #. Type: select #. Description #: ../templates:1002 +#, fuzzy +#| 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." 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 " +"There are several possibilities 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 "" @@ -43,14 +45,27 @@ msgstr "" #. Type: select #. Description #: ../templates:1002 +#, 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." 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." +"the package maintainer's judgement." 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." + +#~ 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" diff --git a/debian/po/ja.po b/debian/po/ja.po index 1f8ceae..47498eb 100644 --- a/debian/po/ja.po +++ b/debian/po/ja.po @@ -1,23 +1,23 @@ -# -# 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. -# -# +# +# 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. +# +# msgid "" msgstr "" -"Project-Id-Version: beep 1.2.2-18\n" +"Project-Id-Version: beep 1.2.2-22\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2007-02-20 23:46+0100\n" -"PO-Revision-Date: 2007-10-03 19:01+0200\n" +"POT-Creation-Date: 2008-07-28 19:33+0200\n" +"PO-Revision-Date: 2008-08-03 11:10+0900\n" "Last-Translator: Hideki Yamane (Debian-JP) \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" @@ -27,12 +27,10 @@ msgstr "" #. Type: select #. Choices #: ../templates:1001 -msgid "" -"suid root for all, suid root with only group audio executable, not suid at " -"all" +msgid "usable for all, usable for group audio, usable only for root" msgstr "" -"全ユーザが使えるように root に suid する, audio グループだけが実行できるよう" -"に root に suid する, suid しない" +"全ユーザが使えるようにする, audio グループだけが実行できるようにする, root だ" +"けが使えるようにする" #. Type: select #. Description @@ -45,7 +43,7 @@ msgstr "beep のインストール時設定について:" #: ../templates:1002 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 " +"There are several possibilities 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 "" @@ -61,9 +59,9 @@ 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." +"the package maintainer's judgement." msgstr "" "各プログラムを root に suid するのはセキュリティリスクになるので、デフォルト" "ではこの方法は採りません。しかしながら、このプログラムは非常に小さいので (150" -"行程度のコードです)、私の判断を信じられない場合、あなた自身でコードの安全性" -"を”確認するのはとても簡単です。" +"行程度のコードです)、パッケージメンテナの判断を信用しない場合、あなた自身で" +"コードの安全性を確認するのはとても簡単です。" diff --git a/debian/po/nl.po b/debian/po/nl.po index 3516bfd..be82133 100644 --- a/debian/po/nl.po +++ b/debian/po/nl.po @@ -15,54 +15,51 @@ msgid "" msgstr "" "Project-Id-Version: beep 1.2.2-11\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2007-02-20 23:46+0100\n" -"PO-Revision-Date: 2007-10-03 19:02+0200\n" -"Last-Translator: Tim Vandermeersch \n" +"POT-Creation-Date: 2008-07-28 19:33+0200\n" +"PO-Revision-Date: 2007-08-01 10:42+0200\n" +"Last-Translator: Thijs Kinkhorst \n" "Language-Team: dutch \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" #. Type: select #. Choices #: ../templates:1001 -msgid "" -"suid root for all, suid root with only group audio executable, not suid at " -"all" -msgstr "" -"suid root voor alles, suid root enkel met groep audio uitvoerbare bestanden, " -"geen suid" +msgid "usable for all, usable for group audio, usable only for root" +msgstr "te gebruiken door iedereen, te gebruiken door groep audio, alleen te gebruiken door root" #. Type: select #. Description #: ../templates:1002 msgid "Install beep as:" -msgstr "" +msgstr "Beep installeren als:" #. Type: select #. Description #: ../templates:1002 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 " +"There are several possibilities 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 dient als root te draaien omdat het toegang nodig heeft tot de " -"luidspreker hardware. Er zijn verschillende mogelijkheden om het " -"programmabruikbaar te maken: Ofwel enkel voor root (geen suid bit), enkel " -"uitvoerbaar door gebruikers in de audio groep, of onbruikbaar voor iedereen." +"luidsprekerhardware. Er zijn verschillende mogelijkheden om het " +"programma bruikbaar te maken: ofwel enkel voor root (geen suid bit), enkel " +"uitvoerbaar door gebruikers in de groep audio, of bruikbaar voor iedereen." #. Type: select #. Description #: ../templates:1002 -#, 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." +"the package maintainer's judgement." 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 verifiren, als u mijn oordeel niet vertrouwd." +"Omdat elk suid-root-programma een veiligheidsrisico is, wordt dit niet " +"standaard gedaan. Het programma is vrij klein (~150 regels code), dus kan " +"redelijk makkelijk om zelf geverifieerd worden, indien u het oordeel van de " +"pakketbeheerder niet vertrouwt." + diff --git a/debian/po/pt.po b/debian/po/pt.po index 932375c..d07acdb 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -1,12 +1,12 @@ # Portuguese translation for beep's debconf messages. -# 2005-2006, Miguel Figueiredo +# 2005-2008, Miguel Figueiredo # msgid "" msgstr "" "Project-Id-Version: beep 1.2.2-16\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2007-02-20 23:46+0100\n" -"PO-Revision-Date: 2006-06-28 02:07-0500\n" +"POT-Creation-Date: 2008-07-28 19:33+0200\n" +"PO-Revision-Date: 2008-08-01 18:07+0100\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" "MIME-Version: 1.0\n" @@ -16,11 +16,9 @@ msgstr "" #. Type: select #. Choices #: ../templates:1001 -msgid "" -"suid root for all, suid root with only group audio executable, not suid at " -"all" +msgid "usable for all, usable for group audio, usable only for root" msgstr "" -"suid root para todos, suid root apenas com o grupo audio executável, sem suid" +"utilizável para todos, utilizável para o grupo audio, utilizável para o root" #. Type: select #. Description @@ -33,7 +31,7 @@ msgstr "Instalar beep como:" #: ../templates:1002 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 " +"There are several possibilities 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 "" @@ -49,9 +47,9 @@ 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." +"the package maintainer's 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." +"de código), por isso é bastante fácil verificar por você mesmo a segurança " +"do código, se não acreditar no julgamento do 'maintainer' do pacote." diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po index c81eda9..e68a3e1 100644 --- a/debian/po/pt_BR.po +++ b/debian/po/pt_BR.po @@ -19,11 +19,10 @@ msgid "" msgstr "" "Project-Id-Version: beep-1.2.2-10\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2007-02-20 23:46+0100\n" -"PO-Revision-Date: 2006-06-28 02:06-0500\n" -"Last-Translator: Felipe Augusto van de Wiel (faw) \n" -"Language-Team: l10n portuguese \n" +"POT-Creation-Date: 2008-07-28 19:33+0200\n" +"PO-Revision-Date: 2008-08-12 11:33-0300\n" +"Last-Translator: Felipe Augusto van de Wiel (faw) \n" +"Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -33,12 +32,8 @@ msgstr "" #. Type: select #. Choices #: ../templates:1001 -msgid "" -"suid root for all, suid root with only group audio executable, not suid at " -"all" -msgstr "" -"suid root para todos, suid root com propriedade de execução somente para o " -"grupo audio, sem suid" +msgid "usable for all, usable for group audio, usable only for root" +msgstr "usável por todos, usável pelo grupo audio, usável somente pelo root" #. Type: select #. Description @@ -51,14 +46,14 @@ msgstr "Instalar beep como:" #: ../templates:1002 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 " +"There are several possibilities 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 "" "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." +"hardware do alto-falante (\"speaker\"). Existem diversas possibilidades para " +"tornar o programa usável: somente pelo root (sem suid), executável somente " +"pelos usuários do grupo audio ou usável por todos." #. Type: select #. Description @@ -67,10 +62,10 @@ 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." +"the package maintainer's judgement." msgstr "" -"Devido a cada programa que é configurado para ser executado com suid root " +"Como cada programa que é configurado para ser executado com suid root pode " "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." +"verificar a segurança do código você mesmo, se você não confia no julgamento " +"do mantenedor do pacote." diff --git a/debian/po/ro.po b/debian/po/ro.po new file mode 100644 index 0000000..181b017 --- /dev/null +++ b/debian/po/ro.po @@ -0,0 +1,66 @@ +# translation of ro.po to debian-l10-romanian +# Romanian translations for PACKAGE package +# Traducerea în limba română pentru pachetul beep. +# Copyright (C) 2003-2008 Gerfried Fuchs +# This file is distributed under the same license as the beep package. +# +# , 2008. +# Eddy Petrișor , 2008. +msgid "" +msgstr "" +"Project-Id-Version: ro\n" +"Report-Msgid-Bugs-To: beep@packages.debian.org\n" +"POT-Creation-Date: 2008-07-28 19:33+0200\n" +"PO-Revision-Date: 2008-08-02 04:46+0300\n" +"Last-Translator: Eddy Petrișor \n" +"Language-Team: debian-l10-romanian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " +"20)) ? 1 : 2;\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable for all, usable for group audio, usable only for root" +msgstr "" +"utilizabil pentru toți, utilizabil pentru grupul audio, utilizabil doar de " +"root" + +#. Type: select +#. Description +#: ../templates:1002 +msgid "Install beep as:" +msgstr "Se instalează beep astfel încât este:" + +#. Type: select +#. Description +#: ../templates:1002 +msgid "" +"beep must be run as root since it needs to access the speaker hardware. " +"There are several possibilities 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 trebuie să ruleze ca root deoarece are nevoie să acceseze componentele " +"legate de difuzor. Există mai multe posibilități pentru a face programul " +"utilizabil: Fie doar pentru root (fără bitul suid), executabil doar de către " +"utilizatorii grupului audio sau utilizabil pentru toți." + +#. Type: select +#. Description +#: ../templates:1002 +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 " +"the package maintainer's judgement." +msgstr "" +"Deoarece orice program instalat cu suid root poate reprezenta un risc din " +"punct de vedere al securității, acest lucru nu se face în mod implicit. " +"Totuși acest program este mic (aproximativ 150 de linii de cod), deci o " +"verificare a codului, din punctul de vedere al securității, este destul de " +"ușor de realizat, dacă nu aveți încredere în judecata responsabilului " +"pachetului." diff --git a/debian/po/ru.po b/debian/po/ru.po index 550009e..fcfbf74 100644 --- a/debian/po/ru.po +++ b/debian/po/ru.po @@ -1,3 +1,4 @@ +# translation of ru.po to Russian # # Translators, if you are not familiar with the PO format, gettext # documentation is worth reading, especially sections dedicated to @@ -11,58 +12,59 @@ # # Developers do not need to manually edit POT or PO files. # +# Ilgiz Kalmetev , 2007. +# Yuri Kozlov , 2008. msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2007-02-20 23:46+0100\n" -"PO-Revision-Date: 2007-10-03 19:02+0200\n" -"Last-Translator: Ilgiz Kalmetev \n" -"Language-Team: Russian \n" +"POT-Creation-Date: 2008-07-28 19:33+0200\n" +"PO-Revision-Date: 2008-08-01 19:22+0400\n" +"Last-Translator: Yuri Kozlov \n" +"Language-Team: Russian \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=KOI8-R\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #. Type: select #. Choices #: ../templates:1001 -msgid "" -"suid root for all, suid root with only group audio executable, not suid at " -"all" -msgstr "" -"suid root , suid root audio, suid " +msgid "usable for all, usable for group audio, usable only for root" +msgstr "использовать всем, использовать группе audio, использовать только суперпользователю" #. Type: select #. Description #: ../templates:1002 msgid "Install beep as:" -msgstr "" +msgstr "Разрешить beep:" #. Type: select #. Description #: ../templates:1002 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 " +"There are several possibilities 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 root, " -". : " -"root ( suid ), " -" audio, ." +"Для работы программе beep нужно иметь права суперпользователя, так как ей " +"нужен доступ к динамику. Поэтому есть несколько вариантов установки, при которых: " +"её будет использовать только суперпользователь (не устанавливать бит suid), " +"её будут использовать все из группы audio, или её сможет использовать любой." #. Type: select #. Description #: ../templates:1002 -#, 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." +"the package maintainer's judgement." msgstr "" -", suid root, , " -" suid- . , " -" (~150 ), " -" , ." +"Программы, у которых установлен suid root, являются потенциально уязвимыми, " +"поэтому suid-бит по умолчанию не устанавливается. Однако, программа " +"исключительно мала (~150 строк кода), и безопасность её кода очень легко " +"проверить самостоятельно, если не вы доверяете сопровождающему." + diff --git a/debian/po/sv.po b/debian/po/sv.po index 3b11aa7..2c3259e 100644 --- a/debian/po/sv.po +++ b/debian/po/sv.po @@ -15,10 +15,10 @@ msgid "" msgstr "" "Project-Id-Version: beep\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2007-02-20 23:46+0100\n" -"PO-Revision-Date: 2006-06-21 12:49-0500\n" -"Last-Translator: Daniel Nylander \n" -"Language-Team: Swedish \n" +"POT-Creation-Date: 2008-07-28 19:33+0200\n" +"PO-Revision-Date: 2008-08-02 11:06+0100\n" +"Last-Translator: Martin Bagge \n" +"Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" @@ -26,11 +26,10 @@ msgstr "" #. Type: select #. Choices #: ../templates:1001 -msgid "" -"suid root for all, suid root with only group audio executable, not suid at " -"all" +msgid "usable for all, usable for group audio, usable only for root" msgstr "" -"suid root fr alla, suid root endast fr gruppen \"audio\", inte suid alls" +"krbar fr all, krbar fr gruppen \"audio\", krbar endast fr root-" +"anvndaren." #. Type: select #. Description @@ -43,14 +42,14 @@ msgstr "Installera beep som:" #: ../templates:1002 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 " +"There are several possibilities 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 mste kras som root eftersom den behver tkomst till " "hgtalarhrdvaran. Det finns flera stt att gra programmet anvndbart: " "Antingen endast fr root (ingen suid-bit alls), krbar endast fr anvndare " -"i gruppen \"audio\" eller anvndbar fr alla." +"i gruppen \"audio\" eller krbar fr alla." #. Type: select #. Description @@ -59,7 +58,7 @@ 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." +"the package maintainer's judgement." msgstr "" "Eftersom de program som r suid root kan vara en skerhetsrisk kommer detta " "inte gras som standard. Programmet r ganska litet (~150 rader kod) och r " diff --git a/debian/po/templates.pot b/debian/po/templates.pot index 46954c7..f658f49 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# Copyright (C) 2003-2008 Gerfried Fuchs # This file is distributed under the same license as the beep package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: beep 1.2.2-18\n" +"Project-Id-Version: beep 1.2.2-22\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2007-02-20 23:46+0100\n" +"POT-Creation-Date: 2008-07-28 19:33+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -19,9 +19,7 @@ msgstr "" #. Type: select #. Choices #: ../templates:1001 -msgid "" -"suid root for all, suid root with only group audio executable, not suid at " -"all" +msgid "usable for all, usable for group audio, usable only for root" msgstr "" #. Type: select @@ -35,7 +33,7 @@ msgstr "" #: ../templates:1002 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 " +"There are several possibilities 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 "" @@ -47,5 +45,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." +"the package maintainer's judgement." msgstr "" diff --git a/debian/po/vi.po b/debian/po/vi.po index d3e544b..676497c 100644 --- a/debian/po/vi.po +++ b/debian/po/vi.po @@ -1,15 +1,14 @@ # Vietnamese translation for Beep. # Copyright © 2006 Free Software Foundation, Inc. # Clytie Siddall , 2005-2006. -# +# msgid "" msgstr "" "Project-Id-Version: beep 1.2.2-18\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2007-02-20 23:46+0100\n" +"POT-Creation-Date: 2008-07-28 19:33+0200\n" "PO-Revision-Date: 2006-06-23 03:49-0500\n" "Last-Translator: Clytie Siddall \n" -"Language-Team: Vietnamese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -18,12 +17,8 @@ msgstr "" #. Type: select #. Choices #: ../templates:1001 -msgid "" -"suid root for all, suid root with only group audio executable, not suid at " -"all" +msgid "usable for all, usable for group audio, usable only for root" msgstr "" -"« 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 @@ -34,9 +29,15 @@ msgstr "Cài đặt beep dạng:" #. Type: select #. Description #: ../templates:1002 +#, fuzzy +#| 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." 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 " +"There are several possibilities 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 "" @@ -49,13 +50,26 @@ msgstr "" #. Type: select #. Description #: ../templates:1002 +#, 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." 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." +"the package maintainer's judgement." msgstr "" "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." + +#~ 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 cho phép âm thanh " +#~ "nhóm chạy, không có « suid root » nào cả" diff --git a/debian/postinst b/debian/postinst index 9abee6f..34b56d5 100644 --- a/debian/postinst +++ b/debian/postinst @@ -22,22 +22,37 @@ if [ "$suid" = "suid root with only group audio executeable" ] ; then suid="suid root with only group audio executable" fi +# option changes as suggested by #492724 +if [ "$suid" = "suid root for all" ] ; then + db_set beep/suid_option "usable for all" + suid="usable for all" +fi +if [ "$suid" = "suid root with only group audio executable" ] ; then + db_set beep/suid_option "usable for group audio" + suid="usable for group audio" +fi +if [ "$suid" = "not suid at all" ] ; then + db_set beep/suid_option "usable only for root" + suid="usable only for root" +fi + + if [ -x /usr/sbin/dpkg-statoverride ] ; then if ! dpkg-statoverride --list /usr/bin/beep >/dev/null ; then - if [ "$suid" = "suid root for all" ] ; then + if [ "$suid" = "usable for all" ] ; then chmod 4755 /usr/bin/beep - elif [ "$suid" = "suid root with only group audio executable" ] ; then + elif [ "$suid" = "usable for group audio" ] ; then chmod 4754 /usr/bin/beep - elif [ "$suid" = "not suid at all" ] ; then + elif [ "$suid" = "usable only for root" ] ; then chmod 0755 /usr/bin/beep fi fi else - if [ "$suid" = "suid root for all" ] ; then + if [ "$suid" = "usable for all" ] ; then chmod 4755 /usr/bin/beep - elif [ "$suid" = "suid root with only group audio executable" ] ; then + elif [ "$suid" = "usable for group audio" ] ; then chmod 4754 /usr/bin/beep - elif [ "$suid" = "not suid at all" ] ; then + elif [ "$suid" = "usable only for root" ] ; then chmod 0755 /usr/bin/beep fi fi diff --git a/debian/rules b/debian/rules index b21dd92..1c788f5 100755 --- a/debian/rules +++ b/debian/rules @@ -77,8 +77,7 @@ binary-indep: build binary-arch: build install $(checkdir) $(checkroot) - $(INSTALL_DIR) $(TMP1)/DEBIAN $(TMP1)/usr/share/lintian/overrides \ - $(TMP2)/DEBIAN + $(INSTALL_DIR) $(TMP1)/DEBIAN $(TMP2)/DEBIAN $(INSTALL_FILE) debian/README.Debian debian/copyright \ $(TMP1)/usr/share/doc/$(PKG1) $(INSTALL_FILE) debian/changelog \ @@ -86,8 +85,6 @@ 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) \ @@ -96,7 +93,7 @@ binary-arch: build install xargs -r0 md5sum > DEBIAN/md5sums dpkg --build $(TMP1) .. dpkg-gencontrol -ldebian/changelog -isp -Tdebian/substvars -p$(PKG2) \ - -P$(TMP2) -n$(PKG2)_$(VERSION)_$(ARCH).udeb + -P$(TMP2) -UHomepage -n$(PKG2)_$(VERSION)_$(ARCH).udeb dpkg --build $(TMP2) ../$(PKG2)_$(VERSION)_$(ARCH).udeb diff --git a/debian/templates b/debian/templates index 117d6c4..cce7826 100644 --- a/debian/templates +++ b/debian/templates @@ -1,14 +1,14 @@ Template: beep/suid_option Type: select -_Choices: suid root for all, suid root with only group audio executable, not suid at all +_Choices: usable for all, usable for group audio, usable only for root Default: suid root with only group audio executable _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 + There are several possibilities 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. . 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. + trust the package maintainer's judgement. From 3e366a8559a933d9b1d463255441f97812382d0b Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Sun, 29 Mar 2009 11:19:30 +0200 Subject: [PATCH 11/48] Imported Debian patch 1.2.2-23 --- debian/beep.1.diff | 15 ++++- debian/changelog | 17 ++++++ debian/control | 4 +- debian/copyright | 4 ++ debian/patches/01_makefile-fixup | 3 + debian/patches/02_verbose-option | 3 + debian/patches/03_multiple-freq | 3 + debian/patches/04_serial-console-fix | 3 + debian/patches/05_devfs-fix | 3 + debian/patches/06_event-option | 3 + debian/po/ca.po | 68 +++++++++++------------ debian/po/cs.po | 22 ++++++-- debian/po/de.po | 20 +++++-- debian/po/es.po | 83 +++++++++++++--------------- debian/po/eu.po | 30 +++++++--- debian/po/fi.po | 45 ++++++++++++--- debian/po/fr.po | 40 +++++++++----- debian/po/gl.po | 22 ++++++-- debian/po/it.po | 22 ++++++-- debian/po/ja.po | 22 ++++++-- debian/po/nl.po | 27 ++++++--- debian/po/pt.po | 21 +++++-- debian/po/pt_BR.po | 23 ++++++-- debian/po/ro.po | 22 ++++++-- debian/po/ru.po | 31 ++++++++--- debian/po/sv.po | 22 ++++++-- debian/po/templates.pot | 22 ++++++-- debian/po/vi.po | 70 +++++++++++------------ debian/postinst | 8 +-- debian/postrm | 2 + debian/rules | 4 +- debian/templates | 2 +- 32 files changed, 449 insertions(+), 237 deletions(-) diff --git a/debian/beep.1.diff b/debian/beep.1.diff index 8c3d857..0bea980 100644 --- a/debian/beep.1.diff +++ b/debian/beep.1.diff @@ -1,5 +1,5 @@ ---- beep.1.orig 2008-07-28 19:20:08.000000000 +0200 -+++ beep.1 2008-07-28 19:25:05.000000000 +0200 +--- beep.1.orig 2009-03-24 19:02:59.000000000 +0100 ++++ beep.1 2009-03-24 19:04:30.000000000 +0100 @@ -1,12 +1,12 @@ -.TH BEEP 1 "March 2002" +.TH BEEP 1 "July 2008" @@ -40,7 +40,7 @@ +\fBbeep\fR \-f 1000 \-n \-f 2000 \-n \-f 1500 -would produce a sequence of three beeps, the first with a frequency of 1000Hz (and otherwise default values), then a second beep with a frequency of 2000Hz (again, with things like delay and reps being set to their defaults), then a third beep, at 1500Hz. This is different from specifying a -r value, since -r repeats the same beep multiple times, whereas -n allows you to specify different beeps. After a -n, the new beep is created with all the default values, and any of these can be specified without altering values for preceeding (or later) beeps. See the \fBEXAMPLES\fR section if this managed to confuse you. -+would produce a sequence of three beeps, the first with a frequency of 1000Hz (and otherwise default values), then a second beep with a frequency of 2000Hz (again, with things like delay and reps being set to their defaults), then a third beep, at 1500Hz. This is different from specifying a \-r value, since \-r repeats the same beep multiple times, whereas \-n allows you to specify different beeps. After a \-n, the new beep is created with all the default values, and any of these can be specified without altering values for preceeding (or later) beeps. See the \fBEXAMPLES\fR section if this managed to confuse you. ++would produce a sequence of three beeps, the first with a frequency of 1000Hz (and otherwise default values), then a second beep with a frequency of 2000Hz (again, with things like delay and reps being set to their defaults), then a third beep, at 1500Hz. This is different from specifying a \-r value, since \-r repeats the same beep multiple times, whereas \-n allows you to specify different beeps. After a \-n, the new beep is created with all the default values, and any of these can be specified without altering values for preceding (or later) beeps. See the \fBEXAMPLES\fR section if this managed to confuse you. .TP \fB\-s\fR, \fB\-c\fR -these options put \fBbeep\fR into input-processing mode. -s tells \fBbeep\fR to read from stdin, and beep after each newline, and -c tells it to do so after every character. In both cases, the program will also echo the input back out to stdout, which makes it easy to slip \fBbeep\fR into a text-processing pipeline, see the \fBEXAMPLES\fR section. @@ -77,3 +77,12 @@ will produce first two 1000Hz beeps, then 5 beeps at the default tone, but only 10ms long each, followed by a third beep using all the default settings (since none are specified). .PP See also the \fBFREQUENCY TABLE\fR below. +@@ -81,7 +92,7 @@ + .PP + - you own the current tty + .PP +-What this means is that root can always make beep work (to the best of my knowledge!), and that any local user can make beep work, BUT a non-root remote user cannot use beep in it's natural state. What's worse, an xterm, or other x-session counts, as far as the kernel is concerned, as 'remote', so beep won't work from a non-priviledged xterm either. I had originally chalked this up to a bug, but there's actually nothing I can do about it, and it really is a Good Thing that the kernel does things this way. There is also a solution. ++What this means is that root can always make beep work (to the best of my knowledge!), and that any local user can make beep work, BUT a non-root remote user cannot use beep in it's natural state. What's worse, an xterm, or other x-session counts, as far as the kernel is concerned, as 'remote', so beep won't work from a non-privileged xterm either. I had originally chalked this up to a bug, but there's actually nothing I can do about it, and it really is a Good Thing that the kernel does things this way. There is also a solution. + .PP + By default beep is not installed with the suid bit set, because that would just be zany. On the other hand, if you do make it suid root, all your problems with beep bailing on ioctl calls will magically vanish, which is pleasant, and the only reason not to is that any suid program is a potential security hole. Conveniently, beep is very short, so auditing it is pretty straightforward. + .PP diff --git a/debian/changelog b/debian/changelog index c8d5add..576a841 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +beep (1.2.2-23) unstable; urgency=low + + * Updated translation: + - Vietnamese by Clytie Siddall (closes: #498496) + - Spanish by Francisco Javier Cuadrado (closes: #506415) + - Catalan by Matt Bonner (closes: #521470) + - Italian by davide gliozzi + * Split _Choices field in debian/templates into __Choices without unfuzzying + translations. + * Bumped Standards-Version to 3.8.1. + * Remove update cruft in maintainer scripts from ancient releases. + * Fixed two typos in manpage noticed by A. Costra, thanks (closes: #497890) + * Add "minimal package" to the synopsis of beep-udeb. + * Add author + description informations to patches. + + -- Gerfried Fuchs Sun, 29 Mar 2009 11:19:30 +0200 + beep (1.2.2-22) unstable; urgency=low * Remove Homepage control field from udeb. diff --git a/debian/control b/debian/control index a4c5428..c42456e 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: sound Priority: optional Maintainer: Gerfried Fuchs Build-Depends: po-debconf, patch, quilt -Standards-Version: 3.8.0 +Standards-Version: 3.8.1 Homepage: http://johnath.com/beep/ Package: beep @@ -21,7 +21,7 @@ Package: beep-udeb Architecture: any Section: debian-installer Depends: ${shlibs:Depends} -Description: advanced pc-speaker beeper +Description: advanced pc-speaker beeper - minimal package beep does what you'd expect: it beeps. However, it offers various additional features, such as the ability to control pitch, duration, and repetitions. diff --git a/debian/copyright b/debian/copyright index c51ed8b..d2d6d8c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -17,6 +17,10 @@ This software is copyright (C) 2000 by Johnathan Nightingale. implied warranties of merchantability or fitness for a particular use or ability to breed pandas in captivity, it just can't be done. +The Debian packaging is Copyright 2002-2009 by +Gerfried Fuchs and is licensed under the BSD license. +See /usr/share/common-licenses/BSD for the full text of it. + On Debian GNU/Linux systems, the complete text of the GNU General Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'. Later versions which the GNU project publishes on the above mentioned URL can diff --git a/debian/patches/01_makefile-fixup b/debian/patches/01_makefile-fixup index 76e67ee..627f71d 100644 --- a/debian/patches/01_makefile-fixup +++ b/debian/patches/01_makefile-fixup @@ -1,3 +1,6 @@ +Author: Gerfried Fuchs vim:ft=diff: +Description: Do not remove a file from the system on install + Index: beep-1.2.2/Makefile =================================================================== --- beep-1.2.2.orig/Makefile diff --git a/debian/patches/02_verbose-option b/debian/patches/02_verbose-option index 7a3cb89..159af4f 100644 --- a/debian/patches/02_verbose-option +++ b/debian/patches/02_verbose-option @@ -1,3 +1,6 @@ +Author: Gerfried Fuchs vim:ft=diff: +Description: Add support for --verbose/--debug option (BTS #297791, #335027) + Index: beep-1.2.2/beep.c =================================================================== --- beep-1.2.2.orig/beep.c diff --git a/debian/patches/03_multiple-freq b/debian/patches/03_multiple-freq index 2be1dc0..2a8cbb1 100644 --- a/debian/patches/03_multiple-freq +++ b/debian/patches/03_multiple-freq @@ -1,3 +1,6 @@ +Author: Gerfried Fuchs vim:ft=diff: +Description: Print warning on multiple -f values (BTS #270056) + Index: beep-1.2.2/beep.c =================================================================== --- beep-1.2.2.orig/beep.c diff --git a/debian/patches/04_serial-console-fix b/debian/patches/04_serial-console-fix index f07856b..908c1ac 100644 --- a/debian/patches/04_serial-console-fix +++ b/debian/patches/04_serial-console-fix @@ -1,3 +1,6 @@ +Author: Benjamin Gilbert vim:ft=diff: +Description: Open tty0 instead of console (BTS #134015) + Index: beep-1.2.2/beep.c =================================================================== --- beep-1.2.2.orig/beep.c diff --git a/debian/patches/05_devfs-fix b/debian/patches/05_devfs-fix index e82858a..93f14fb 100644 --- a/debian/patches/05_devfs-fix +++ b/debian/patches/05_devfs-fix @@ -1,3 +1,6 @@ +Author: Goswin Brederlow vim:ft=diff: +Description: Also try /dev/vc/0, devfs support (BTS #148884) + Index: beep-1.2.2/beep.c =================================================================== --- beep-1.2.2.orig/beep.c diff --git a/debian/patches/06_event-option b/debian/patches/06_event-option index e96c093..f6b7895 100644 --- a/debian/patches/06_event-option +++ b/debian/patches/06_event-option @@ -1,3 +1,6 @@ +Author: Alessandro Zummo vim:ft=diff: +Description: evdev and general device node support (BTS #350214) + Index: beep-1.2.2/beep.c =================================================================== --- beep-1.2.2.orig/beep.c diff --git a/debian/po/ca.po b/debian/po/ca.po index f83ee37..1be8b1e 100644 --- a/debian/po/ca.po +++ b/debian/po/ca.po @@ -1,4 +1,4 @@ -# translation of ca.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 @@ -12,73 +12,69 @@ # # Jordi Fernández Mora , 2004. # Miguel Gea Milvaques , 2004, 2006. +# Matt Bonner , 2009. msgid "" msgstr "" -"Project-Id-Version: ca\n" +"Project-Id-Version: 1.2.2-23\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2008-07-28 19:33+0200\n" -"PO-Revision-Date: 2006-06-21 08:40-0500\n" -"Last-Translator: Miguel Gea Milvaques \n" -"Language-Team: catalan \n" +"POT-Creation-Date: 2008-09-11 18:36+0200\n" +"PO-Revision-Date: 2009-03-27 17:11+0100\n" +"Last-Translator: Matt Bonner \n" +"Language-Team: Catalan \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" +"X-Generator: KBabel 1.11.4\n" #. Type: select #. Choices #: ../templates:1001 -msgid "usable for all, usable for group audio, usable only for root" -msgstr "" +msgid "usable for all" +msgstr "utilitzable per tothom" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable for group audio" +msgstr "utilitzable pel grup audio" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable only for root" +msgstr "utilitzable només per l'usuari root" #. Type: select #. Description #: ../templates:1002 msgid "Install beep as:" -msgstr "Instal·lar beep com:" +msgstr "Instal·la el beep:" #. Type: select #. Description #: ../templates:1002 -#, fuzzy -#| 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." msgid "" "beep must be run as root since it needs to access the speaker hardware. " "There are several possibilities 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 "" -"s'ha d'executar beep com a root ja que necessita accedir al maquinari del " -"speaker. Hi ha varies possibilitats de fer el programa usable: Només per " -"l'usuari root (no apareix el bit de suid), només executable pels usuaris del " -"grup audio, o executable per a tothom." +"S'ha d'executar beep com a root ja que necessita accedir a l'altaveu de " +"l'ordinador. Hi ha diverses possibilitats per fer el programa usable: que " +"només el pugui utilitzar l'usuari root (sense el bit de suid), que només " +"sigui executable pels usuaris del grup «audio», o que sigui executable per " +"tothom." #. Type: select #. Description #: ../templates:1002 -#, 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." 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 " "the package maintainer's judgement." msgstr "" -"Ja que qualsevol programa amb el suid root pot ser un perill per la " -"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." - -#~ 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ú " +"Com que qualsevol programa amb el suid root pot suposar un risc per a la " +"seguretat del sistema, no s'utilitza per defecte. Tot i això, el programa és " +"petit (unes 150 línies) i és prou fàcil verificar-ne la seguretat del codi, " +"si és que no confieu en el criteri del mantenidor del paquet." diff --git a/debian/po/cs.po b/debian/po/cs.po index 863df1c..b00176b 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: beep\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2008-07-28 19:33+0200\n" -"PO-Revision-Date: 2008-08-03 16:32+0200\n" +"POT-Creation-Date: 2008-09-11 18:36+0200\n" +"PO-Revision-Date: 2008-11-24 10:10+0100\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" @@ -26,10 +26,20 @@ msgstr "" #. Type: select #. Choices #: ../templates:1001 -msgid "usable for all, usable for group audio, usable only for root" -msgstr "" -"použitelný pro všechny, použitelný pro skupinu audio, použitelný pouze pro " -"uživatele root" +msgid "usable for all" +msgstr "použitelný pro všechny" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable for group audio" +msgstr "použitelný pro skupinu audio" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable only for root" +msgstr "použitelný pouze pro uživatele root" #. Type: select #. Description diff --git a/debian/po/de.po b/debian/po/de.po index db4bb55..996b94f 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: beep 1.2.2-18\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2008-07-28 19:33+0200\n" -"PO-Revision-Date: 2008-07-28 19:39+0200\n" +"POT-Creation-Date: 2008-09-11 18:36+0200\n" +"PO-Revision-Date: 2008-11-24 10:10+0100\n" "Last-Translator: Gerfried Fuchs \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -26,8 +26,20 @@ msgstr "" #. Type: select #. Choices #: ../templates:1001 -msgid "usable for all, usable for group audio, usable only for root" -msgstr "für alle benutzbar, für Gruppe audio benutzbar, nur für root benutzbar" +msgid "usable for all" +msgstr "für alle benutzbar" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable for group audio" +msgstr "für Gruppe audio benutzbar" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable only for root" +msgstr "nur für root benutzbar" #. Type: select #. Description diff --git a/debian/po/es.po b/debian/po/es.po index 575fbca..3757357 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -1,18 +1,20 @@ # beep po-debconf translation to Spanish -# Copyright (C) 2005 Software in the Public Interest +# Copyright (C) 2005, 2006, 2008 Software in the Public Interest # This file is distributed under the same license as the beep package. # # Changes: # - Initial translation -# César Gómez Martín , 2005. +# César Gómez Martín , 2005. # - Updates: -# David Martínez Moreno , 2006. +# David Martínez Moreno , 2006. +# Francisco Javier Cuadrado , 2008 +# +# Traductores, si no conoce el formato PO, merece la pena leer la +# documentación de gettext, especialmente las secciones dedicadas a este +# formato, por ejemplo ejecutando: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' # -# Traductores, si no conoce el formato PO, merece la pena leer la -# documentación de gettext, especialmente las secciones dedicadas a este -# formato, por ejemplo ejecutando: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' # Equipo de traducción al español, por favor, lean antes de traducir # los siguientes documentos: # @@ -27,75 +29,66 @@ # msgid "" msgstr "" -"Project-Id-Version: beep\n" +"Project-Id-Version: beep 1.2.2-22\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2008-07-28 19:33+0200\n" -"PO-Revision-Date: 2006-06-28 02:06-0500\n" -"Last-Translator: David Martínez Moreno \n" +"POT-Creation-Date: 2008-09-11 18:36+0200\n" +"PO-Revision-Date: 2008-11-24 10:09+0100\n" +"Last-Translator: Francisco Javier Cuadrado \n" "Language-Team: Debian l10n Spanish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: Spanish\n" -"X-Poedit-Country: SPAIN\n" -"X-Poedit-SourceCharset: utf-8\n" #. Type: select #. Choices #: ../templates:1001 -msgid "usable for all, usable for group audio, usable only for root" -msgstr "" +msgid "usable for all" +msgstr "utilizable por todos" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable for group audio" +msgstr "utilizable por el grupo «audio»" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable only for root" +msgstr "utilizable por «root»" #. Type: select #. Description #: ../templates:1002 msgid "Install beep as:" -msgstr "Instalar beep de la siguiente manera:" +msgstr "Instalar beep como:" #. Type: select #. Description #: ../templates:1002 -#, fuzzy -#| 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." msgid "" "beep must be run as root since it needs to access the speaker hardware. " "There are several possibilities 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 "" -"El programa beep debe ejecutarse como root porque necesita acceder al " +"El programa beep debe ejecutarse como «root» porque necesita acceder al " "hardware del altavoz. No obstante, existen varias posibilidades para usar el " -"programa: que lo use sólo root (sin «bit suid»), los usuarios que pertenezcan " -"al grupo «audio», o todos." +"programa: que lo use sólo «root» (sin «bit suid»), los usuarios que " +"pertenezcan al grupo «audio», o todos." #. Type: select #. Description #: ../templates:1002 -#, 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." 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 " "the package maintainer's judgement." msgstr "" -"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." - -#~ msgid "" -#~ "suid root for all, suid root with only group audio executable, not suid " -#~ "at all" -#~ msgstr "" -#~ "activar el bit «suid root» para todos, sólo para el grupo «audio», no " -#~ "activarlo en absoluto" +"Ya que cualquier programa con el «bit suid» puede suponer un riesgo de " +"seguridad, esta elección no se realiza de manera predeterminada. Sin " +"embargo, el programa es bastante pequeño (aproximadamente unas 150 líneas de " +"código) y, por lo tanto, si no confía en el juicio del responsable del " +"paquete, usted mismo podría verificar con bastante facilidad la seguridad " +"del código." diff --git a/debian/po/eu.po b/debian/po/eu.po index 36adafb..3dc4eef 100644 --- a/debian/po/eu.po +++ b/debian/po/eu.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: beep-eu\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2008-07-28 19:33+0200\n" -"PO-Revision-Date: 2008-08-05 11:48+0200\n" +"POT-Creation-Date: 2008-09-11 18:36+0200\n" +"PO-Revision-Date: 2008-11-24 10:10+0100\n" "Last-Translator: Piarres Beobide \n" "Language-Team: Euskara \n" "MIME-Version: 1.0\n" @@ -19,8 +19,20 @@ msgstr "" #. Type: select #. Choices #: ../templates:1001 -msgid "usable for all, usable for group audio, usable only for root" -msgstr "denentzat erabilgarri, audio taldearentzat erabilgarri, root-entzat bakarrik erabilgarri" +msgid "usable for all" +msgstr "denentzat erabilgarri" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable for group audio" +msgstr "audio taldearentzat erabilgarri" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable only for root" +msgstr "root-entzat bakarrik erabilgarri" #. Type: select #. Description @@ -38,9 +50,9 @@ msgid "" "usable for all." msgstr "" "bepp root gisa exekutatu behar da bozgorailu hardwarea atzitu behar bait du. " -"Aukera ezberdinak dauden programa erabilgarri egiteko: Edo root-entzat bakarrik " -"(suid bit gabe), audio taldeko erabiltzaileentzat bakarrik erabilgarri edo denentzat " -"erabilgarri." +"Aukera ezberdinak dauden programa erabilgarri egiteko: Edo root-entzat " +"bakarrik (suid bit gabe), audio taldeko erabiltzaileentzat bakarrik " +"erabilgarri edo denentzat erabilgarri." #. Type: select #. Description @@ -54,5 +66,5 @@ msgstr "" "Suid bit-a ezarririk duen edozein programa segurtasun ahulune bat izan " "daitekeenez ez da lehenespen bezala egingo. Hala ere programa nahiko txikia " "denez (150 kode lerro inguru), beraz nahiko erraza da kodearen segurtasuna " -"zure kabuz egiaztatzea ez bazara pakete mantentzelariaren erabakietaz fidatzen." - +"zure kabuz egiaztatzea ez bazara pakete mantentzelariaren erabakietaz " +"fidatzen." diff --git a/debian/po/fi.po b/debian/po/fi.po index 66da8d7..25351e8 100644 --- a/debian/po/fi.po +++ b/debian/po/fi.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: beep\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2008-07-28 19:33+0200\n" -"PO-Revision-Date: 2008-08-01 15:06+0200\n" +"POT-Creation-Date: 2008-09-11 18:36+0200\n" +"PO-Revision-Date: 2008-11-24 10:10+0100\n" "Last-Translator: Esko Arajärvi \n" "Language-Team: Finnish \n" "MIME-Version: 1.0\n" @@ -14,8 +14,20 @@ msgstr "" #. Type: select #. Choices #: ../templates:1001 -msgid "usable for all, usable for group audio, usable only for root" -msgstr "kaikkien käyttöön, ryhmän audio käyttöön, vain pääkäyttäjän käyttöön" +msgid "usable for all" +msgstr "kaikkien käyttöön" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable for group audio" +msgstr "ryhmän audio käyttöön" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable only for root" +msgstr "vain pääkäyttäjän käyttöön" #. Type: select #. Description @@ -26,12 +38,27 @@ msgstr "Asenna beep:" #. Type: select #. Description #: ../templates:1002 -msgid "beep must be run as root since it needs to access the speaker hardware. There are several possibilities 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 "Ohjelmaa beep täytyy ajaa pääkäyttäjänä, koska sen täytyy voida käyttää koneen kaiutinta. Ohjelma voidaan asentaa useammalla tavalla: kaikkien käyttöön (suid root), vain ryhmän audio käyttöön (suid root ryhmälle audio) tai vain pääkäyttäjän käyttöön." +msgid "" +"beep must be run as root since it needs to access the speaker hardware. " +"There are several possibilities 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 "" +"Ohjelmaa beep täytyy ajaa pääkäyttäjänä, koska sen täytyy voida käyttää " +"koneen kaiutinta. Ohjelma voidaan asentaa useammalla tavalla: kaikkien " +"käyttöön (suid root), vain ryhmän audio käyttöön (suid root ryhmälle audio) " +"tai vain pääkäyttäjän käyttöön." #. Type: select #. Description #: ../templates:1002 -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 the package maintainer's judgement." -msgstr "Koska mikä tahansa suid-bitin kanssa asennettu ohjelma voi olla tietoturvariski, sitä ei oletuksena aseteta. Koska ohjelma kuitenkin on melko pieni (noin 150 riviä koodia), sen turvallisuus on melko helppo tarkistaa tarvittaessa itse." - +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 " +"the package maintainer's judgement." +msgstr "" +"Koska mikä tahansa suid-bitin kanssa asennettu ohjelma voi olla " +"tietoturvariski, sitä ei oletuksena aseteta. Koska ohjelma kuitenkin on " +"melko pieni (noin 150 riviä koodia), sen turvallisuus on melko helppo " +"tarkistaa tarvittaessa itse." diff --git a/debian/po/fr.po b/debian/po/fr.po index 8c5540a..ff20666 100644 --- 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: 2008-07-28 19:33+0200\n" -"PO-Revision-Date: 2008-08-09 19:54-0300\n" +"POT-Creation-Date: 2008-09-11 18:36+0200\n" +"PO-Revision-Date: 2008-11-24 10:10+0100\n" "Last-Translator: Daniel Déchelotte \n" "Language-Team: Debian-l10n-french \n" "MIME-Version: 1.0\n" @@ -26,9 +26,20 @@ msgstr "" #. Type: select #. Choices #: ../templates:1001 -msgid "usable for all, usable for group audio, usable only for root" -msgstr "Utilisable par tous, Utilisable seulement par les membres du " -"groupe « audio », Réservé au superutilisateur" +msgid "usable for all" +msgstr "Utilisable par tous" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable for group audio" +msgstr "Utilisable seulement par les membres du groupe « audio »" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable only for root" +msgstr "Réservé au superutilisateur" #. Type: select #. Description @@ -45,11 +56,11 @@ msgid "" "root (no suid bit at all), executable only by users of the group audio, or " "usable for all." msgstr "" -"Le programme beep doit posséder les privilèges du superutilisateur " -"pour pouvoir accéder au haut-parleur. Cela est possible de plusieurs " -"façons : soit permettre de le lancer avec les privilèges du superutilisateur (« setuid root ») " -"par tous ou uniquement par les membres du groupe « audio », " -"soit réserver l'exécution du programme au superutilisateur." +"Le programme beep doit posséder les privilèges du superutilisateur pour " +"pouvoir accéder au haut-parleur. Cela est possible de plusieurs façons : " +"soit permettre de le lancer avec les privilèges du superutilisateur (« setuid " +"root ») par tous ou uniquement par les membres du groupe « audio », soit " +"réserver l'exécution du programme au superutilisateur." #. Type: select #. Description @@ -60,8 +71,7 @@ msgid "" "is fairly easy to verify the safety of the code yourself, if you don't trust " "the package maintainer's judgement." msgstr "" -"Tout programme qui s'exécute avec les privilèges du superutilisateur peut présenter un risque " -"pour la sécurité du système. Toutefois, ce " -"programme est vraiment petit (environ 150 lignes de code) et il est " -"relativement facile de vérifier par vous-même que le code est sûr, en cas de " -"doute." +"Tout programme qui s'exécute avec les privilèges du superutilisateur peut " +"présenter un risque pour la sécurité du système. Toutefois, ce programme est " +"vraiment petit (environ 150 lignes de code) et il est relativement facile de " +"vérifier par vous-même que le code est sûr, en cas de doute." diff --git a/debian/po/gl.po b/debian/po/gl.po index 145fdc2..26b7c24 100644 --- a/debian/po/gl.po +++ b/debian/po/gl.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: beep\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2008-07-28 19:33+0200\n" -"PO-Revision-Date: 2008-08-01 23:23+0100\n" +"POT-Creation-Date: 2008-09-11 18:36+0200\n" +"PO-Revision-Date: 2008-11-24 10:10+0100\n" "Last-Translator: Jacobo Tarrio \n" "Language-Team: Galician \n" "MIME-Version: 1.0\n" @@ -17,10 +17,20 @@ msgstr "" #. Type: select #. Choices #: ../templates:1001 -msgid "usable for all, usable for group audio, usable only for root" -msgstr "" -"utilizable por todos, utilizable polo grupo audio, utilizable só polo " -"administrador" +msgid "usable for all" +msgstr "utilizable por todos" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable for group audio" +msgstr "utilizable polo grupo audio" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable only for root" +msgstr "utilizable só polo administrador" #. Type: select #. Description diff --git a/debian/po/it.po b/debian/po/it.po index ae5866a..61ec155 100644 --- a/debian/po/it.po +++ b/debian/po/it.po @@ -2,9 +2,9 @@ msgid "" msgstr "" "Project-Id-Version: beep 1.2.2-12\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2008-07-28 19:33+0200\n" +"POT-Creation-Date: 2008-09-11 18:36+0200\n" "PO-Revision-Date: 2007-10-03 19:01+0200\n" -"Last-Translator: Stefano Melchior \n" +"Last-Translator: davide gliozzi \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -13,14 +13,26 @@ msgstr "" #. Type: select #. Choices #: ../templates:1001 -msgid "usable for all, usable for group audio, usable only for root" -msgstr "" +msgid "usable for all" +msgstr "utilizzabile da tutti" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable for group audio" +msgstr "utilizzabile dal gruppo audio" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable only for root" +msgstr "utillizzabile solamente da root" #. Type: select #. Description #: ../templates:1002 msgid "Install beep as:" -msgstr "" +msgstr "Installa beep come:" #. Type: select #. Description diff --git a/debian/po/ja.po b/debian/po/ja.po index 47498eb..8b8666d 100644 --- a/debian/po/ja.po +++ b/debian/po/ja.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: beep 1.2.2-22\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2008-07-28 19:33+0200\n" -"PO-Revision-Date: 2008-08-03 11:10+0900\n" +"POT-Creation-Date: 2008-09-11 18:36+0200\n" +"PO-Revision-Date: 2008-11-24 10:11+0100\n" "Last-Translator: Hideki Yamane (Debian-JP) \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" @@ -27,10 +27,20 @@ msgstr "" #. Type: select #. Choices #: ../templates:1001 -msgid "usable for all, usable for group audio, usable only for root" -msgstr "" -"全ユーザが使えるようにする, audio グループだけが実行できるようにする, root だ" -"けが使えるようにする" +msgid "usable for all" +msgstr "全ユーザが使えるようにする" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable for group audio" +msgstr "audio グループだけが実行できるようにする" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable only for root" +msgstr "root だけが使えるようにする" #. Type: select #. Description diff --git a/debian/po/nl.po b/debian/po/nl.po index be82133..961c233 100644 --- a/debian/po/nl.po +++ b/debian/po/nl.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: beep 1.2.2-11\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2008-07-28 19:33+0200\n" -"PO-Revision-Date: 2007-08-01 10:42+0200\n" +"POT-Creation-Date: 2008-09-11 18:36+0200\n" +"PO-Revision-Date: 2008-11-24 10:11+0100\n" "Last-Translator: Thijs Kinkhorst \n" "Language-Team: dutch \n" "MIME-Version: 1.0\n" @@ -26,8 +26,20 @@ msgstr "" #. Type: select #. Choices #: ../templates:1001 -msgid "usable for all, usable for group audio, usable only for root" -msgstr "te gebruiken door iedereen, te gebruiken door groep audio, alleen te gebruiken door root" +msgid "usable for all" +msgstr "te gebruiken door iedereen" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable for group audio" +msgstr "te gebruiken door groep audio" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable only for root" +msgstr "alleen te gebruiken door root" #. Type: select #. Description @@ -45,9 +57,9 @@ msgid "" "usable for all." msgstr "" "beep dient als root te draaien omdat het toegang nodig heeft tot de " -"luidsprekerhardware. Er zijn verschillende mogelijkheden om het " -"programma bruikbaar te maken: ofwel enkel voor root (geen suid bit), enkel " -"uitvoerbaar door gebruikers in de groep audio, of bruikbaar voor iedereen." +"luidsprekerhardware. Er zijn verschillende mogelijkheden om het programma " +"bruikbaar te maken: ofwel enkel voor root (geen suid bit), enkel uitvoerbaar " +"door gebruikers in de groep audio, of bruikbaar voor iedereen." #. Type: select #. Description @@ -62,4 +74,3 @@ msgstr "" "standaard gedaan. Het programma is vrij klein (~150 regels code), dus kan " "redelijk makkelijk om zelf geverifieerd worden, indien u het oordeel van de " "pakketbeheerder niet vertrouwt." - diff --git a/debian/po/pt.po b/debian/po/pt.po index d07acdb..7009b4d 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: beep 1.2.2-16\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2008-07-28 19:33+0200\n" -"PO-Revision-Date: 2008-08-01 18:07+0100\n" +"POT-Creation-Date: 2008-09-11 18:36+0200\n" +"PO-Revision-Date: 2008-11-24 10:11+0100\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" "MIME-Version: 1.0\n" @@ -16,9 +16,20 @@ msgstr "" #. Type: select #. Choices #: ../templates:1001 -msgid "usable for all, usable for group audio, usable only for root" -msgstr "" -"utilizável para todos, utilizável para o grupo audio, utilizável para o root" +msgid "usable for all" +msgstr "utilizável para todos" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable for group audio" +msgstr "utilizável para o grupo audio" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable only for root" +msgstr "utilizável para o root" #. Type: select #. Description diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po index e68a3e1..02ca2fe 100644 --- a/debian/po/pt_BR.po +++ b/debian/po/pt_BR.po @@ -19,10 +19,11 @@ msgid "" msgstr "" "Project-Id-Version: beep-1.2.2-10\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2008-07-28 19:33+0200\n" -"PO-Revision-Date: 2008-08-12 11:33-0300\n" +"POT-Creation-Date: 2008-09-11 18:36+0200\n" +"PO-Revision-Date: 2008-11-24 10:11+0100\n" "Last-Translator: Felipe Augusto van de Wiel (faw) \n" -"Language-Team: Brazilian Portuguese \n" +"Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -32,8 +33,20 @@ msgstr "" #. Type: select #. Choices #: ../templates:1001 -msgid "usable for all, usable for group audio, usable only for root" -msgstr "usável por todos, usável pelo grupo audio, usável somente pelo root" +msgid "usable for all" +msgstr "usável por todos" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable for group audio" +msgstr "usável pelo grupo audio" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable only for root" +msgstr "usável somente pelo root" #. Type: select #. Description diff --git a/debian/po/ro.po b/debian/po/ro.po index 181b017..1dcc66a 100644 --- a/debian/po/ro.po +++ b/debian/po/ro.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ro\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2008-07-28 19:33+0200\n" -"PO-Revision-Date: 2008-08-02 04:46+0300\n" +"POT-Creation-Date: 2008-09-11 18:36+0200\n" +"PO-Revision-Date: 2008-11-24 10:11+0100\n" "Last-Translator: Eddy Petrișor \n" "Language-Team: debian-l10-romanian \n" "MIME-Version: 1.0\n" @@ -24,10 +24,20 @@ msgstr "" #. Type: select #. Choices #: ../templates:1001 -msgid "usable for all, usable for group audio, usable only for root" -msgstr "" -"utilizabil pentru toți, utilizabil pentru grupul audio, utilizabil doar de " -"root" +msgid "usable for all" +msgstr "utilizabil pentru toți" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable for group audio" +msgstr "utilizabil pentru grupul audio" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable only for root" +msgstr "utilizabil doar de root" #. Type: select #. Description diff --git a/debian/po/ru.po b/debian/po/ru.po index fcfbf74..24b69e1 100644 --- a/debian/po/ru.po +++ b/debian/po/ru.po @@ -18,21 +18,34 @@ msgid "" msgstr "" "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2008-07-28 19:33+0200\n" -"PO-Revision-Date: 2008-08-01 19:22+0400\n" +"POT-Creation-Date: 2008-09-11 18:36+0200\n" +"PO-Revision-Date: 2008-11-24 10:11+0100\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #. Type: select #. Choices #: ../templates:1001 -msgid "usable for all, usable for group audio, usable only for root" -msgstr "использовать всем, использовать группе audio, использовать только суперпользователю" +msgid "usable for all" +msgstr "использовать всем" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable for group audio" +msgstr "использовать группе audio" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable only for root" +msgstr "использовать только суперпользователю" #. Type: select #. Description @@ -50,9 +63,10 @@ msgid "" "usable for all." msgstr "" "Для работы программе beep нужно иметь права суперпользователя, так как ей " -"нужен доступ к динамику. Поэтому есть несколько вариантов установки, при которых: " -"её будет использовать только суперпользователь (не устанавливать бит suid), " -"её будут использовать все из группы audio, или её сможет использовать любой." +"нужен доступ к динамику. Поэтому есть несколько вариантов установки, при " +"которых: её будет использовать только суперпользователь (не устанавливать " +"бит suid), её будут использовать все из группы audio, или её сможет " +"использовать любой." #. Type: select #. Description @@ -67,4 +81,3 @@ msgstr "" "поэтому suid-бит по умолчанию не устанавливается. Однако, программа " "исключительно мала (~150 строк кода), и безопасность её кода очень легко " "проверить самостоятельно, если не вы доверяете сопровождающему." - diff --git a/debian/po/sv.po b/debian/po/sv.po index 2c3259e..c6a6dfd 100644 --- a/debian/po/sv.po +++ b/debian/po/sv.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: beep\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2008-07-28 19:33+0200\n" -"PO-Revision-Date: 2008-08-02 11:06+0100\n" +"POT-Creation-Date: 2008-09-11 18:36+0200\n" +"PO-Revision-Date: 2008-11-24 10:11+0100\n" "Last-Translator: Martin Bagge \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" @@ -26,10 +26,20 @@ msgstr "" #. Type: select #. Choices #: ../templates:1001 -msgid "usable for all, usable for group audio, usable only for root" -msgstr "" -"krbar fr all, krbar fr gruppen \"audio\", krbar endast fr root-" -"anvndaren." +msgid "usable for all" +msgstr "krbar fr all" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable for group audio" +msgstr "krbar fr gruppen \"audio\"" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable only for root" +msgstr "krbar endast fr root-anvndaren." #. Type: select #. Description diff --git a/debian/po/templates.pot b/debian/po/templates.pot index f658f49..8816ee1 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2003-2008 Gerfried Fuchs -# This file is distributed under the same license as the beep package. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: beep 1.2.2-22\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2008-07-28 19:33+0200\n" +"POT-Creation-Date: 2008-09-11 18:36+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -19,7 +19,19 @@ msgstr "" #. Type: select #. Choices #: ../templates:1001 -msgid "usable for all, usable for group audio, usable only for root" +msgid "usable for all" +msgstr "" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable for group audio" +msgstr "" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable only for root" msgstr "" #. Type: select diff --git a/debian/po/vi.po b/debian/po/vi.po index 676497c..803a6c5 100644 --- a/debian/po/vi.po +++ b/debian/po/vi.po @@ -1,75 +1,69 @@ # Vietnamese translation for Beep. -# Copyright © 2006 Free Software Foundation, Inc. -# Clytie Siddall , 2005-2006. +# Copyright © 2008 Free Software Foundation, Inc. +# Clytie Siddall , 2005-2008. # msgid "" msgstr "" -"Project-Id-Version: beep 1.2.2-18\n" +"Project-Id-Version: beep 1.2.2-22\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" -"POT-Creation-Date: 2008-07-28 19:33+0200\n" -"PO-Revision-Date: 2006-06-23 03:49-0500\n" +"POT-Creation-Date: 2008-09-11 18:36+0200\n" +"PO-Revision-Date: 2008-11-24 10:11+0100\n" "Last-Translator: Clytie Siddall \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: LocFactoryEditor 1.7b3\n" #. Type: select #. Choices #: ../templates:1001 -msgid "usable for all, usable for group audio, usable only for root" -msgstr "" +msgid "usable for all" +msgstr "sử dụng được cho tất cả" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable for group audio" +msgstr "sử dụng được cho nhóm audio" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable only for root" +msgstr "sử dụng được chỉ cho root" #. Type: select #. Description #: ../templates:1002 msgid "Install beep as:" -msgstr "Cài đặt beep dạng:" +msgstr "Cài đặt beep là:" #. Type: select #. Description #: ../templates:1002 -#, fuzzy -#| 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." msgid "" "beep must be run as root since it needs to access the speaker hardware. " "There are several possibilities 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 "" -"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 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." +"beep phải chạy là người chủ (root) vì nó cần phải truy cập đến phần cứng " +"loa. Có vài tùy chọn đặt quyển truy cập:\n" +" • chỉ cho người chủ sử dụng (không có bit suid)\n" +" • chỉ cho các người dùng của nhóm audio sử dụng\n" +" • cho mọi người sử dụng." #. Type: select #. Description #: ../templates:1002 -#, 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." 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 " "the package maintainer's judgement." msgstr "" -"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." - -#~ 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 cho phép âm thanh " -#~ "nhóm chạy, không có « suid root » nào cả" +"Vì mỗi chương trình đặt là suid root thì có thể rủi ro bảo mật, việc này " +"không phải được làm theo mặc định. Tuy nhiên, chương trình hơi nhỏ (~150 " +"dòng mã) cũng hơi dễ kiểm tra mã an toàn hay không, nếu bạn không tùy theo ý " +"kiến của nhà duy trì gói phần mềm." diff --git a/debian/postinst b/debian/postinst index 34b56d5..b60608e 100644 --- a/debian/postinst +++ b/debian/postinst @@ -1,5 +1,7 @@ #!/bin/sh -e # postinst for beep +# copyright 2002-2009 by Gerfried Fuchs +# Licenced under BSD style # Source debconf library. if [ -e /usr/share/debconf/confmodule ]; then @@ -16,12 +18,6 @@ if [ -e /usr/share/debconf/confmodule ]; then suid="$RET" fi -# repair typo in option (see #135866) -if [ "$suid" = "suid root with only group audio executeable" ] ; then - db_set beep/suid_option "suid root with only group audio executable" - suid="suid root with only group audio executable" -fi - # option changes as suggested by #492724 if [ "$suid" = "suid root for all" ] ; then db_set beep/suid_option "usable for all" diff --git a/debian/postrm b/debian/postrm index fa9ecee..18f3b59 100644 --- a/debian/postrm +++ b/debian/postrm @@ -1,5 +1,7 @@ #!/bin/sh -e # postrm for beep +# copyright 2002-2009 by Gerfried Fuchs +# Licenced under BSD style if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then . /usr/share/debconf/confmodule diff --git a/debian/rules b/debian/rules index 1c788f5..9b0ba2a 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f # debian/rules file for beep -# copyright 2002++ by Gerfried Fuchs -# Licenced the same way as beep itself +# copyright 2002-2009 by Gerfried Fuchs +# Licenced under BSD style PKG1 = beep TMP1 = $(CURDIR)/debian/$(PKG1) diff --git a/debian/templates b/debian/templates index cce7826..a6d42a9 100644 --- a/debian/templates +++ b/debian/templates @@ -1,6 +1,6 @@ Template: beep/suid_option Type: select -_Choices: usable for all, usable for group audio, usable only for root +__Choices: usable for all, usable for group audio, usable only for root Default: suid root with only group audio executable _Description: Install beep as: beep must be run as root since it needs to access the speaker hardware. From 6dd0f82935477ccf7e42aa09d178baed04aa406d Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Mon, 21 Dec 2009 23:20:38 +0100 Subject: [PATCH 12/48] Imported Debian patch 1.2.2-24 --- debian/changelog | 8 ++++++++ debian/control | 2 +- debian/rules | 12 +++++++----- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 576a841..b80f9bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +beep (1.2.2-24) unstable; urgency=low + + * Apply patch from Frans Pop for making beep-udeb depend on libc6-udeb + instead of libc6 (closes: #562001) + * Bump Standards-Version to 3.8.3. + + -- Gerfried Fuchs Mon, 21 Dec 2009 23:20:38 +0100 + beep (1.2.2-23) unstable; urgency=low * Updated translation: diff --git a/debian/control b/debian/control index c42456e..fc9d41f 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: sound Priority: optional Maintainer: Gerfried Fuchs Build-Depends: po-debconf, patch, quilt -Standards-Version: 3.8.1 +Standards-Version: 3.8.3 Homepage: http://johnath.com/beep/ Package: beep diff --git a/debian/rules b/debian/rules index 9b0ba2a..8e970f6 100755 --- a/debian/rules +++ b/debian/rules @@ -34,7 +34,7 @@ include /usr/share/quilt/quilt.make clean: unpatch $(checkdir) $(checkroot) - -rm -rf $(TMP1) $(TMP2) debian/substvars debian/files build-stamp + -rm -rf $(TMP1) $(TMP2) debian/$(PKG1).substvars debian/$(PKG2).substvars debian/files build-stamp [ ! -f beep ] || $(MAKE) clean @@ -48,7 +48,7 @@ build-stamp: patch install: build $(checkdir) $(checkroot) - -rm -rf $(TMP1) $(TMP2) debian/substvars + -rm -rf $(TMP1) $(TMP2) debian/$(PKG1).substvars debian/$(PKG2).substvars $(INSTALL_DIR) $(TMP1) cd $(TMP1) && $(INSTALL_DIR) usr/bin usr/share/man/man1 \ usr/share/doc/$(PKG1) @@ -86,13 +86,15 @@ binary-arch: build install $(INSTALL_SCRIPT) debian/postinst debian/postrm debian/config \ $(TMP1)/DEBIAN po2debconf debian/templates > $(TMP1)/DEBIAN/templates - dpkg-shlibdeps -Tdebian/substvars -dDepends $(TMP1)/usr/bin/beep - dpkg-gencontrol -ldebian/changelog -isp -Tdebian/substvars -p$(PKG1) \ + dpkg-shlibdeps -Tdebian/$(PKG1).substvars -dDepends $(TMP1)/usr/bin/beep + dpkg-gencontrol -ldebian/changelog -isp -Tdebian/$(PKG1).substvars -p$(PKG1) \ -P$(TMP1) cd $(TMP1) && find * -type f ! -regex '^DEBIAN/.*' -print0 | \ xargs -r0 md5sum > DEBIAN/md5sums dpkg --build $(TMP1) .. - dpkg-gencontrol -ldebian/changelog -isp -Tdebian/substvars -p$(PKG2) \ + dpkg-shlibdeps -Tdebian/$(PKG2).substvars -dDepends -tudeb \ + $(TMP2)/usr/bin/beep + dpkg-gencontrol -ldebian/changelog -isp -Tdebian/$(PKG2).substvars -p$(PKG2) \ -P$(TMP2) -UHomepage -n$(PKG2)_$(VERSION)_$(ARCH).udeb dpkg --build $(TMP2) ../$(PKG2)_$(VERSION)_$(ARCH).udeb From 159a2ee6f9576bab36ad79c8df9c8dc72d7cd51a Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Thu, 17 Jun 2010 12:34:38 +0200 Subject: [PATCH 13/48] Bump Standards-Version to 3.8.4 --- debian/changelog | 6 ++++++ debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b80f9bc..440933f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +beep (1.2.2-25) unstable; urgency=low + + * Bump Standards-Version to 3.8.4. + + -- + beep (1.2.2-24) unstable; urgency=low * Apply patch from Frans Pop for making beep-udeb depend on libc6-udeb diff --git a/debian/control b/debian/control index fc9d41f..e14bcf1 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: sound Priority: optional Maintainer: Gerfried Fuchs Build-Depends: po-debconf, patch, quilt -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 Homepage: http://johnath.com/beep/ Package: beep From f176817545437bf76f18bec8532eec2ef7228a93 Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Thu, 17 Jun 2010 12:35:57 +0200 Subject: [PATCH 14/48] Add Vcs-* fields to control file --- debian/changelog | 1 + debian/control | 2 ++ 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index 440933f..6ef7c2b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ beep (1.2.2-25) unstable; urgency=low * Bump Standards-Version to 3.8.4. + * Add Vcs-* fields to control file. -- diff --git a/debian/control b/debian/control index e14bcf1..cdb74a8 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,8 @@ Maintainer: Gerfried Fuchs Build-Depends: po-debconf, patch, quilt Standards-Version: 3.8.4 Homepage: http://johnath.com/beep/ +Vcs-Browser: http://git.deb.at/w/pkg/beep.git +Vcs-Git: git://git.deb.at/pkg/beep.git Package: beep Architecture: any From bce08cdd705575d93364bfdd73366bad0716ea1b Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Tue, 13 Jul 2010 16:04:53 +0200 Subject: [PATCH 15/48] Bump to policy 3.9.0 --- debian/changelog | 2 +- debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6ef7c2b..2875d9b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ beep (1.2.2-25) unstable; urgency=low - * Bump Standards-Version to 3.8.4. + * Bump Standards-Version to 3.9.0. * Add Vcs-* fields to control file. -- diff --git a/debian/control b/debian/control index cdb74a8..41ad550 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: sound Priority: optional Maintainer: Gerfried Fuchs Build-Depends: po-debconf, patch, quilt -Standards-Version: 3.8.4 +Standards-Version: 3.9.0 Homepage: http://johnath.com/beep/ Vcs-Browser: http://git.deb.at/w/pkg/beep.git Vcs-Git: git://git.deb.at/pkg/beep.git From 5b5b994619460ee3b318e6b01f516fd99cc3264a Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Tue, 13 Jul 2010 16:12:40 +0200 Subject: [PATCH 16/48] Relicensed Debian packaging under WTFPLv2 --- debian/changelog | 1 + debian/config | 3 +++ debian/copyright | 21 +++++++++++++++++---- debian/postinst | 2 +- debian/postrm | 2 +- debian/rules | 2 +- 6 files changed, 24 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2875d9b..6fada5e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ beep (1.2.2-25) unstable; urgency=low * Bump Standards-Version to 3.9.0. * Add Vcs-* fields to control file. + * Relicensed Debian packaging under WTFPLv2. -- diff --git a/debian/config b/debian/config index aa95410..c0c4226 100644 --- a/debian/config +++ b/debian/config @@ -1,4 +1,7 @@ #!/bin/sh -e +# debian/config file for beep +# copyright 2002-2009 by Gerfried Fuchs +# Licenced under WTFPLv2 # Source debconf library. . /usr/share/debconf/confmodule diff --git a/debian/copyright b/debian/copyright index d2d6d8c..d6af07b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -17,11 +17,24 @@ This software is copyright (C) 2000 by Johnathan Nightingale. implied warranties of merchantability or fitness for a particular use or ability to breed pandas in captivity, it just can't be done. -The Debian packaging is Copyright 2002-2009 by -Gerfried Fuchs and is licensed under the BSD license. -See /usr/share/common-licenses/BSD for the full text of it. - On Debian GNU/Linux systems, the complete text of the GNU General Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'. Later versions which the GNU project publishes on the above mentioned URL can be found in the same directory. + + +The debianization of the package is licensed under the WTFPLv2: + + DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + Version 2, December 2004 + + Copyright (C) 2002-2009 Gerfried Fuchs + + Everyone is permitted to copy and distribute verbatim or modified + copies of this license document, and changing it is allowed as long + as the name is changed. + + DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. You just DO WHAT THE FUCK YOU WANT TO. diff --git a/debian/postinst b/debian/postinst index b60608e..c72f477 100644 --- a/debian/postinst +++ b/debian/postinst @@ -1,7 +1,7 @@ #!/bin/sh -e # postinst for beep # copyright 2002-2009 by Gerfried Fuchs -# Licenced under BSD style +# Licenced under WTFPLv2 # Source debconf library. if [ -e /usr/share/debconf/confmodule ]; then diff --git a/debian/postrm b/debian/postrm index 18f3b59..a1444aa 100644 --- a/debian/postrm +++ b/debian/postrm @@ -1,7 +1,7 @@ #!/bin/sh -e # postrm for beep # copyright 2002-2009 by Gerfried Fuchs -# Licenced under BSD style +# Licenced under WTFPLv2 if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then . /usr/share/debconf/confmodule diff --git a/debian/rules b/debian/rules index 8e970f6..833d4b5 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f # debian/rules file for beep # copyright 2002-2009 by Gerfried Fuchs -# Licenced under BSD style +# Licenced under WTFPLv2 PKG1 = beep TMP1 = $(CURDIR)/debian/$(PKG1) From f3e39c9b326d18fb4f71b0917fdd3a17e60a0e14 Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Tue, 13 Jul 2010 16:13:16 +0200 Subject: [PATCH 17/48] Explicitly call set -e --- debian/changelog | 1 + debian/config | 4 +++- debian/postinst | 4 +++- debian/postrm | 4 +++- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6fada5e..41d540a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ beep (1.2.2-25) unstable; urgency=low * Bump Standards-Version to 3.9.0. * Add Vcs-* fields to control file. * Relicensed Debian packaging under WTFPLv2. + * Explicitly call set -e instead of -e on the hashbang line. -- diff --git a/debian/config b/debian/config index c0c4226..9cd24db 100644 --- a/debian/config +++ b/debian/config @@ -1,8 +1,10 @@ -#!/bin/sh -e +#!/bin/sh # debian/config file for beep # copyright 2002-2009 by Gerfried Fuchs # Licenced under WTFPLv2 +set -e + # Source debconf library. . /usr/share/debconf/confmodule diff --git a/debian/postinst b/debian/postinst index c72f477..2067f5b 100644 --- a/debian/postinst +++ b/debian/postinst @@ -1,8 +1,10 @@ -#!/bin/sh -e +#!/bin/sh # postinst for beep # copyright 2002-2009 by Gerfried Fuchs # Licenced under WTFPLv2 +set -e + # Source debconf library. if [ -e /usr/share/debconf/confmodule ]; then . /usr/share/debconf/confmodule diff --git a/debian/postrm b/debian/postrm index a1444aa..109fca0 100644 --- a/debian/postrm +++ b/debian/postrm @@ -1,8 +1,10 @@ -#!/bin/sh -e +#!/bin/sh # postrm for beep # copyright 2002-2009 by Gerfried Fuchs # Licenced under WTFPLv2 +set -e + if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then . /usr/share/debconf/confmodule db_purge From c6e3efca51037d7ff2f3e0694f3c75543532b1be Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Tue, 17 May 2011 09:02:08 +0200 Subject: [PATCH 18/48] Bump to Standards-Version 3.9.2 --- debian/changelog | 2 +- debian/control | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 41d540a..d1cc146 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ beep (1.2.2-25) unstable; urgency=low - * Bump Standards-Version to 3.9.0. + * Bump Standards-Version to 3.9.2. * Add Vcs-* fields to control file. * Relicensed Debian packaging under WTFPLv2. * Explicitly call set -e instead of -e on the hashbang line. diff --git a/debian/control b/debian/control index 41ad550..d2023cf 100644 --- a/debian/control +++ b/debian/control @@ -1,9 +1,9 @@ Source: beep Section: sound Priority: optional -Maintainer: Gerfried Fuchs +Maintainer: Gerfried Fuchs Build-Depends: po-debconf, patch, quilt -Standards-Version: 3.9.0 +Standards-Version: 3.9.2 Homepage: http://johnath.com/beep/ Vcs-Browser: http://git.deb.at/w/pkg/beep.git Vcs-Git: git://git.deb.at/pkg/beep.git From f3017edd28496fb07f4ba724c216f884c5127d7f Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Tue, 17 May 2011 09:31:46 +0200 Subject: [PATCH 19/48] Imported Upstream version 1.3 From 5fa1146af48a9a037736581e400431c71bd93b29 Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Tue, 17 May 2011 09:42:46 +0200 Subject: [PATCH 20/48] New Upstream release importing all our changes --- debian/changelog | 3 +- debian/patches/01_makefile-fixup | 14 --- debian/patches/02_verbose-option | 79 -------------- debian/patches/03_multiple-freq | 47 -------- debian/patches/04_serial-console-fix | 18 ---- debian/patches/05_devfs-fix | 24 ----- debian/patches/06_event-option | 154 --------------------------- debian/patches/series | 6 -- 8 files changed, 2 insertions(+), 343 deletions(-) delete mode 100644 debian/patches/01_makefile-fixup delete mode 100644 debian/patches/02_verbose-option delete mode 100644 debian/patches/03_multiple-freq delete mode 100644 debian/patches/04_serial-console-fix delete mode 100644 debian/patches/05_devfs-fix delete mode 100644 debian/patches/06_event-option diff --git a/debian/changelog b/debian/changelog index d1cc146..a458c69 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -beep (1.2.2-25) unstable; urgency=low +beep (1.3-1) unstable; urgency=low + * New Upstream release importing all our changes \o/ * Bump Standards-Version to 3.9.2. * Add Vcs-* fields to control file. * Relicensed Debian packaging under WTFPLv2. diff --git a/debian/patches/01_makefile-fixup b/debian/patches/01_makefile-fixup deleted file mode 100644 index 627f71d..0000000 --- a/debian/patches/01_makefile-fixup +++ /dev/null @@ -1,14 +0,0 @@ -Author: Gerfried Fuchs vim:ft=diff: -Description: Do not remove a file from the system on install - -Index: beep-1.2.2/Makefile -=================================================================== ---- beep-1.2.2.orig/Makefile -+++ beep-1.2.2/Makefile -@@ -15,5 +15,5 @@ beep : beep.c - - install : - cp ${EXEC_NAME} ${INSTALL_DIR} -- rm -f /usr/man/man1/beep.1.bz2 -+ # rm -f /usr/man/man1/beep.1.bz2 - cp ${MAN_FILE} ${MAN_DIR} diff --git a/debian/patches/02_verbose-option b/debian/patches/02_verbose-option deleted file mode 100644 index 159af4f..0000000 --- a/debian/patches/02_verbose-option +++ /dev/null @@ -1,79 +0,0 @@ -Author: Gerfried Fuchs vim:ft=diff: -Description: Add support for --verbose/--debug option (BTS #297791, #335027) - -Index: beep-1.2.2/beep.c -=================================================================== ---- beep-1.2.2.orig/beep.c -+++ beep-1.2.2/beep.c -@@ -83,6 +83,7 @@ typedef struct beep_parms_t { - so that beep can be tucked appropriately into a text- - processing pipe. - */ -+ int verbose; /* verbose output? */ - struct beep_parms_t *next; /* in case -n/--new is used. */ - } beep_parms_t; - -@@ -110,7 +111,7 @@ void handle_signal(int signum) { - /* print usage and exit */ - void usage_bail(const char *executable_name) { - printf("Usage:\n%s [-f freq] [-l length] [-r reps] [-d delay] " -- "[-D delay] [-s] [-c]\n", -+ "[-D delay] [-s] [-c] [--verbose | --debug]\n", - executable_name); - printf("%s [Options...] [-n] [--new] [Options...] ... \n", executable_name); - printf("%s [-h] [--help]\n", executable_name); -@@ -131,6 +132,7 @@ void usage_bail(const char *executable_n - * "-D " (similar to -d, but delay after last repetition as well) - * "-s" (beep after each line of input from stdin, echo line to stdout) - * "-c" (beep after each char of input from stdin, echo char to stdout) -+ * "--verbose/--debug" - * "-h/--help" - * "-v/-V/--version" - * "-n/--new" -@@ -141,9 +143,11 @@ void usage_bail(const char *executable_n - void parse_command_line(int argc, char **argv, beep_parms_t *result) { - int c; - -- struct option opt_list[4] = {{"help", 0, NULL, 'h'}, -+ struct option opt_list[6] = {{"help", 0, NULL, 'h'}, - {"version", 0, NULL, 'V'}, - {"new", 0, NULL, 'n'}, -+ {"verbose", 0, NULL, 'X'}, -+ {"debug", 0, NULL, 'X'}, - {0,0,0,0}}; - while((c = getopt_long(argc, argv, "f:l:r:d:D:schvVn", opt_list, NULL)) - != EOF) { -@@ -204,9 +208,13 @@ void parse_command_line(int argc, char * - result->next->delay = DEFAULT_DELAY; - result->next->end_delay = DEFAULT_END_DELAY; - result->next->stdin_beep = DEFAULT_STDIN_BEEP; -+ result->next->verbose = result->verbose; - result->next->next = NULL; - result = result->next; /* yes, I meant to do that. */ - break; -+ case 'X' : /* --debug / --verbose */ -+ result->verbose = 1; -+ break; - case 'h' : /* notice that this is also --help */ - default : - usage_bail(argv[0]); -@@ -217,6 +225,11 @@ void parse_command_line(int argc, char * - void play_beep(beep_parms_t parms) { - int i; /* loop counter */ - -+ if(parms.verbose == 1) -+ fprintf(stderr, "[DEBUG] %d times %d ms beeps (%d delay between, " -+ "%d delay after) @ %.2f Hz\n", -+ parms.reps, parms.length, parms.delay, parms.end_delay, parms.freq); -+ - /* try to snag the console */ - if((console_fd = open("/dev/console", O_WRONLY)) == -1) { - fprintf(stderr, "Could not open /dev/console for writing.\n"); -@@ -253,6 +266,7 @@ int main(int argc, char **argv) { - parms->delay = DEFAULT_DELAY; - parms->end_delay = DEFAULT_END_DELAY; - parms->stdin_beep = DEFAULT_STDIN_BEEP; -+ parms->verbose = 0; - parms->next = NULL; - - signal(SIGINT, handle_signal); diff --git a/debian/patches/03_multiple-freq b/debian/patches/03_multiple-freq deleted file mode 100644 index 2a8cbb1..0000000 --- a/debian/patches/03_multiple-freq +++ /dev/null @@ -1,47 +0,0 @@ -Author: Gerfried Fuchs vim:ft=diff: -Description: Print warning on multiple -f values (BTS #270056) - -Index: beep-1.2.2/beep.c -=================================================================== ---- beep-1.2.2.orig/beep.c -+++ beep-1.2.2/beep.c -@@ -159,6 +159,9 @@ void parse_command_line(int argc, char * - (argfreq <= 0)) - usage_bail(argv[0]); - else -+ if (result->freq != 0) -+ fprintf(stderr, "WARNING: multiple -f values given, only last " -+ "one is used.\n"); - result->freq = argfreq; - break; - case 'l' : /* length */ -@@ -201,8 +204,10 @@ void parse_command_line(int argc, char * - exit(0); - break; - case 'n' : /* also --new - create another beep */ -+ if (result->freq == 0) -+ result->freq = DEFAULT_FREQ; - result->next = (beep_parms_t *)malloc(sizeof(beep_parms_t)); -- result->next->freq = DEFAULT_FREQ; -+ result->next->freq = 0; - result->next->length = DEFAULT_LENGTH; - result->next->reps = DEFAULT_REPS; - result->next->delay = DEFAULT_DELAY; -@@ -220,6 +225,8 @@ void parse_command_line(int argc, char * - usage_bail(argv[0]); - } - } -+ if (result->freq == 0) -+ result->freq = DEFAULT_FREQ; - } - - void play_beep(beep_parms_t parms) { -@@ -260,7 +267,7 @@ int main(int argc, char **argv) { - char sin[4096], *ptr; - - beep_parms_t *parms = (beep_parms_t *)malloc(sizeof(beep_parms_t)); -- parms->freq = DEFAULT_FREQ; -+ parms->freq = 0; - parms->length = DEFAULT_LENGTH; - parms->reps = DEFAULT_REPS; - parms->delay = DEFAULT_DELAY; diff --git a/debian/patches/04_serial-console-fix b/debian/patches/04_serial-console-fix deleted file mode 100644 index 908c1ac..0000000 --- a/debian/patches/04_serial-console-fix +++ /dev/null @@ -1,18 +0,0 @@ -Author: Benjamin Gilbert vim:ft=diff: -Description: Open tty0 instead of console (BTS #134015) - -Index: beep-1.2.2/beep.c -=================================================================== ---- beep-1.2.2.orig/beep.c -+++ beep-1.2.2/beep.c -@@ -238,8 +238,8 @@ void play_beep(beep_parms_t parms) { - parms.reps, parms.length, parms.delay, parms.end_delay, parms.freq); - - /* try to snag the console */ -- if((console_fd = open("/dev/console", O_WRONLY)) == -1) { -- fprintf(stderr, "Could not open /dev/console for writing.\n"); -+ if((console_fd = open("/dev/tty0", O_WRONLY)) == -1) { -+ fprintf(stderr, "Could not open /dev/tty0 for writing.\n"); - printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ - perror("open"); - exit(1); diff --git a/debian/patches/05_devfs-fix b/debian/patches/05_devfs-fix deleted file mode 100644 index 93f14fb..0000000 --- a/debian/patches/05_devfs-fix +++ /dev/null @@ -1,24 +0,0 @@ -Author: Goswin Brederlow vim:ft=diff: -Description: Also try /dev/vc/0, devfs support (BTS #148884) - -Index: beep-1.2.2/beep.c -=================================================================== ---- beep-1.2.2.orig/beep.c -+++ beep-1.2.2/beep.c -@@ -239,10 +239,12 @@ void play_beep(beep_parms_t parms) { - - /* try to snag the console */ - if((console_fd = open("/dev/tty0", O_WRONLY)) == -1) { -- fprintf(stderr, "Could not open /dev/tty0 for writing.\n"); -- printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ -- perror("open"); -- exit(1); -+ if((console_fd = open("/dev/vc/0", O_WRONLY)) == -1) { -+ fprintf(stderr, "Could not open /dev/tty0 or /dev/vc/0 for writing.\n"); -+ printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ -+ perror("open"); -+ exit(1); -+ } - } - - /* Beep */ diff --git a/debian/patches/06_event-option b/debian/patches/06_event-option deleted file mode 100644 index f6b7895..0000000 --- a/debian/patches/06_event-option +++ /dev/null @@ -1,154 +0,0 @@ -Author: Alessandro Zummo vim:ft=diff: -Description: evdev and general device node support (BTS #350214) - -Index: beep-1.2.2/beep.c -=================================================================== ---- beep-1.2.2.orig/beep.c -+++ beep-1.2.2/beep.c -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - - /* I don't know where this number comes from, I admit that freely. A - wonderful human named Raine M. Ekman used it in a program that played -@@ -87,18 +88,48 @@ typedef struct beep_parms_t { - struct beep_parms_t *next; /* in case -n/--new is used. */ - } beep_parms_t; - -+enum { BEEP_TYPE_CONSOLE, BEEP_TYPE_EVDEV }; -+ - /* Momma taught me never to use globals, but we need something the signal - handlers can get at.*/ - int console_fd = -1; -+int console_type = BEEP_TYPE_CONSOLE; -+char *console_device = NULL; -+ -+ -+void do_beep(int freq) { -+ if (console_type == BEEP_TYPE_CONSOLE) { -+ if(ioctl(console_fd, KIOCSOUND, freq != 0 -+ ? (int)(CLOCK_TICK_RATE/freq) -+ : freq) < 0) { -+ printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ -+ perror("ioctl"); -+ } -+ } else { -+ /* BEEP_TYPE_EVDEV */ -+ struct input_event e; -+ -+ e.type = EV_SND; -+ e.code = SND_TONE; -+ e.value = freq; -+ -+ write(console_fd, &e, sizeof(struct input_event)); -+ } -+} -+ - - /* If we get interrupted, it would be nice to not leave the speaker beeping in - perpetuity. */ - void handle_signal(int signum) { -+ -+ if(console_device) -+ free(console_device); -+ - switch(signum) { - case SIGINT: - if(console_fd >= 0) { - /* Kill the sound, quit gracefully */ -- ioctl(console_fd, KIOCSOUND, 0); -+ do_beep(0); - close(console_fd); - exit(signum); - } else { -@@ -111,7 +142,7 @@ void handle_signal(int signum) { - /* print usage and exit */ - void usage_bail(const char *executable_name) { - printf("Usage:\n%s [-f freq] [-l length] [-r reps] [-d delay] " -- "[-D delay] [-s] [-c] [--verbose | --debug]\n", -+ "[-D delay] [-s] [-c] [--verbose | --debug] [-e device]\n", - executable_name); - printf("%s [Options...] [-n] [--new] [Options...] ... \n", executable_name); - printf("%s [-h] [--help]\n", executable_name); -@@ -143,13 +174,14 @@ void usage_bail(const char *executable_n - void parse_command_line(int argc, char **argv, beep_parms_t *result) { - int c; - -- struct option opt_list[6] = {{"help", 0, NULL, 'h'}, -+ struct option opt_list[7] = {{"help", 0, NULL, 'h'}, - {"version", 0, NULL, 'V'}, - {"new", 0, NULL, 'n'}, - {"verbose", 0, NULL, 'X'}, - {"debug", 0, NULL, 'X'}, -+ {"device", 1, NULL, 'e'}, - {0,0,0,0}}; -- while((c = getopt_long(argc, argv, "f:l:r:d:D:schvVn", opt_list, NULL)) -+ while((c = getopt_long(argc, argv, "f:l:r:d:D:schvVne:", opt_list, NULL)) - != EOF) { - int argval = -1; /* handle parsed numbers for various arguments */ - float argfreq = -1; -@@ -220,6 +252,9 @@ void parse_command_line(int argc, char * - case 'X' : /* --debug / --verbose */ - result->verbose = 1; - break; -+ case 'e' : /* also --device */ -+ console_device = strdup(optarg); -+ break; - case 'h' : /* notice that this is also --help */ - default : - usage_bail(argv[0]); -@@ -238,24 +273,31 @@ void play_beep(beep_parms_t parms) { - parms.reps, parms.length, parms.delay, parms.end_delay, parms.freq); - - /* try to snag the console */ -- if((console_fd = open("/dev/tty0", O_WRONLY)) == -1) { -- if((console_fd = open("/dev/vc/0", O_WRONLY)) == -1) { -- fprintf(stderr, "Could not open /dev/tty0 or /dev/vc/0 for writing.\n"); -- printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ -- perror("open"); -- exit(1); -- } -+ if(console_device) -+ console_fd = open(console_device, O_WRONLY); -+ else -+ 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", -+ console_device != NULL ? console_device : "/dev/tty0 or /dev/vc/0"); -+ printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ -+ perror("open"); -+ exit(1); - } -+ -+ if (ioctl(console_fd, EVIOCGSND(0)) != -1) -+ console_type = BEEP_TYPE_EVDEV; -+ else -+ console_type = BEEP_TYPE_CONSOLE; - - /* Beep */ - for (i = 0; i < parms.reps; i++) { /* start beep */ -- if(ioctl(console_fd, KIOCSOUND, (int)(CLOCK_TICK_RATE/parms.freq)) < 0) { -- printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ -- perror("ioctl"); -- } -+ do_beep(parms.freq); - /* Look ma, I'm not ansi C compatible! */ - usleep(1000*parms.length); /* wait... */ -- ioctl(console_fd, KIOCSOUND, 0); /* stop beep */ -+ do_beep(0); /* stop beep */ - if(parms.end_delay || (i+1 < parms.reps)) - usleep(1000*parms.delay); /* wait... */ - } /* repeat. */ -@@ -318,5 +360,8 @@ int main(int argc, char **argv) { - parms = next; - } - -+ if(console_device) -+ free(console_device); -+ - return EXIT_SUCCESS; - } diff --git a/debian/patches/series b/debian/patches/series index d9cc348..e69de29 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +0,0 @@ -01_makefile-fixup -02_verbose-option -03_multiple-freq -04_serial-console-fix -05_devfs-fix -06_event-option From 42fbadaed1341078de750a6bc9166b8223dbb908 Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Tue, 31 May 2011 20:48:37 +0200 Subject: [PATCH 21/48] Update copyright year and email address --- debian/config | 2 +- debian/copyright | 2 +- debian/postinst | 2 +- debian/postrm | 2 +- debian/rules | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/config b/debian/config index 9cd24db..55aa737 100644 --- a/debian/config +++ b/debian/config @@ -1,6 +1,6 @@ #!/bin/sh # debian/config file for beep -# copyright 2002-2009 by Gerfried Fuchs +# copyright 2002-2011 by Gerfried Fuchs # Licenced under WTFPLv2 set -e diff --git a/debian/copyright b/debian/copyright index d6af07b..a4f080d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -This package was debianized by Gerfried Fuchs on +This package was debianized by Gerfried Fuchs on Thu, 18 Oct 2001 09:26:50 +0200. It was downloaded from http://www.johnath.com/beep/ diff --git a/debian/postinst b/debian/postinst index 2067f5b..fb659d6 100644 --- a/debian/postinst +++ b/debian/postinst @@ -1,6 +1,6 @@ #!/bin/sh # postinst for beep -# copyright 2002-2009 by Gerfried Fuchs +# copyright 2002-2011 by Gerfried Fuchs # Licenced under WTFPLv2 set -e diff --git a/debian/postrm b/debian/postrm index 109fca0..0f2545f 100644 --- a/debian/postrm +++ b/debian/postrm @@ -1,6 +1,6 @@ #!/bin/sh # postrm for beep -# copyright 2002-2009 by Gerfried Fuchs +# copyright 2002-2011 by Gerfried Fuchs # Licenced under WTFPLv2 set -e diff --git a/debian/rules b/debian/rules index 833d4b5..bdd2d62 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f # debian/rules file for beep -# copyright 2002-2009 by Gerfried Fuchs +# copyright 2002-2011 by Gerfried Fuchs # Licenced under WTFPLv2 PKG1 = beep From 00e22d0aec33a0617d0b501a92f9328057a10a4a Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Tue, 31 May 2011 20:49:00 +0200 Subject: [PATCH 22/48] add empty comment --- debian/patches/series | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/patches/series b/debian/patches/series index e69de29..1bb8bf6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -0,0 +1 @@ +# empty From 979f326b299bcad3c587402b129d4608e4e91df3 Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Wed, 1 Jun 2011 16:24:28 +0200 Subject: [PATCH 23/48] finalize changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a458c69..8136b12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,7 @@ beep (1.3-1) unstable; urgency=low * Relicensed Debian packaging under WTFPLv2. * Explicitly call set -e instead of -e on the hashbang line. - -- + -- Gerfried Fuchs Tue, 31 May 2011 20:49:17 +0200 beep (1.2.2-24) unstable; urgency=low From 1ab9ba4ea120ce451780cf72a38ee613276de5df Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Tue, 21 Feb 2012 19:25:31 +0100 Subject: [PATCH 24/48] debconf-updatepo run --- debian/po/ca.po | 1 + debian/po/cs.po | 1 + debian/po/de.po | 1 + debian/po/es.po | 1 + debian/po/eu.po | 1 + debian/po/fi.po | 1 + debian/po/fr.po | 7 ++++--- debian/po/gl.po | 1 + debian/po/it.po | 1 + debian/po/ja.po | 1 + debian/po/nl.po | 1 + debian/po/pt.po | 1 + debian/po/pt_BR.po | 1 + debian/po/ro.po | 1 + debian/po/ru.po | 5 +++-- debian/po/sv.po | 1 + 16 files changed, 21 insertions(+), 5 deletions(-) diff --git a/debian/po/ca.po b/debian/po/ca.po index 1be8b1e..2e0ca3d 100644 --- a/debian/po/ca.po +++ b/debian/po/ca.po @@ -21,6 +21,7 @@ msgstr "" "PO-Revision-Date: 2009-03-27 17:11+0100\n" "Last-Translator: Matt Bonner \n" "Language-Team: Catalan \n" +"Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/debian/po/cs.po b/debian/po/cs.po index b00176b..9590331 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po @@ -19,6 +19,7 @@ msgstr "" "PO-Revision-Date: 2008-11-24 10:10+0100\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/debian/po/de.po b/debian/po/de.po index 996b94f..04e8959 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -19,6 +19,7 @@ msgstr "" "PO-Revision-Date: 2008-11-24 10:10+0100\n" "Last-Translator: Gerfried Fuchs \n" "Language-Team: German \n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/debian/po/es.po b/debian/po/es.po index 3757357..563fa9b 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -35,6 +35,7 @@ msgstr "" "PO-Revision-Date: 2008-11-24 10:09+0100\n" "Last-Translator: Francisco Javier Cuadrado \n" "Language-Team: Debian l10n Spanish \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/debian/po/eu.po b/debian/po/eu.po index 3dc4eef..66005e8 100644 --- a/debian/po/eu.po +++ b/debian/po/eu.po @@ -11,6 +11,7 @@ msgstr "" "PO-Revision-Date: 2008-11-24 10:10+0100\n" "Last-Translator: Piarres Beobide \n" "Language-Team: Euskara \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/debian/po/fi.po b/debian/po/fi.po index 25351e8..96488fd 100644 --- a/debian/po/fi.po +++ b/debian/po/fi.po @@ -6,6 +6,7 @@ msgstr "" "PO-Revision-Date: 2008-11-24 10:10+0100\n" "Last-Translator: Esko Arajärvi \n" "Language-Team: Finnish \n" +"Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/debian/po/fr.po b/debian/po/fr.po index ff20666..e24d47c 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -19,6 +19,7 @@ msgstr "" "PO-Revision-Date: 2008-11-24 10:10+0100\n" "Last-Translator: Daniel Déchelotte \n" "Language-Team: Debian-l10n-french \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -58,9 +59,9 @@ msgid "" msgstr "" "Le programme beep doit posséder les privilèges du superutilisateur pour " "pouvoir accéder au haut-parleur. Cela est possible de plusieurs façons : " -"soit permettre de le lancer avec les privilèges du superutilisateur (« setuid " -"root ») par tous ou uniquement par les membres du groupe « audio », soit " -"réserver l'exécution du programme au superutilisateur." +"soit permettre de le lancer avec les privilèges du superutilisateur " +"(« setuid root ») par tous ou uniquement par les membres du groupe " +"« audio », soit réserver l'exécution du programme au superutilisateur." #. Type: select #. Description diff --git a/debian/po/gl.po b/debian/po/gl.po index 26b7c24..3722341 100644 --- a/debian/po/gl.po +++ b/debian/po/gl.po @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2008-11-24 10:10+0100\n" "Last-Translator: Jacobo Tarrio \n" "Language-Team: Galician \n" +"Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/debian/po/it.po b/debian/po/it.po index 61ec155..5736f15 100644 --- a/debian/po/it.po +++ b/debian/po/it.po @@ -6,6 +6,7 @@ msgstr "" "PO-Revision-Date: 2007-10-03 19:01+0200\n" "Last-Translator: davide gliozzi \n" "Language-Team: Italian \n" +"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/debian/po/ja.po b/debian/po/ja.po index 8b8666d..806cb0a 100644 --- a/debian/po/ja.po +++ b/debian/po/ja.po @@ -20,6 +20,7 @@ msgstr "" "PO-Revision-Date: 2008-11-24 10:11+0100\n" "Last-Translator: Hideki Yamane (Debian-JP) \n" "Language-Team: Japanese \n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/debian/po/nl.po b/debian/po/nl.po index 961c233..43bb6c0 100644 --- a/debian/po/nl.po +++ b/debian/po/nl.po @@ -19,6 +19,7 @@ msgstr "" "PO-Revision-Date: 2008-11-24 10:11+0100\n" "Last-Translator: Thijs Kinkhorst \n" "Language-Team: dutch \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/debian/po/pt.po b/debian/po/pt.po index 7009b4d..fa8610f 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -9,6 +9,7 @@ msgstr "" "PO-Revision-Date: 2008-11-24 10:11+0100\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po index 02ca2fe..ed129fa 100644 --- a/debian/po/pt_BR.po +++ b/debian/po/pt_BR.po @@ -24,6 +24,7 @@ msgstr "" "Last-Translator: Felipe Augusto van de Wiel (faw) \n" "Language-Team: Brazilian Portuguese \n" +"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/debian/po/ro.po b/debian/po/ro.po index 1dcc66a..8f47e4a 100644 --- a/debian/po/ro.po +++ b/debian/po/ro.po @@ -14,6 +14,7 @@ msgstr "" "PO-Revision-Date: 2008-11-24 10:11+0100\n" "Last-Translator: Eddy Petrișor \n" "Language-Team: debian-l10-romanian \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/debian/po/ru.po b/debian/po/ru.po index 24b69e1..524be30 100644 --- a/debian/po/ru.po +++ b/debian/po/ru.po @@ -22,12 +22,13 @@ msgstr "" "PO-Revision-Date: 2008-11-24 10:11+0100\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #. Type: select #. Choices diff --git a/debian/po/sv.po b/debian/po/sv.po index c6a6dfd..2d80b93 100644 --- a/debian/po/sv.po +++ b/debian/po/sv.po @@ -19,6 +19,7 @@ msgstr "" "PO-Revision-Date: 2008-11-24 10:11+0100\n" "Last-Translator: Martin Bagge \n" "Language-Team: Swedish \n" +"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" From 3b7e7036591c7b8adabec2f1ce47569d302e8592 Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Tue, 28 Feb 2012 14:12:50 +0100 Subject: [PATCH 25/48] danish debconf translation --- debian/changelog | 8 ++++++ debian/po/da.po | 69 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+) create mode 100644 debian/po/da.po diff --git a/debian/changelog b/debian/changelog index 8136b12..cca22be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +beep (1.3-2) unstable; urgency=low + + * The "l10n R us" release. + * Added debconf translations: + - Danish by Joe Hansen (closes: #633380) + + -- + beep (1.3-1) unstable; urgency=low * New Upstream release importing all our changes \o/ diff --git a/debian/po/da.po b/debian/po/da.po new file mode 100644 index 0000000..4631950 --- /dev/null +++ b/debian/po/da.po @@ -0,0 +1,69 @@ +# Danish translation beep. +# Copyright (C) 2011 beep & nedenstående oversættere. +# This file is distributed under the same license as the beep package. +# Joe Hansen (joedalton2@yahoo.dk), 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: beep\n" +"Report-Msgid-Bugs-To: beep@packages.debian.org\n" +"POT-Creation-Date: 2008-09-11 18:36+0200\n" +"PO-Revision-Date: 2011-07-09 12:42+0000\n" +"Last-Translator: Joe Hansen \n" +"Language-Team: Danish \n" +"Language: da\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable for all" +msgstr "brugbar for alle" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable for group audio" +msgstr "brugbar for gruppen audio" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable only for root" +msgstr "kun brugbar for administrator (root)" + +#. Type: select +#. Description +#: ../templates:1002 +msgid "Install beep as:" +msgstr "Installer beep som:" + +#. Type: select +#. Description +#: ../templates:1002 +msgid "" +"beep must be run as root since it needs to access the speaker hardware. " +"There are several possibilities 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 skal køre som administrator (root), da den kræver adgang til " +"højtalerne. Der er flere muligheder for at gøre programmet brugbart: Enten " +"kun for root (ingen suid bit overhovedet), kun kørbar for brugere i gruppen " +"audio, eller brugbar for alle." + +#. Type: select +#. Description +#: ../templates:1002 +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 " +"the package maintainer's judgement." +msgstr "" +"Da alle programmer angivet som suid root kan udgøre en sikkerhedsmæssig " +"risiko gøres dette ikke som standard. Programmet er dog meget lille (~150 " +"kodelinjer), så det er ret nemt at verificere koden selv, hvis du ikke " +"stoler på pakkevedligeholderens vurdering." From 3d8b4d9b34d5e9cd3014aec1464c363c48b33380 Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Tue, 28 Feb 2012 14:22:30 +0100 Subject: [PATCH 26/48] polish debconf translation --- debian/changelog | 1 + debian/po/pl.po | 73 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 debian/po/pl.po diff --git a/debian/changelog b/debian/changelog index cca22be..38c2367 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ beep (1.3-2) unstable; urgency=low * The "l10n R us" release. * Added debconf translations: - Danish by Joe Hansen (closes: #633380) + - Polish by Michał Kułach (closes: #659367) -- diff --git a/debian/po/pl.po b/debian/po/pl.po new file mode 100644 index 0000000..749a157 --- /dev/null +++ b/debian/po/pl.po @@ -0,0 +1,73 @@ +# Translation of beep debconf templates to Polish. +# Copyright (C) 2008 +# This file is distributed under the same license as the beep package. +# +# Michał Kułach , 2012. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: beep@packages.debian.org\n" +"POT-Creation-Date: 2008-09-11 18:36+0200\n" +"PO-Revision-Date: 2012-02-10 14:27+0100\n" +"Last-Translator: Michał Kułach \n" +"Language-Team: Polish \n" +"Language: pl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 1.2\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " +"|| n%100>=20) ? 1 : 2);\n" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable for all" +msgstr "dla wszystkich" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable for group audio" +msgstr "dla grupy audio" + +#. Type: select +#. Choices +#: ../templates:1001 +msgid "usable only for root" +msgstr "tylko dla roota" + +#. Type: select +#. Description +#: ../templates:1002 +msgid "Install beep as:" +msgstr "Zainstaluj beep:" + +#. Type: select +#. Description +#: ../templates:1002 +msgid "" +"beep must be run as root since it needs to access the speaker hardware. " +"There are several possibilities 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 "" +"Program beep musi działać jako root, ponieważ wymaga dostępu do fizycznego " +"brzęczyka. Jest kilka możliwości działania programu: albo tylko dla roota " +"(bez atrybutu suid), albo dla użytkowników należących do grupy audio, albo " +"dla wszystkich." + +#. Type: select +#. Description +#: ../templates:1002 +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 " +"the package maintainer's judgement." +msgstr "" +"Każdy program działający z suid root może stanowić zagrożenie " +"bezpieczeństwa, dlatego ta opcja wymaga dokonania wyboru przez użytkownika. " +"Jednak ponieważ program jest niewielki (ok. 150 wierszy kodu), można łatwo " +"zweryfikować bezpieczeństwo kodu samodzielnie, jeśli użytkownik ma " +"wątpliwości co do osądu opiekuna pakietu." From d31cb2bbaf2aa13d0cbb957a07cb2b66c6c16d1b Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Tue, 28 Feb 2012 14:22:48 +0100 Subject: [PATCH 27/48] italian debconf translation --- debian/changelog | 1 + debian/po/it.po | 41 ++++++++++++++++++----------------------- 2 files changed, 19 insertions(+), 23 deletions(-) diff --git a/debian/changelog b/debian/changelog index 38c2367..32f51be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ beep (1.3-2) unstable; urgency=low * Added debconf translations: - Danish by Joe Hansen (closes: #633380) - Polish by Michał Kułach (closes: #659367) + - Italian by Beatrice Torracca (closes: #660233) -- diff --git a/debian/po/it.po b/debian/po/it.po index 5736f15..8b02353 100644 --- a/debian/po/it.po +++ b/debian/po/it.po @@ -1,15 +1,22 @@ +# Italian translation of beep debconf messages. +# Copyright (C) 2002-2009 Gerfried Fuchs +# This file is distributed under the same license as the beep package. +# davide gliozzi , 2007 +# Beatrice Torracca , 2012. msgid "" msgstr "" -"Project-Id-Version: beep 1.2.2-12\n" +"Project-Id-Version: beep\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" "POT-Creation-Date: 2008-09-11 18:36+0200\n" -"PO-Revision-Date: 2007-10-03 19:01+0200\n" -"Last-Translator: davide gliozzi \n" +"PO-Revision-Date: 2012-02-17 15:54+0200\n" +"Last-Translator: Beatrice Torracca \n" "Language-Team: Italian \n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Virtaal 0.7.1\n" #. Type: select #. Choices @@ -33,48 +40,36 @@ msgstr "utillizzabile solamente da root" #. Description #: ../templates:1002 msgid "Install beep as:" -msgstr "Installa beep come:" +msgstr "Installare beep come:" #. Type: select #. Description #: ../templates:1002 -#, fuzzy -#| 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." msgid "" "beep must be run as root since it needs to access the speaker hardware. " "There are several possibilities 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 deve essere lanciato come root dato che ha l'esigenza di accedere " -"fisicamente agli autoparlanti. Ci sono diverse possibilità di rendere il " +"beep deve essere eseguito come root dato che ha l'esigenza di accedere " +"all'hardware degli altoparlanti. Ci sono diverse possibilità per rendere il " "programma fruibile: o solamente a root (non si usa affatto il bit suid), o " "solamente agli utenti del gruppo audio, oppure a tutti." #. Type: select #. Description #: ../templates:1002 -#, 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." 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 " "the package maintainer's judgement." 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." +"Dal momento che ogni programma con suid root può essere un rischio per la " +"sicurezza, questo non viene abilitato in modo predefinito. Comunque, il " +"programma è abbastanza piccolo (circa 150 righe di codice) perciò è " +"abbastanza facile verificare da soli la sicurezza del codice, qualora non ci " +"si fidasse del giudizio del manutentore del pacchetto." #~ msgid "" #~ "suid root for all, suid root with only group audio executable, not suid " From 845f1d29c686e4401ea22e1c1c2739c7aaa09c88 Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Tue, 28 Feb 2012 14:24:18 +0100 Subject: [PATCH 28/48] Bump Standards-Version to 3.9.3 --- debian/changelog | 3 ++- debian/control | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 32f51be..6f0343c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,11 @@ beep (1.3-2) unstable; urgency=low * The "l10n R us" release. - * Added debconf translations: + * Added/Updated debconf translations: - Danish by Joe Hansen (closes: #633380) - Polish by Michał Kułach (closes: #659367) - Italian by Beatrice Torracca (closes: #660233) + * Bump Standards-Version to 3.9.3. -- diff --git a/debian/control b/debian/control index d2023cf..125af8d 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: sound Priority: optional Maintainer: Gerfried Fuchs Build-Depends: po-debconf, patch, quilt -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Homepage: http://johnath.com/beep/ Vcs-Browser: http://git.deb.at/w/pkg/beep.git Vcs-Git: git://git.deb.at/pkg/beep.git From a8ceef793c705683207726c4637ebd52134b95c6 Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Fri, 2 Mar 2012 19:29:45 +0100 Subject: [PATCH 29/48] Add recommended targets build-arch/build-indep to debian/rules --- debian/changelog | 1 + debian/rules | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 6f0343c..d463120 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ beep (1.3-2) unstable; urgency=low - Polish by Michał Kułach (closes: #659367) - Italian by Beatrice Torracca (closes: #660233) * Bump Standards-Version to 3.9.3. + * Add recommended targets build-arch/build-indep to debian/rules. -- diff --git a/debian/rules b/debian/rules index bdd2d62..c9d5385 100755 --- a/debian/rules +++ b/debian/rules @@ -38,7 +38,9 @@ clean: unpatch [ ! -f beep ] || $(MAKE) clean -build: build-stamp +build: build-arch +build-arch: build-stamp +build-indep: build-stamp: patch $(checkdir) $(MAKE) FLAGS="$(FLAGS)" From ba4a3e04a77e3e20db3bcc04b0b69029e40d4894 Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Fri, 2 Mar 2012 19:39:47 +0100 Subject: [PATCH 30/48] Finalize the changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d463120..ec6badb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,7 +8,7 @@ beep (1.3-2) unstable; urgency=low * Bump Standards-Version to 3.9.3. * Add recommended targets build-arch/build-indep to debian/rules. - -- + -- Gerfried Fuchs Fri, 02 Mar 2012 19:29:25 +0100 beep (1.3-1) unstable; urgency=low From 56749374fd3d713b27872f8cd2a8da39b887de77 Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Sun, 10 Jun 2012 11:50:42 +0200 Subject: [PATCH 31/48] also catch SIGTERM for stopping the beep --- debian/changelog | 7 +++++++ debian/patches/catch-sig-term | 23 +++++++++++++++++++++++ debian/patches/series | 2 +- 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 debian/patches/catch-sig-term diff --git a/debian/changelog b/debian/changelog index ec6badb..ab0b083 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +beep (1.3-3) unstable; urgency=low + + * Add patch catch-sig-term to also stop the beep when receiving SIGTERM. + Thanks to Jérôme for the patch. + + -- + beep (1.3-2) unstable; urgency=low * The "l10n R us" release. diff --git a/debian/patches/catch-sig-term b/debian/patches/catch-sig-term new file mode 100644 index 0000000..8db0677 --- /dev/null +++ b/debian/patches/catch-sig-term @@ -0,0 +1,23 @@ +Author: Jérôme +Description: also catch SIGTERM for stopping the beep + +Index: VCS/beep.c +=================================================================== +--- VCS.orig/beep.c 2012-06-10 10:03:39.000000000 +0200 ++++ VCS/beep.c 2012-06-10 10:03:59.000000000 +0200 +@@ -127,6 +127,7 @@ + + switch(signum) { + case SIGINT: ++ case SIGTERM: + if(console_fd >= 0) { + /* Kill the sound, quit gracefully */ + do_beep(0); +@@ -321,6 +322,7 @@ + parms->next = NULL; + + signal(SIGINT, handle_signal); ++ signal(SIGTERM, handle_signal); + parse_command_line(argc, argv, parms); + + /* this outermost while loop handles the possibility that -n/--new has been diff --git a/debian/patches/series b/debian/patches/series index 1bb8bf6..b3e33f3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1 @@ -# empty +catch-sig-term From 2f7fe814004c2fb8243663a50a5b2779a30376e8 Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Sun, 10 Jun 2012 13:03:49 +0200 Subject: [PATCH 32/48] Finalize the changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ab0b083..3da57f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,7 @@ beep (1.3-3) unstable; urgency=low * Add patch catch-sig-term to also stop the beep when receiving SIGTERM. Thanks to Jérôme for the patch. - -- + -- Gerfried Fuchs Sun, 10 Jun 2012 11:51:43 +0200 beep (1.3-2) unstable; urgency=low From 2a3258edf777ccf031a5146672d063a020221cca Mon Sep 17 00:00:00 2001 From: Rhonda D'Vine Date: Fri, 1 Jan 2016 13:03:28 +0100 Subject: [PATCH 33/48] Update my name --- debian/README.Debian | 2 +- debian/changelog | 6 ++++++ debian/config | 2 +- debian/control | 2 +- debian/copyright | 4 ++-- debian/po/de.po | 4 ++-- debian/po/eu.po | 4 ++-- debian/po/it.po | 4 ++-- debian/po/ro.po | 4 ++-- debian/postinst | 2 +- debian/postrm | 2 +- debian/rules | 2 +- 12 files changed, 22 insertions(+), 16 deletions(-) diff --git a/debian/README.Debian b/debian/README.Debian index 4dfef2b..9baf0bf 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -6,4 +6,4 @@ I therefore think that "suid root with only group audio executeable" is an acceptable default - you are of course able to change it anytime with dpkg-reconfigure beep - -- Gerfried Fuchs , Wed, 27 Feb 2002 12:48:26 +0100 + -- Rhonda D'Vine , Wed, 27 Feb 2002 12:48:26 +0100 diff --git a/debian/changelog b/debian/changelog index 3da57f9..f14e1fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +beep (1.3-4) unstable; urgency=low + + * Update my name. + + -- + beep (1.3-3) unstable; urgency=low * Add patch catch-sig-term to also stop the beep when receiving SIGTERM. diff --git a/debian/config b/debian/config index 55aa737..666eaec 100644 --- a/debian/config +++ b/debian/config @@ -1,6 +1,6 @@ #!/bin/sh # debian/config file for beep -# copyright 2002-2011 by Gerfried Fuchs +# copyright 2002-2011 by Rhonda D'Vine # Licenced under WTFPLv2 set -e diff --git a/debian/control b/debian/control index 125af8d..45cf105 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: beep Section: sound Priority: optional -Maintainer: Gerfried Fuchs +Maintainer: Rhonda D'Vine Build-Depends: po-debconf, patch, quilt Standards-Version: 3.9.3 Homepage: http://johnath.com/beep/ diff --git a/debian/copyright b/debian/copyright index a4f080d..a74d2cd 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -This package was debianized by Gerfried Fuchs on +This package was debianized by Rhonda D'Vine on Thu, 18 Oct 2001 09:26:50 +0200. It was downloaded from http://www.johnath.com/beep/ @@ -28,7 +28,7 @@ The debianization of the package is licensed under the WTFPLv2: DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE Version 2, December 2004 - Copyright (C) 2002-2009 Gerfried Fuchs + Copyright (C) 2002-2009 Rhonda D'Vine Everyone is permitted to copy and distribute verbatim or modified copies of this license document, and changing it is allowed as long diff --git a/debian/po/de.po b/debian/po/de.po index 04e8959..199a943 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -16,8 +16,8 @@ msgstr "" "Project-Id-Version: beep 1.2.2-18\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" "POT-Creation-Date: 2008-09-11 18:36+0200\n" -"PO-Revision-Date: 2008-11-24 10:10+0100\n" -"Last-Translator: Gerfried Fuchs \n" +"PO-Revision-Date: 2016-01-01 13:01+0100\n" +"Last-Translator: Rhonda D'Vine \n" "Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" diff --git a/debian/po/eu.po b/debian/po/eu.po index 66005e8..c2d595d 100644 --- a/debian/po/eu.po +++ b/debian/po/eu.po @@ -1,5 +1,5 @@ # translation of beep-eu.po to Euskara -# Copyright (C) 2003-2008 Gerfried Fuchs +# Copyright (C) 2003-2008 Rhonda D'Vine # This file is distributed under the same license as the beep package. # # Piarres Beobide , 2008. @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: beep-eu\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" "POT-Creation-Date: 2008-09-11 18:36+0200\n" -"PO-Revision-Date: 2008-11-24 10:10+0100\n" +"PO-Revision-Date: 2016-01-01 13:02+0100\n" "Last-Translator: Piarres Beobide \n" "Language-Team: Euskara \n" "Language: \n" diff --git a/debian/po/it.po b/debian/po/it.po index 8b02353..1cba917 100644 --- a/debian/po/it.po +++ b/debian/po/it.po @@ -1,5 +1,5 @@ # Italian translation of beep debconf messages. -# Copyright (C) 2002-2009 Gerfried Fuchs +# Copyright (C) 2002-2009 Rhonda D'Vine # This file is distributed under the same license as the beep package. # davide gliozzi , 2007 # Beatrice Torracca , 2012. @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: beep\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" "POT-Creation-Date: 2008-09-11 18:36+0200\n" -"PO-Revision-Date: 2012-02-17 15:54+0200\n" +"PO-Revision-Date: 2016-01-01 13:02+0100\n" "Last-Translator: Beatrice Torracca \n" "Language-Team: Italian \n" "Language: it\n" diff --git a/debian/po/ro.po b/debian/po/ro.po index 8f47e4a..b63e014 100644 --- a/debian/po/ro.po +++ b/debian/po/ro.po @@ -1,7 +1,7 @@ # translation of ro.po to debian-l10-romanian # Romanian translations for PACKAGE package # Traducerea în limba română pentru pachetul beep. -# Copyright (C) 2003-2008 Gerfried Fuchs +# Copyright (C) 2003-2008 Rhonda D'Vine # This file is distributed under the same license as the beep package. # # , 2008. @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: ro\n" "Report-Msgid-Bugs-To: beep@packages.debian.org\n" "POT-Creation-Date: 2008-09-11 18:36+0200\n" -"PO-Revision-Date: 2008-11-24 10:11+0100\n" +"PO-Revision-Date: 2016-01-01 13:02+0100\n" "Last-Translator: Eddy Petrișor \n" "Language-Team: debian-l10-romanian \n" "Language: \n" diff --git a/debian/postinst b/debian/postinst index fb659d6..fd5cc68 100644 --- a/debian/postinst +++ b/debian/postinst @@ -1,6 +1,6 @@ #!/bin/sh # postinst for beep -# copyright 2002-2011 by Gerfried Fuchs +# copyright 2002-2011 by Rhonda D'Vine # Licenced under WTFPLv2 set -e diff --git a/debian/postrm b/debian/postrm index 0f2545f..b2c14e8 100644 --- a/debian/postrm +++ b/debian/postrm @@ -1,6 +1,6 @@ #!/bin/sh # postrm for beep -# copyright 2002-2011 by Gerfried Fuchs +# copyright 2002-2011 by Rhonda D'Vine # Licenced under WTFPLv2 set -e diff --git a/debian/rules b/debian/rules index c9d5385..4ff16bb 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f # debian/rules file for beep -# copyright 2002-2011 by Gerfried Fuchs +# copyright 2002-2011 by Rhonda D'Vine # Licenced under WTFPLv2 PKG1 = beep From 2dfea7c753b8121a316b9a7ad047c24b6127c44a Mon Sep 17 00:00:00 2001 From: Rhonda D'Vine Date: Fri, 1 Jan 2016 13:06:06 +0100 Subject: [PATCH 34/48] Switch to source format 3.0 (quilt) --- debian/changelog | 1 + debian/source/format | 1 + 2 files changed, 2 insertions(+) create mode 100644 debian/source/format diff --git a/debian/changelog b/debian/changelog index f14e1fd..6a9562a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ beep (1.3-4) unstable; urgency=low * Update my name. + * Switch to source format 3.0 (quilt). -- diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) From 446acb08f9ce37148102761bae5270ac9ad5c311 Mon Sep 17 00:00:00 2001 From: Rhonda D'Vine Date: Tue, 12 Apr 2016 14:01:31 +0200 Subject: [PATCH 35/48] Bump Standards-Version to 3.9.6 --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 6a9562a..3e59092 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ beep (1.3-4) unstable; urgency=low * Update my name. + * Bump Standards-Version to 3.9.6. * Switch to source format 3.0 (quilt). -- diff --git a/debian/control b/debian/control index 45cf105..730a7e5 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: sound Priority: optional Maintainer: Rhonda D'Vine Build-Depends: po-debconf, patch, quilt -Standards-Version: 3.9.3 +Standards-Version: 3.9.6 Homepage: http://johnath.com/beep/ Vcs-Browser: http://git.deb.at/w/pkg/beep.git Vcs-Git: git://git.deb.at/pkg/beep.git From 63789c30bd10255d0df934b3d7c4de1298dbe5b0 Mon Sep 17 00:00:00 2001 From: Rhonda D'Vine Date: Tue, 12 Apr 2016 14:02:35 +0200 Subject: [PATCH 36/48] Add #DEBHELPER# to post{inst,rm} files --- debian/changelog | 1 + debian/postinst | 2 ++ debian/postrm | 2 ++ 3 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3e59092..5cb0ccf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ beep (1.3-4) unstable; urgency=low * Update my name. * Bump Standards-Version to 3.9.6. * Switch to source format 3.0 (quilt). + * Add #DEBHELPER# to post{inst,rm} files. -- diff --git a/debian/postinst b/debian/postinst index fd5cc68..dc97dc0 100644 --- a/debian/postinst +++ b/debian/postinst @@ -54,3 +54,5 @@ else chmod 0755 /usr/bin/beep fi fi + +#DEBHELPER# diff --git a/debian/postrm b/debian/postrm index b2c14e8..5310379 100644 --- a/debian/postrm +++ b/debian/postrm @@ -9,3 +9,5 @@ if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then . /usr/share/debconf/confmodule db_purge fi + +#DEBHELPER# From 29f418e5b19fdabcb2ad6735a4d92b269ab3cfb3 Mon Sep 17 00:00:00 2001 From: Rhonda D'Vine Date: Tue, 12 Apr 2016 14:04:20 +0200 Subject: [PATCH 37/48] New patch fix-makefile to make make clean not fail --- debian/changelog | 1 + debian/patches/fix-makefile | 16 ++++++++++++++++ debian/patches/series | 1 + 3 files changed, 18 insertions(+) create mode 100644 debian/patches/fix-makefile diff --git a/debian/changelog b/debian/changelog index 5cb0ccf..fe7ae69 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ beep (1.3-4) unstable; urgency=low * Update my name. * Bump Standards-Version to 3.9.6. * Switch to source format 3.0 (quilt). + * New patch fix-makefile to make make clean not fail. * Add #DEBHELPER# to post{inst,rm} files. -- diff --git a/debian/patches/fix-makefile b/debian/patches/fix-makefile new file mode 100644 index 0000000..22095e4 --- /dev/null +++ b/debian/patches/fix-makefile @@ -0,0 +1,16 @@ +Author: Rhonda D'Vine +Description: make the make clean not fail if the binary isn't there + +Index: VCS/Makefile +=================================================================== +--- VCS.orig/Makefile 2016-01-04 13:32:23.518723192 +0100 ++++ VCS/Makefile 2016-01-17 12:50:49.026997125 +0100 +@@ -8,7 +8,7 @@ + default : beep + + clean : +- rm ${EXEC_NAME} ++ -rm ${EXEC_NAME} + + beep : beep.c + ${CC} ${FLAGS} -o ${EXEC_NAME} beep.c diff --git a/debian/patches/series b/debian/patches/series index b3e33f3..2c1d9d6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ catch-sig-term +fix-makefile From a7ba3628a25ce13e6c1fe738b88a2a5f46673604 Mon Sep 17 00:00:00 2001 From: Rhonda D'Vine Date: Tue, 12 Apr 2016 14:08:00 +0200 Subject: [PATCH 38/48] Use pathfind() function instead of hardcoded path to dpkg-statoverride --- debian/changelog | 1 + debian/postinst | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index fe7ae69..cc1be54 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ beep (1.3-4) unstable; urgency=low * Switch to source format 3.0 (quilt). * New patch fix-makefile to make make clean not fail. * Add #DEBHELPER# to post{inst,rm} files. + * Use pathfind() function instead of hardcoded path to dpkg-statoverride. -- diff --git a/debian/postinst b/debian/postinst index dc97dc0..29eb0c1 100644 --- a/debian/postinst +++ b/debian/postinst @@ -1,10 +1,23 @@ #!/bin/sh # postinst for beep -# copyright 2002-2011 by Rhonda D'Vine +# copyright 2002-2016 by Rhonda D'Vine # Licenced under WTFPLv2 set -e +pathfind() { + OLDIFS="$IFS" + IFS=: + for p in $PATH; do + if [ -x "$p/$*" ]; then + IFS="$OLDIFS" + return 0 + fi + done + IFS="$OLDIFS" + return 1 +} + # Source debconf library. if [ -e /usr/share/debconf/confmodule ]; then . /usr/share/debconf/confmodule @@ -35,7 +48,7 @@ if [ "$suid" = "not suid at all" ] ; then fi -if [ -x /usr/sbin/dpkg-statoverride ] ; then +if pathfind dpkg-statoverride ; then if ! dpkg-statoverride --list /usr/bin/beep >/dev/null ; then if [ "$suid" = "usable for all" ] ; then chmod 4755 /usr/bin/beep From 9978324d978b2580617ec819f451060ddc090714 Mon Sep 17 00:00:00 2001 From: Rhonda D'Vine Date: Tue, 12 Apr 2016 14:08:31 +0200 Subject: [PATCH 39/48] Name GPL properly in debian/copyright --- debian/changelog | 1 + debian/copyright | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index cc1be54..96bc695 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ beep (1.3-4) unstable; urgency=low * New patch fix-makefile to make make clean not fail. * Add #DEBHELPER# to post{inst,rm} files. * Use pathfind() function instead of hardcoded path to dpkg-statoverride. + * Name GPL properly in debian/copyright. -- diff --git a/debian/copyright b/debian/copyright index a74d2cd..f217215 100644 --- a/debian/copyright +++ b/debian/copyright @@ -9,8 +9,8 @@ Copyright: ========== This software is copyright (C) 2000 by Johnathan Nightingale. - This code may distributed only under the terms of the GNU Public - License which can be found at http://www.gnu.org/copyleft or in + This code may distributed only under the terms of the GNU General + Public License which can be found at http://www.gnu.org/copyleft or in the file COPYING supplied with this code. This code is not distributed with warranties of any kind, including From 2dc91c9441d64410ab781d56aff22f64d3024a38 Mon Sep 17 00:00:00 2001 From: Rhonda D'Vine Date: Tue, 12 Apr 2016 14:09:11 +0200 Subject: [PATCH 40/48] Convert to dh style rules file --- debian/beep-udeb.dirs | 1 + debian/beep.dirs | 2 + debian/changelog | 1 + debian/compat | 1 + debian/control | 7 ++- debian/docs | 2 + debian/rules | 129 ++++++------------------------------------ 7 files changed, 27 insertions(+), 116 deletions(-) create mode 100644 debian/beep-udeb.dirs create mode 100644 debian/beep.dirs create mode 100644 debian/compat create mode 100644 debian/docs diff --git a/debian/beep-udeb.dirs b/debian/beep-udeb.dirs new file mode 100644 index 0000000..e772481 --- /dev/null +++ b/debian/beep-udeb.dirs @@ -0,0 +1 @@ +usr/bin diff --git a/debian/beep.dirs b/debian/beep.dirs new file mode 100644 index 0000000..98d1583 --- /dev/null +++ b/debian/beep.dirs @@ -0,0 +1,2 @@ +usr/bin +usr/share/man/man1 diff --git a/debian/changelog b/debian/changelog index 96bc695..b3187fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ beep (1.3-4) unstable; urgency=low * Update my name. * Bump Standards-Version to 3.9.6. * Switch to source format 3.0 (quilt). + * Convert to dh style rules file. * New patch fix-makefile to make make clean not fail. * Add #DEBHELPER# to post{inst,rm} files. * Use pathfind() function instead of hardcoded path to dpkg-statoverride. diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control index 730a7e5..4bdf952 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: beep Section: sound Priority: optional Maintainer: Rhonda D'Vine -Build-Depends: po-debconf, patch, quilt +Build-Depends: debhelper (>= 9~), po-debconf, patch Standards-Version: 3.9.6 Homepage: http://johnath.com/beep/ Vcs-Browser: http://git.deb.at/w/pkg/beep.git @@ -10,7 +10,7 @@ Vcs-Git: git://git.deb.at/pkg/beep.git Package: beep Architecture: any -Depends: ${shlibs:Depends}, debconf (>= 0.5) | debconf-2.0 +Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 0.5) | debconf-2.0 Description: advanced pc-speaker beeper beep does what you'd expect: it beeps. But unlike printf "\a" beep allows you to control pitch, duration, and repetitions. Its job is to live inside @@ -20,9 +20,10 @@ Description: advanced pc-speaker beeper gets hacked into) much more informative. Package: beep-udeb +Package-Type: udeb Architecture: any Section: debian-installer -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Description: advanced pc-speaker beeper - minimal package beep does what you'd expect: it beeps. However, it offers various additional features, such as the ability to control pitch, duration, diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..94a0111 --- /dev/null +++ b/debian/docs @@ -0,0 +1,2 @@ +CREDITS +README diff --git a/debian/rules b/debian/rules index 4ff16bb..48c55d4 100755 --- a/debian/rules +++ b/debian/rules @@ -1,114 +1,17 @@ #!/usr/bin/make -f -# debian/rules file for beep -# copyright 2002-2011 by Rhonda D'Vine -# Licenced under WTFPLv2 - -PKG1 = beep -TMP1 = $(CURDIR)/debian/$(PKG1) -PKG2 = beep-udeb -TMP2 = $(CURDIR)/debian/$(PKG2) - -VERSION = $(shell dpkg-parsechangelog | grep "^Version:" | cut -d" " -f 2) -ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH) - -FLAGS = -g -Wall -INSTALL = install -INSTALL_FILE = $(INSTALL) -p -oroot -groot -m644 -INSTALL_PROGRAM = $(INSTALL) -p -oroot -groot -m755 -INSTALL_SCRIPT = $(INSTALL) -p -oroot -groot -m755 -INSTALL_DIR = $(INSTALL) -p -d -oroot -groot -m755 - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - FLAGS += -O0 -else - FLAGS += -O2 -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s - STRIP = true -endif - - -include /usr/share/quilt/quilt.make - -clean: unpatch - $(checkdir) - $(checkroot) - -rm -rf $(TMP1) $(TMP2) debian/$(PKG1).substvars debian/$(PKG2).substvars debian/files build-stamp - [ ! -f beep ] || $(MAKE) clean - - -build: build-arch -build-arch: build-stamp -build-indep: -build-stamp: patch - $(checkdir) - $(MAKE) FLAGS="$(FLAGS)" - touch build-stamp - - -install: build - $(checkdir) - $(checkroot) - -rm -rf $(TMP1) $(TMP2) debian/$(PKG1).substvars debian/$(PKG2).substvars - $(INSTALL_DIR) $(TMP1) - cd $(TMP1) && $(INSTALL_DIR) usr/bin usr/share/man/man1 \ - usr/share/doc/$(PKG1) - $(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 - gzip --best $(TMP1)/usr/share/man/man1/beep.1 - chown root:audio $(TMP1)/usr/bin/beep - $(INSTALL_FILE) CREDITS README $(TMP1)/usr/share/doc/$(PKG1) - $(INSTALL_FILE) CHANGELOG $(TMP1)/usr/share/doc/$(PKG1)/changelog - cd $(TMP1)/usr/share/doc/$(PKG1) && gzip -9 changelog README - $(INSTALL_DIR) $(TMP2)/usr/bin - $(INSTALL_PROGRAM) beep $(TMP2)/usr/bin - test "$(STRIP)" != true || strip \ - --remove-section=.comment --remove-section=.note \ - $(TMP1)/usr/bin/beep $(TMP2)/usr/bin/beep - - -# Build architecture-independent files here. -binary-indep: build -# We have nothing to do by default. - - -binary-arch: build install - $(checkdir) - $(checkroot) - $(INSTALL_DIR) $(TMP1)/DEBIAN $(TMP2)/DEBIAN - $(INSTALL_FILE) debian/README.Debian debian/copyright \ - $(TMP1)/usr/share/doc/$(PKG1) - $(INSTALL_FILE) debian/changelog \ - $(TMP1)/usr/share/doc/$(PKG1)/changelog.Debian - gzip -9 $(TMP1)/usr/share/doc/$(PKG1)/changelog.Debian - $(INSTALL_SCRIPT) debian/postinst debian/postrm debian/config \ - $(TMP1)/DEBIAN - po2debconf debian/templates > $(TMP1)/DEBIAN/templates - dpkg-shlibdeps -Tdebian/$(PKG1).substvars -dDepends $(TMP1)/usr/bin/beep - dpkg-gencontrol -ldebian/changelog -isp -Tdebian/$(PKG1).substvars -p$(PKG1) \ - -P$(TMP1) - cd $(TMP1) && find * -type f ! -regex '^DEBIAN/.*' -print0 | \ - xargs -r0 md5sum > DEBIAN/md5sums - dpkg --build $(TMP1) .. - dpkg-shlibdeps -Tdebian/$(PKG2).substvars -dDepends -tudeb \ - $(TMP2)/usr/bin/beep - dpkg-gencontrol -ldebian/changelog -isp -Tdebian/$(PKG2).substvars -p$(PKG2) \ - -P$(TMP2) -UHomepage -n$(PKG2)_$(VERSION)_$(ARCH).udeb - dpkg --build $(TMP2) ../$(PKG2)_$(VERSION)_$(ARCH).udeb - - -binary: binary-arch - -define checkdir - test -f debian/rules -endef - -define checkroot - test root = "`whoami`" -endef - -.PHONY: clean build install binary-arch binary +#DH_VERBOSE = 1 + +%: + dh $@ + +override_dh_auto_build: + dh_auto_build -- FLAGS="$(shell dpkg-buildflags --get CFLAGS)" + +override_dh_auto_install: + cp beep debian/beep/usr/bin + cp beep debian/beep-udeb/usr/bin + cp beep.1.gz debian/beep/usr/share/man/man1 + gunzip debian/beep/usr/share/man/man1/beep.1.gz + cd debian/beep/usr/share/man/man1 && patch beep.1 ../../../../../beep.1.diff + -rm -f debian/beep/usr/share/man/man1/beep.1.orig + chown root:audio debian/beep/usr/bin/beep From 2c6fba5c1b847f20fab9b90a709c18010b9d0b1e Mon Sep 17 00:00:00 2001 From: Rhonda D'Vine Date: Tue, 12 Apr 2016 14:09:18 +0200 Subject: [PATCH 41/48] Finalize --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b3187fb..77be200 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,7 +9,7 @@ beep (1.3-4) unstable; urgency=low * Use pathfind() function instead of hardcoded path to dpkg-statoverride. * Name GPL properly in debian/copyright. - -- + -- Rhonda D'Vine Mon, 04 Jan 2016 13:34:37 +0100 beep (1.3-3) unstable; urgency=low From dbf0b43eff7da870aa455ab01af1f0e711c4c1a8 Mon Sep 17 00:00:00 2001 From: Rhonda D'Vine Date: Tue, 12 Apr 2016 14:23:34 +0200 Subject: [PATCH 42/48] Rewrite debian/copyright in DEP-5 format --- debian/changelog | 7 ++++ debian/copyright | 85 +++++++++++++++++++++++++----------------------- 2 files changed, 52 insertions(+), 40 deletions(-) diff --git a/debian/changelog b/debian/changelog index 77be200..70f196f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +beep (1.3-5) unstable; urgency=low + + * Rewrite debian/copyright in DEP-5 format, and relicense the packaging + under MIT to make it clear for lawyers, too. + + -- + beep (1.3-4) unstable; urgency=low * Update my name. diff --git a/debian/copyright b/debian/copyright index f217215..f499991 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,40 +1,45 @@ -This package was debianized by Rhonda D'Vine on -Thu, 18 Oct 2001 09:26:50 +0200. - -It was downloaded from http://www.johnath.com/beep/ - -Upstream Author: Johnathan Nightingale - -Copyright: -========== -This software is copyright (C) 2000 by Johnathan Nightingale. - - This code may distributed only under the terms of the GNU General - Public License which can be found at http://www.gnu.org/copyleft or in - the file COPYING supplied with this code. - - This code is not distributed with warranties of any kind, including - implied warranties of merchantability or fitness for a particular use - or ability to breed pandas in captivity, it just can't be done. - -On Debian GNU/Linux systems, the complete text of the GNU General -Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'. -Later versions which the GNU project publishes on the above mentioned URL can -be found in the same directory. - - -The debianization of the package is licensed under the WTFPLv2: - - DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - Version 2, December 2004 - - Copyright (C) 2002-2009 Rhonda D'Vine - - Everyone is permitted to copy and distribute verbatim or modified - copies of this license document, and changing it is allowed as long - as the name is changed. - - DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. You just DO WHAT THE FUCK YOU WANT TO. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: beep +Upstream-Contact: Johnathan Nightingale +Source: http://www.johnath.com/beep/ + +Files: * +Copyright: 2000 Jonathan Nightingale +License: GPL-1+ + +Files: debian/* +Copyright: 2001-2016 Rhonda D'Vine +License: MIT + +License: GPL-1+ + This code may distributed only under the terms of the GNU General + Public License which can be found at http://www.gnu.org/copyleft or in + the file COPYING supplied with this code. + . + This code is not distributed with warranties of any kind, including + implied warranties of merchantability or fitness for a particular use + or ability to breed pandas in captivity, it just can't be done. + . + On Debian GNU/Linux systems, the complete text of the GNU General + Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'. + Later versions which the GNU project publishes on the above mentioned URL can + be found in the same directory. + +License: MIT + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. From df5205ffe0015ae49fd0bb842747499c1cc8d683 Mon Sep 17 00:00:00 2001 From: Rhonda D'Vine Date: Thu, 26 Apr 2018 18:06:48 +0200 Subject: [PATCH 43/48] CVE-2018-0492 --- debian/changelog | 6 +- debian/patches/CVE-2018-0492.patch | 104 +++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 109 insertions(+), 2 deletions(-) create mode 100644 debian/patches/CVE-2018-0492.patch diff --git a/debian/changelog b/debian/changelog index 70f196f..1b54ad3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,11 @@ -beep (1.3-5) unstable; urgency=low +beep (1.3-5) unstable; urgency=high * Rewrite debian/copyright in DEP-5 format, and relicense the packaging under MIT to make it clear for lawyers, too. + * CVE-2018-0492: Fix a local privilege escalation vulnerability. + (Closes: #894667) - -- + -- Rhonda D'Vine Thu, 26 Apr 2018 18:08:11 +0200 beep (1.3-4) unstable; urgency=low diff --git a/debian/patches/CVE-2018-0492.patch b/debian/patches/CVE-2018-0492.patch new file mode 100644 index 0000000..e69ef05 --- /dev/null +++ b/debian/patches/CVE-2018-0492.patch @@ -0,0 +1,104 @@ +--- beep-1.3.orig/beep.c ++++ beep-1.3/beep.c +@@ -109,6 +109,7 @@ void do_beep(int freq) { + /* BEEP_TYPE_EVDEV */ + struct input_event e; + ++ memset(&e, 0, sizeof(e)); + e.type = EV_SND; + e.code = SND_TONE; + e.value = freq; +@@ -121,10 +122,6 @@ void do_beep(int freq) { + /* If we get interrupted, it would be nice to not leave the speaker beeping in + perpetuity. */ + void handle_signal(int signum) { +- +- if(console_device) +- free(console_device); +- + switch(signum) { + case SIGINT: + case SIGTERM: +@@ -254,7 +251,7 @@ void parse_command_line(int argc, char * + result->verbose = 1; + break; + case 'e' : /* also --device */ +- console_device = strdup(optarg); ++ console_device = optarg; + break; + case 'h' : /* notice that this is also --help */ + default : +@@ -273,26 +270,6 @@ void play_beep(beep_parms_t parms) { + "%d delay after) @ %.2f Hz\n", + parms.reps, parms.length, parms.delay, parms.end_delay, parms.freq); + +- /* try to snag the console */ +- if(console_device) +- console_fd = open(console_device, O_WRONLY); +- else +- 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", +- console_device != NULL ? console_device : "/dev/tty0 or /dev/vc/0"); +- printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ +- perror("open"); +- exit(1); +- } +- +- if (ioctl(console_fd, EVIOCGSND(0)) != -1) +- console_type = BEEP_TYPE_EVDEV; +- else +- console_type = BEEP_TYPE_CONSOLE; +- + /* Beep */ + for (i = 0; i < parms.reps; i++) { /* start beep */ + do_beep(parms.freq); +@@ -302,8 +279,6 @@ void play_beep(beep_parms_t parms) { + if(parms.end_delay || (i+1 < parms.reps)) + usleep(1000*parms.delay); /* wait... */ + } /* repeat. */ +- +- close(console_fd); + } + + +@@ -325,6 +300,26 @@ int main(int argc, char **argv) { + signal(SIGTERM, handle_signal); + parse_command_line(argc, argv, parms); + ++ /* try to snag the console */ ++ if(console_device) ++ console_fd = open(console_device, O_WRONLY); ++ else ++ 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", ++ console_device != NULL ? console_device : "/dev/tty0 or /dev/vc/0"); ++ printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ ++ perror("open"); ++ exit(1); ++ } ++ ++ if (ioctl(console_fd, EVIOCGSND(0)) != -1) ++ console_type = BEEP_TYPE_EVDEV; ++ else ++ console_type = BEEP_TYPE_CONSOLE; ++ + /* this outermost while loop handles the possibility that -n/--new has been + used, i.e. that we have multiple beeps specified. Each iteration will + play, then free() one parms instance. */ +@@ -362,8 +357,8 @@ int main(int argc, char **argv) { + parms = next; + } + +- if(console_device) +- free(console_device); ++ close(console_fd); ++ console_fd = -1; + + return EXIT_SUCCESS; + } diff --git a/debian/patches/series b/debian/patches/series index 2c1d9d6..981c6c7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ catch-sig-term fix-makefile +CVE-2018-0492.patch From e72a8c8c325020e6bd2fe9369452a8b519384806 Mon Sep 17 00:00:00 2001 From: Rhonda D'Vine Date: Thu, 26 Apr 2018 19:08:45 +0200 Subject: [PATCH 44/48] Bump Standards-Version to 4.1.4 --- debian/changelog | 3 ++- debian/control | 2 +- debian/copyright | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1b54ad3..fb484a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,8 @@ beep (1.3-5) unstable; urgency=high * Rewrite debian/copyright in DEP-5 format, and relicense the packaging under MIT to make it clear for lawyers, too. * CVE-2018-0492: Fix a local privilege escalation vulnerability. - (Closes: #894667) + (closes: #894667) + * Bump Standards-Version to 4.1.4. -- Rhonda D'Vine Thu, 26 Apr 2018 18:08:11 +0200 diff --git a/debian/control b/debian/control index 4bdf952..99c44fa 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: sound Priority: optional Maintainer: Rhonda D'Vine Build-Depends: debhelper (>= 9~), po-debconf, patch -Standards-Version: 3.9.6 +Standards-Version: 4.1.4 Homepage: http://johnath.com/beep/ Vcs-Browser: http://git.deb.at/w/pkg/beep.git Vcs-Git: git://git.deb.at/pkg/beep.git diff --git a/debian/copyright b/debian/copyright index f499991..15a2375 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: beep Upstream-Contact: Johnathan Nightingale Source: http://www.johnath.com/beep/ From 4380619227b0a9e8ee454cb6225061a6ccc1aea2 Mon Sep 17 00:00:00 2001 From: Rhonda D'Vine Date: Thu, 26 Apr 2018 19:09:09 +0200 Subject: [PATCH 45/48] Switch Architecture to linux-any (closes: 745163) --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index fb484a0..1b97b84 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ beep (1.3-5) unstable; urgency=high * CVE-2018-0492: Fix a local privilege escalation vulnerability. (closes: #894667) * Bump Standards-Version to 4.1.4. + * Switch Architecture to linux-any (closes: 745163) -- Rhonda D'Vine Thu, 26 Apr 2018 18:08:11 +0200 diff --git a/debian/control b/debian/control index 99c44fa..f81d9cd 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Vcs-Browser: http://git.deb.at/w/pkg/beep.git Vcs-Git: git://git.deb.at/pkg/beep.git Package: beep -Architecture: any +Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 0.5) | debconf-2.0 Description: advanced pc-speaker beeper beep does what you'd expect: it beeps. But unlike printf "\a" beep allows From 7c5d36d7ca6a9c8b7ee5e348cae9a97e16123246 Mon Sep 17 00:00:00 2001 From: Rhonda D'Vine Date: Thu, 26 Apr 2018 19:22:32 +0200 Subject: [PATCH 46/48] Fix group permission of beep (closes: #812144) --- debian/changelog | 3 ++- debian/rules | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1b97b84..f2f9841 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,8 @@ beep (1.3-5) unstable; urgency=high * CVE-2018-0492: Fix a local privilege escalation vulnerability. (closes: #894667) * Bump Standards-Version to 4.1.4. - * Switch Architecture to linux-any (closes: 745163) + * Switch Architecture to linux-any (closes: #745163) + * Fix group permission of beep (closes: #812144) -- Rhonda D'Vine Thu, 26 Apr 2018 18:08:11 +0200 diff --git a/debian/rules b/debian/rules index 48c55d4..f6fcf28 100755 --- a/debian/rules +++ b/debian/rules @@ -14,4 +14,7 @@ override_dh_auto_install: gunzip debian/beep/usr/share/man/man1/beep.1.gz cd debian/beep/usr/share/man/man1 && patch beep.1 ../../../../../beep.1.diff -rm -f debian/beep/usr/share/man/man1/beep.1.orig + +override_dh_fixperms: + dh_fixperms chown root:audio debian/beep/usr/bin/beep From fa21b00ad3851dc322fe20c8ea21dcd9187972ca Mon Sep 17 00:00:00 2001 From: Rhonda D'Vine Date: Thu, 26 Apr 2018 19:28:34 +0200 Subject: [PATCH 47/48] Add package description suggestions (closes: #630161) --- debian/changelog | 1 + debian/control | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index f2f9841..8772468 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ beep (1.3-5) unstable; urgency=high * Bump Standards-Version to 4.1.4. * Switch Architecture to linux-any (closes: #745163) * Fix group permission of beep (closes: #812144) + * Add package description suggestions (closes: #630161) -- Rhonda D'Vine Thu, 26 Apr 2018 18:08:11 +0200 diff --git a/debian/control b/debian/control index f81d9cd..2630796 100644 --- a/debian/control +++ b/debian/control @@ -11,8 +11,8 @@ Vcs-Git: git://git.deb.at/pkg/beep.git Package: beep Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 0.5) | debconf-2.0 -Description: advanced pc-speaker beeper - beep does what you'd expect: it beeps. But unlike printf "\a" beep allows +Description: advanced PC-speaker beeper + beep does what you'd expect: it beeps. But unlike printf "\a", beep allows you to control pitch, duration, and repetitions. Its job is to live inside shell/perl scripts and allow more granularity than one has otherwise. It is controlled completely through command line options. It's not supposed to be @@ -24,7 +24,7 @@ Package-Type: udeb Architecture: any Section: debian-installer Depends: ${shlibs:Depends}, ${misc:Depends} -Description: advanced pc-speaker beeper - minimal package +Description: advanced PC-speaker beeper - minimal package beep does what you'd expect: it beeps. However, it offers various additional features, such as the ability to control pitch, duration, and repetitions. From 3ac3c7e8d38e6ac6b1427aed74a579f5b7485cb2 Mon Sep 17 00:00:00 2001 From: Stefan Helmert Date: Fri, 28 Sep 2018 21:56:36 +0200 Subject: [PATCH 48/48] fixed race condition --- beep.c | 61 +++++++++++++++++++++++++--------------------------------- 1 file changed, 26 insertions(+), 35 deletions(-) diff --git a/beep.c b/beep.c index 452fc08..c874a42 100644 --- a/beep.c +++ b/beep.c @@ -16,6 +16,7 @@ * Bug me, I like it: http://johnath.com/ or johnath@johnath.com */ +#include #include #include #include @@ -92,12 +93,9 @@ enum { BEEP_TYPE_CONSOLE, BEEP_TYPE_EVDEV }; /* Momma taught me never to use globals, but we need something the signal handlers can get at.*/ -int console_fd = -1; -int console_type = BEEP_TYPE_CONSOLE; -char *console_device = NULL; +volatile sig_atomic_t stop = false; - -void do_beep(int freq) { +void do_beep(int freq, int console_fd, int console_type) { if (console_type == BEEP_TYPE_CONSOLE) { if(ioctl(console_fd, KIOCSOUND, freq != 0 ? (int)(CLOCK_TICK_RATE/freq) @@ -121,22 +119,7 @@ void do_beep(int freq) { /* If we get interrupted, it would be nice to not leave the speaker beeping in perpetuity. */ void handle_signal(int signum) { - - if(console_device) - free(console_device); - - switch(signum) { - case SIGINT: - if(console_fd >= 0) { - /* Kill the sound, quit gracefully */ - do_beep(0); - close(console_fd); - exit(signum); - } else { - /* Just quit gracefully */ - exit(signum); - } - } + stop = true; } /* print usage and exit */ @@ -171,7 +154,7 @@ void usage_bail(const char *executable_name) { * March 29, 2002 - Daniel Eisenbud points out that c should be int, not char, * for correctness on platforms with unsigned chars. */ -void parse_command_line(int argc, char **argv, beep_parms_t *result) { +void parse_command_line(int argc, char **argv, beep_parms_t *result, char *console_device) { int c; struct option opt_list[7] = {{"help", 0, NULL, 'h'}, @@ -264,9 +247,14 @@ void parse_command_line(int argc, char **argv, beep_parms_t *result) { result->freq = DEFAULT_FREQ; } -void play_beep(beep_parms_t parms) { +void play_beep(beep_parms_t parms, char *console_device) { int i; /* loop counter */ + int console_fd = -1; + int console_type = BEEP_TYPE_CONSOLE; + if (stop) { + return; + } if(parms.verbose == 1) fprintf(stderr, "[DEBUG] %d times %d ms beeps (%d delay between, " "%d delay after) @ %.2f Hz\n", @@ -293,13 +281,14 @@ void play_beep(beep_parms_t parms) { console_type = BEEP_TYPE_CONSOLE; /* Beep */ - for (i = 0; i < parms.reps; i++) { /* start beep */ - do_beep(parms.freq); + for (i = 0; i < parms.reps && !stop; i++) { /* start beep */ + do_beep(parms.freq, console_fd, console_type); /* Look ma, I'm not ansi C compatible! */ usleep(1000*parms.length); /* wait... */ - do_beep(0); /* stop beep */ - if(parms.end_delay || (i+1 < parms.reps)) - usleep(1000*parms.delay); /* wait... */ + do_beep(0, console_fd, console_type); /* stop beep */ + if(parms.end_delay || (i+1 < parms.reps)) { + usleep(1000*parms.delay); /* wait... */ + } } /* repeat. */ close(console_fd); @@ -321,12 +310,14 @@ int main(int argc, char **argv) { parms->next = NULL; signal(SIGINT, handle_signal); - parse_command_line(argc, argv, parms); + char *console_device = NULL; + parse_command_line(argc, argv, parms, console_device); + /* this outermost while loop handles the possibility that -n/--new has been used, i.e. that we have multiple beeps specified. Each iteration will play, then free() one parms instance. */ - while(parms) { + while(parms && !stop) { beep_parms_t *next = parms->next; if(parms->stdin_beep) { @@ -339,20 +330,20 @@ int main(int argc, char **argv) { not much to be done about that. */ setvbuf(stdin, NULL, _IONBF, 0); setvbuf(stdout, NULL, _IONBF, 0); - while(fgets(sin, 4096, stdin)) { + while(fgets(sin, 4096, stdin) && !stop) { if(parms->stdin_beep==CHAR_STDIN_BEEP) { - for(ptr=sin;*ptr;ptr++) { + for(ptr=sin;*ptr && !stop;ptr++) { putchar(*ptr); fflush(stdout); - play_beep(*parms); + play_beep(*parms, console_device); } } else { fputs(sin, stdout); - play_beep(*parms); + play_beep(*parms, console_device); } } } else { - play_beep(*parms); + play_beep(*parms, console_device); } /* Junk each parms struct after playing it */