diff --git a/debian/changelog b/debian/changelog index 062a5b7..8572675 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +slay (2.6) unstable; urgency=low + + * Fixed behavior when trying to slay oneself (closes: #338637) + * Depend on debconf | debconf-2.0 (closes: #332097) + * Remove /etc/slay_mode when purging (closes: #340046) + * Properly redirect (expected) error messages to /dev/null (closes: #344095) + * Added swedish translation of debconf messages from Daniel Nylander + (closes: #330820) + * Updated german translation of debconf messages using translations from + Daniel Knabl (closes: #330449) + * Updated changelog inside the script :^) + + -- Pawel Wiecek Fri, 31 Mar 2006 23:03:00 +0200 + slay (2.5) unstable; urgency=low * Added vietnamese translations of debconf templates from Clytie Siddall diff --git a/debian/control b/debian/control index 18fa384..2773631 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Package: slay Architecture: all -Depends: debconf +Depends: debconf | debconf-2.0 Description: Kills all of the user's processes Slay provides you with a way to quickly get rid of all processes a particular user owns. Very useful if you want diff --git a/debian/po/de.po b/debian/po/de.po index d274f70..072ee9f 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -1,28 +1,26 @@ -# -# 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. -# Erik Schanze , 2004. -# +# 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: slay_2.2_templates\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2003-07-22 01:14+0200\n" -"PO-Revision-Date: 2004-08-17 08:15+0200\n" -"Last-Translator: Erik Schanze \n" -"Language-Team: German \n" +"PO-Revision-Date: 2005-09-28 06:03+0200\n" +"Last-Translator: Daniel Knabl \n" +"Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.3.1\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Content-Transfer-Encoding: 8bit" #. Description #: ../templates:4 @@ -38,16 +36,16 @@ "inconvenient. Therefore slay can be configured to punish users or just to " "display error message." msgstr "" -"Standardmäßig bestraft slay normale Benutzer, die es versuchen zu starten, " -"indem es alle deren Prozesse beendet. Dies ist Das Richtige(TM), weil Benutzer " -"nichts mit Kommandos für die Administration zu schaffen haben sollen, aber " -"manche Admins wollen das nicht. Deshalb kann slay eingerichtet werden, die " -"Benutzer zu bestrafen oder nur eine Fehlermeldung anzuzeigen." +"Für gewöhnlich bestraft slay normale Benutzer, indem es sie selbst 'slayed'." +"Das ist richtig so(TM), da Benutzer nicht mit administrativen Kommandos wie" +"slay spielen sollten, aber manche Administratoren fiden das unangenehm. " +"Daher kann slay so eingerichtet werden, dass es Benutzer bestraft oder nur " +"eine Fehlermeldung ausgibt." #. Description #: ../templates:14 msgid "Shall slay use `Butt-head' mode by default?" -msgstr "Soll slay den Modus `Butt-head' als Standard verwenden?" +msgstr "Soll slay standarmäßig den 'Butt-head' Modus verwenden?" #. Description #: ../templates:14 @@ -58,9 +56,9 @@ "language you'll find in the alternative set. In most cases, the standard " "set of messages is more appropriate." msgstr "" -"Slay hat zwei Mengen von Mitteilungen: Standard-Mitteilungen und alternative, " -"die formloser sind. Die alternative Menge wurde nach \"Butt-head\" aus der " -"Zeichentrickserie \"Beavis & Butt-head\" von MTV benannt, einer Figur, die eine " -"Sprache benutzte, die Sie in der alternativen Menge finden. In den meisten " -"Fällen passt die Standardmenge besser." +"Slay besitzt zwei Sammlungen von Meldungen: eine Standardsammlung und eine " +"alternative die etwas informativer ist. Die alternative wurde nach \"Butt-head\" von " +"MTV's \"Beavis·&·Butt-head\" Cartoon benannt, einem Charakter, der diese Art von " +"Sprache verwendet, die Sie in der alternativen Sammlung finden. In den meisten " +"Fällen ist die Standardsammlung eher mehr angemessen." diff --git a/debian/po/sv.po b/debian/po/sv.po new file mode 100644 index 0000000..bd46d65 --- /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: slay 2.5\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-07-22 01:14+0200\n" +"PO-Revision-Date: 2005-09-29 23:16-0700\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" + +#. Description +#: ../templates:4 +msgid "Shall slay punish users?" +msgstr "Ska slay straffa användare?" + +#. Description +#: ../templates:4 +msgid "" +"Normally slay will punish ordinary users trying to run it by slaying " +"themselves. This is The Right Thing(TM), as users should not mess with " +"administrative commands like slay, but some administrators find it " +"inconvenient. Therefore slay can be configured to punish users or just to " +"display error message." +msgstr "" +"Normalt kommer slay att straffa vanliga användare som försöker starta den genom " +"att slakta dom själv. Detta är Det Rätta Att Göra(tm) eftersom användare inte ska " +"trixa runt med administrativa kommandon såsom slay men vissa administratörer " +"tycker det är olämpligt. Därför kan slay konfigureras att straffa användare eller " +"vara visa ett felmeddelande." + +#. Description +#: ../templates:14 +msgid "Shall slay use `Butt-head' mode by default?" +msgstr "Ska slay använda 'Butt-head'-läget som standard?" + +#. Description +#: ../templates:14 +msgid "" +"Slay has two sets of messages: a standard set and an alternative set that is " +"more informal. The alternative set is named after \"Butt-head\" from MTV's " +"\"Beavis & Butt-head\" cartoon show, a character who uses the sort of " +"language you'll find in the alternative set. In most cases, the standard " +"set of messages is more appropriate." +msgstr "" +"Slay har två olika sorters meddelande: ett standardsätt och ett alternativt sätt " +"som är mer informellt. Det alternativa är namngett efter 'Butt-head' från MTV's " +"\"Beavis & Butt-head\" TV-serie, en karaktär som använder den sortens språk " +"som du hittar i det alternativa sättet. I många fall är standardsättet det mest " +"lämpliga." + diff --git a/debian/postrm b/debian/postrm new file mode 100755 index 0000000..f4fb83a --- /dev/null +++ b/debian/postrm @@ -0,0 +1,8 @@ +#!/bin/sh -e + +if [ "$1" = purge ] +then + rm -f /etc/slay_mode +fi + +#DEBHELPER# diff --git a/debian/rules b/debian/rules index 09e28bf..908425c 100755 --- a/debian/rules +++ b/debian/rules @@ -6,7 +6,7 @@ #export DH_VERBOSE=1 # This is the debhelper compatability version to use. -export DH_COMPAT=3 +export DH_COMPAT=4 configure: configure-stamp configure-stamp: diff --git a/slay b/slay index 8b3deab..2c9bc64 100755 --- a/slay +++ b/slay @@ -12,6 +12,10 @@ # 1.2 Added slayee notification. # 2.0 Completely rewritten # 2.1 Fix an *ugly* bug that caused slayer to be slain... +# 2.2, 2.3 Debian specific updates +# 2.4 Updated command line handler to avois username/signal name mismatches +# 2.5 Debian specific updates +# 2.6 Properly slay oneself, fixed misleading error messages USER=`whoami` SIGNAL='-KILL' @@ -85,7 +89,7 @@ fi # Misuse trap. -if [ "$USER" != "$1" ] +if [ "$USER" != "$SLAYEE" ] then if [ "$USER" != "root" ] then @@ -120,21 +124,21 @@ if [ "$SLAY_BUTTHEAD" = "on" ] then echo "${ME}: $SIGSHOW is kicking $slayee's butt!" - echo -e "\\n\\n\\nI'm kicking your butt.\\n\\n\\n" | write $slayee 2>/dev/null + echo -e "\\n\\n\\nI'm kicking your butt.\\n\\n\\n" | write $slayee else echo "${ME}: Sending $SIGSHOW signal to $slayee's process(es)..." echo -e "\\n\\n\\nYour current session has been terminated.\\n\\n\\n" | \ - write $slayee 2>/dev/null + write $slayee fi if [ "$SIGNAL" = "-clean" ] then - su -m $slayee -c "kill -TERM -1 2>/dev/null" + su -m $slayee -c "kill -TERM -1" sleep 10 - su -m $slayee -c "kill -KILL -1 2>/dev/null" + su -m $slayee -c "kill -KILL -1" else - su -m $slayee -c "kill $SIGNAL -1 2>/dev/null" + su -m $slayee -c "kill $SIGNAL -1" fi -done +done 2>/dev/null # Error message. if [ $COOL = "0" ]