Imported Debian patch 0.28-9

13 files changed, 142 insertions, 144 deletions

diff --git a/debian/bug/presubj b/debian/bug/presubj
deleted file mode 100644
index 8b27000..0000000
--- a/debian/bug/presubj
+++ /dev/null
@@ -1,5 +0,0 @@
-------------------------------------------------------------------------
-If this bug is about a new Debconf templates translation or an update to
-an existing translation, please try to get it proof-read and reviewed by
-the appropriate language team.
-------------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 003f052..77f4f5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+ifplugd (0.28-9) unstable; urgency=low
+
+  * Thanks for updated debconf translations
+    + Basque: Piarres Beobide <pi+debian@beobide.net> (Closes: #475350)
+    + Russian: Yuri Kozlov <kozlov.y@gmail.com> (Closes: #476141)
+    + French: Jean-Luc Coulon <jean-luc.coulon@wanadoo.fr> (Closes: #476358)
+    + Czech: Miroslav Kure <kurem@upcase.inf.upol.cz> (Closes: #476591)
+  * Improved package description, per dev-ref (v3.3.9) Section 6.2.2.
+  * Suggest wpasupplicant, waproamd
+  * Remove the 'bug' presubj file, there isn't anything in there special to
+    the ifplugd package.  All translations should be reviewed anyway.
+  * Remove template code and comments from postrm and postinst.
+  * Redefine the "all" option of HOTPLUG_INTERFACES to all but the ones listed
+    in INTERFACES.  Thanks Olaf Conradi <o.conradi@student.utwente.nl> for the
+    patch (Closes: #287512)
+
+ -- Y Giridhar Appaji Nag <giridhar@appaji.net>  Sun, 20 Apr 2008 12:44:27 +0530
+
 ifplugd (0.28-8) unstable; urgency=low
 
   * Add DM-Upload-Allowed: yes
@@ -161,7 +179,7 @@ ifplugd (0.28-2) unstable; urgency=low
   * include /etc/udev/rules.d/ (closes: #359936)
   * update danish debconf translation (closes: #360033)
   * include vietnamese debconf translation (closes: #311926)
-	
+
  -- Oliver Kurth <oku@debian.org>  Thu, 30 Mar 2006 10:52:39 -0800
 
 ifplugd (0.28-1) unstable; urgency=low
@@ -176,7 +194,7 @@ ifplugd (0.28-1) unstable; urgency=low
   * fix path to ifplugd.conf in man pages to /etc/default/ifplugd.conf (closes: #349317)
   * added swedish debconf translation (closes: #338933)
   * added german debconf translation (closes: #334422)
-	
+
  -- Oliver Kurth <oku@debian.org>  Mon, 27 Mar 2006 10:45:20 -0800
 
 ifplugd (0.26-2.1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index c2d100a..33325a5 100644
--- a/debian/control
+++ b/debian/control
@@ -13,22 +13,21 @@ Package: ifplugd
 Architecture: any
 Depends:  ${shlibs:Depends}, debconf (>= 1.2.0) | debconf-2.0
 Recommends: ifupdown (>= 0.6.4-4.2)
-Description: A configuration daemon for ethernet devices
- ifplugd is a daemon which will automatically configure your
- ethernet device when a cable is plugged in and automatically
- unconfigure it if the cable is pulled. This is useful on laptops with
- onboard network adapters, since it will only configure the interface
- when a cable is really connected.
+Suggests: wpasupplicant, waproamd
+Description: configuration daemon for ethernet devices
+ ifplugd is a daemon which will automatically configure your ethernet device
+ when a cable is plugged in and automatically de-configure it if the cable is
+ pulled out. This is useful on laptops with onboard network adapters, since it
+ will only configure the interface when a cable is really connected.  Features
+ include:
  .
- Some features:
-  * May beep when the cable is unplugged, plugged, the interface
-    configuration succeeded or failed.
-  * Syslog support
-  * small
+  * syslog support
   * Multiple ethernet interface support
-  * Support for wireless networking. Whenever an association to an AP
-    is detected the network is configured. Have a look on waproamd
-    if you need a facility to configure WEP keys before AP
-    associations succeed.
-  * Compatibility mode for network devices which do not support cable
-    detection
+  * Uses Debian's native ifup/ifdown programs
+  * Small executable size and memory footprint
+  * Option to beep when the cable is unplugged or plugged
+  * Option to beep when the interface configuration succeeds or fails
+  * Can be configured to ignore short unplugged or plugged periods
+  * Configure WLAN devices (on detecting a successful association to an AP)
+  * Supports SIOCETHTOOL, SIOCGMIIREG and SIOCDEVPRIVATE for getting link status
+  * Compatibility mode for network devices which do not support cable detection
diff --git a/debian/ifplugd.udev.agent b/debian/ifplugd.udev.agent
index d632bff..fe02b51 100644
--- a/debian/ifplugd.udev.agent
+++ b/debian/ifplugd.udev.agent
@@ -19,8 +19,25 @@ DEBUG=yes export DEBUG
 [ -f $CFG ] || { mesg No $DAEMON_NAME configuration file ; exit 1 ; }
 . $CFG
 
-for IF in $HOTPLUG_INTERFACES ; do
-    if [ "$INTERFACE" = "$IF" -o "$IF" = "all" ] ; then
+# return true (0) if interface from list $1 is in list $2
+# return false (1) otherwise
+search_interfaces () {
+    for IF in $2 ; do
+        for SEARCH_IF in $1 ; do
+            if [ "$SEARCH_IF" = "$IF" ] ; then
+                return 0
+            fi
+        done
+    done
+    return 1
+}
+
+search_interfaces "$INTERFACE" "$INTERFACES"
+if [ $? -gt 0 ] ; then
+    # Interface isn't statically managed by ifplugd
+    search_interfaces "all $INTERFACE" "$HOTPLUG_INTERFACES"
+    if [ $? -eq 0 ] ; then
+        # Interface is in hotplug allowed list
         case $ACTION in
         add|register)
             debug_mesg Invoking $DAEMON_NAME for $INTERFACE
@@ -33,4 +50,4 @@ for IF in $HOTPLUG_INTERFACES ; do
         esac
         break
     fi
-done
+fi
diff --git a/debian/install b/debian/install
deleted file mode 100644
index 3bec881..0000000
--- a/debian/install
+++ /dev/null
@@ -1 +0,0 @@
-debian/bug/presubj usr/share/bug/ifplugd
diff --git a/debian/patches/05_396895_HOTPLUG_conf_man.dpatch b/debian/patches/05_396895_HOTPLUG_conf_man.dpatch
index 84f15d5..e2535af 100644
--- a/debian/patches/05_396895_HOTPLUG_conf_man.dpatch
+++ b/debian/patches/05_396895_HOTPLUG_conf_man.dpatch
@@ -6,29 +6,30 @@
 
 @DPATCH@
 diff -urNad ifplugd-0.28~/man/ifplugd.conf.5 ifplugd-0.28/man/ifplugd.conf.5
---- ifplugd-0.28~/man/ifplugd.conf.5	2008-04-05 08:52:20.000000000 +0530
-+++ ifplugd-0.28/man/ifplugd.conf.5	2008-04-05 10:47:24.000000000 +0530
+--- ifplugd-0.28~/man/ifplugd.conf.5	2008-04-20 12:47:01.000000000 +0530
++++ ifplugd-0.28/man/ifplugd.conf.5	2008-04-20 12:48:24.000000000 +0530
 @@ -11,6 +11,9 @@
  \fBINTERFACES\f1
  Specifies the ethernet interfaces to monitor. It has to contain a space seperated list of network interfaces names. Most users will probably use "eth0" here, however you may add additional interfaces for monitoring more than one device. A special value is supported as well: "auto" will enable a more or less working auto detection of available network devices. This won't make you happy when using network module auto loading, since it cannot detect currently unloaded network devices.
  .TP
 +\fBHOTPLUG_INTERFACES\f1
-+Specifies the interfaces that can be hotplugged (like interfaces on PCMCIA, USB or WLAN adapters).  "all" can be used to make the udev script start an ifplugd process for any hotplugged interfaces.
++Specifies the interfaces that can be hotplugged (like interfaces on PCMCIA, USB or WLAN adapters).  "all" can be used to make the udev script start an ifplugd process for any hotplugged interfaces (except those already listed in INTERFACES).
 +.TP
  \fBARGS\f1
  Additional command line arguments for ifplugd invocation. See \fBifplugd(8)\f1 for further information.
  .TP
 diff -urNad ifplugd-0.28~/man/ifplugd.conf.5.xml.in ifplugd-0.28/man/ifplugd.conf.5.xml.in
---- ifplugd-0.28~/man/ifplugd.conf.5.xml.in	2003-12-11 23:28:45.000000000 +0530
-+++ ifplugd-0.28/man/ifplugd.conf.5.xml.in	2008-04-05 10:46:23.000000000 +0530
-@@ -51,12 +51,19 @@
+--- ifplugd-0.28~/man/ifplugd.conf.5.xml.in	2008-04-20 12:47:01.000000000 +0530
++++ ifplugd-0.28/man/ifplugd.conf.5.xml.in	2008-04-20 12:47:56.000000000 +0530
+@@ -51,12 +51,20 @@
  	  </option>
  
  	  <option>
 +		<p><opt>HOTPLUG_INTERFACES</opt></p> <optdesc><p>Specifies the
 +		interfaces that can be hotplugged (like interfaces on PCMCIA,
 +		USB or WLAN adapters).  "all" can be used to make the udev
-+		script start an ifplugd process for any hotplugged interfaces.
++		script start an ifplugd process for any hotplugged interfaces
++		(except those already listed in INTERFACES).
 +		</p></optdesc>
 +	  </option>
 +
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 1de1cae..6c642b6 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ifplugd\n"
 "Report-Msgid-Bugs-To: ifplugd@packages.debian.org\n"
-"POT-Creation-Date: 2008-04-05 01:15+0530\n"
-"PO-Revision-Date: 2006-06-04 17:41+0200\n"
+"POT-Creation-Date: 2008-04-04 16:43+0530\n"
+"PO-Revision-Date: 2008-04-17 20:53+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -101,15 +101,10 @@ msgstr "Parametry pro daemon ifplugd"
 #. Type: string
 #. Description
 #: ../ifplugd.templates:3001
-#, fuzzy
-#| msgid ""
-#| "You can give arguments to the ifplug daemon here. See the man page for a "
-#| "description or call ifplugd -h."
 msgid ""
 "You can give arguments to the ifplug daemon here.  Relevant options are:"
 msgstr ""
-"Nyní můžete zadat parametry pro daemona ifplugd. Jejich popis naleznete v "
-"manuálové stránce, nebo ve zkrácené podobě příkazem ifplugd -h."
+"Nyní můžete zadat parametry pro daemona ifplugd. Možnosti:"
 
 #. Type: string
 #. Description
@@ -122,6 +117,12 @@ msgid ""
 " -w Wait until daemon fork finished\n"
 " -I Don't exit on nonzero return value of program executed"
 msgstr ""
+" -q Při ukončení daemona nespustí skript\n"
+" -f Ignoruje chyby rozpoznávání a zkouší znovu\n"
+" -u Zadá zpoždění pro konfiguraci rozhraní\n"
+" -d Zadá zpoždění pro dekonfiguraci rozhraní\n"
+" -w Počká, než fork daemonu skončí\n"
+" -I Při nenulové návratové hodnotě spuštěného programu neskončí"
 
 #. Type: string
 #. Description
@@ -136,6 +137,14 @@ msgid ""
 " -W Wait until the daemon died when running daemon is killed\n"
 " -M Use interface monitoring"
 msgstr ""
+" -a Nebude rozhraní povolovat automaticky\n"
+" -s Pro ladění použije místo syslogu stderr\n"
+" -b Nebude pípat (-U/-D Nebude pípat při nahození/shození rozhraní)\n"
+" -t Zadá interval dotazování (v sekundách, výchozí: 1)\n"
+" -p Při spuštění daemona nespustí skript\n"
+" -l Pokud při spuštění není rozpoznán kabel, spustí skript \"down\"\n"
+" -W Pokud je běžící daemon zabit, počká, než opravdu umře\n"
+" -M Bude sledovat rozhraní"
 
 #. Type: select
 #. Choices
@@ -200,6 +209,3 @@ msgstr ""
 "zastaví a po probuzení zase restartuje. To je užitečné, pokud používáte "
 "nějaký způsob zjištění síťového prostředí, ke kterému jste připojeni, "
 "protože to se může během spánku změnit. (Viz balíky guessnet nebo whereami.)"
-
-#~ msgid "none, suspend, stop"
-#~ msgstr "nic, uspat, zastavit"
diff --git a/debian/po/eu.po b/debian/po/eu.po
index da8f877..ae28d3e 100644
--- a/debian/po/eu.po
+++ b/debian/po/eu.po
@@ -1,4 +1,4 @@
-# translation of ifplugd-eu.po to Euskara
+# translation of eu.po to Euskara
 #
 #    Translators, if you are not familiar with the PO format, gettext
 #    documentation is worth reading, especially sections dedicated to
@@ -12,15 +12,15 @@
 #
 #    Developers do not need to manually edit POT or PO files.
 #
-# Piarres Beobide <pi@beobide.net>, 2007.
+# Piarres Beobide <pi@beobide.net>, 2007, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: ifplugd-eu\n"
+"Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: ifplugd@packages.debian.org\n"
-"POT-Creation-Date: 2008-04-05 01:15+0530\n"
-"PO-Revision-Date: 2007-12-26 12:09+0100\n"
+"POT-Creation-Date: 2008-04-04 16:43+0530\n"
+"PO-Revision-Date: 2008-04-10 11:21+0200\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
-"Language-Team: Euskara <Librezale@librezale.org>\n"
+"Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -48,7 +48,7 @@ msgstr ""
 "prozesua interfaze hauetako bakoitzarentzat abiaraziko da ifplugd abiarazte "
 "script-a \"start\" argumentuaz exekutatzean. \"auto\" kate magikoa erabili "
 "dezakezu abiarazte programak /proc/net/dev-en agertzen diren eth eta wlan "
-"interfaze guztiak kontutan har ditzan. Kontutan izan /proc/net/dev-en "
+"interfaze guztiak kontutan har ditzan.  Kontutan izan /proc/net/dev-en "
 "agertzen diren interfaze zerrenda kargaturik dituzun kernel moduluen arabera "
 "aldatu daitekeela."
 
@@ -59,22 +59,20 @@ msgid ""
 "You should not add interfaces that are hotplugged (USB or PCMCIA) here, you "
 "will be asked for those in the next question."
 msgstr ""
-"Ez dituzu martxan konektatzen diren interfazeak /USB edo PCMCIA) hemen jarri "
+"Ez dituzu martxan konektatzen diren interfazeak (USB edo PCMCIA) hemen jarri "
 "behar, horietaz aurrerago galdetuko zaizu."
 
 #. Type: string
 #. Description
 #: ../ifplugd.templates:2001
 msgid "hotplugged interfaces to be watched by ifplugd:"
-msgstr ""
-"Ifplugd-ek begiratu behar dituen martxan konektatzen diren interfazeak:"
+msgstr "Ifplugd-ek begiratu behar dituen martxan konektatzen diren interfazeak:"
 
 #. Type: string
 #. Description
 #: ../ifplugd.templates:2001
 msgid "Specify the hotplugged interfaces to control here, separated by spaces."
-msgstr ""
-"Martxan konektatzen diren interfazeak hemen ezarri zuriunez bereizirik."
+msgstr "Martxan konektatzen diren interfazeak hemen ezarri zuriunez bereizirik."
 
 #. Type: string
 #. Description
@@ -89,8 +87,7 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../ifplugd.templates:2001
-msgid ""
-"Hotplugged interfaces are usually interfaces on PCMCIA or WLAN adapters."
+msgid "Hotplugged interfaces are usually interfaces on PCMCIA or WLAN adapters."
 msgstr ""
 "Makina martxan dagoela konektatu daitezkeen interfazeak arruntean PCMCIA edo "
 "haririk gabeko gailuak dira."
@@ -104,15 +101,8 @@ msgstr "ifplugd-rentzako argumentuak:"
 #. Type: string
 #. Description
 #: ../ifplugd.templates:3001
-#, fuzzy
-#| msgid ""
-#| "You can give arguments to the ifplug daemon here. See the man page for a "
-#| "description or call ifplugd -h."
-msgid ""
-"You can give arguments to the ifplug daemon here.  Relevant options are:"
-msgstr ""
-"Hemen ifplugd deabruari argumentuak bidali diezazkiokezu. Manual orria ikusi "
-"edo 'ifplugd -h' abiarazi azalpen bat ikusteko."
+msgid "You can give arguments to the ifplug daemon here.  Relevant options are:"
+msgstr "Hemen ifplugd deabruari argumentuak bidali diezazkiokezu.  Aukera garrantzitsuenak:"
 
 #. Type: string
 #. Description
@@ -125,6 +115,12 @@ msgid ""
 " -w Wait until daemon fork finished\n"
 " -I Don't exit on nonzero return value of program executed"
 msgstr ""
+" -q Ez exekutatu skripta deabrua ixtean\n"
+" -f Alde batetara utzi antzemate errorea eta berriz saiatu\n"
+" -u Ezarri atzerapena interfazea konfiguratzeko\n"
+" -d Ezarri atzerapena interfazea deskonfiguratzeko\n"
+" -w Itxoin deabru lana amaitu arte\n"
+" -I Ez irten programa exekutatuaren zero ez den erantzun batekin"
 
 #. Type: string
 #. Description
@@ -139,6 +135,14 @@ msgid ""
 " -W Wait until the daemon died when running daemon is killed\n"
 " -M Use interface monitoring"
 msgstr ""
+" -a Ez gaitu interfazea automatikoki\n"
+" -s stderr erabili sistema-erregistroa ordez arazpenerako\n"
+" -b Ez bip egin (-U/-D Ez bip egin interfazea jaitsi/igotzerakoan)\n"
+" -t Ezarri ilara denbora segundutan (lehenetsia: 1)\n"
+" -p Ez exekutatu skript-a deabrua abiaraztean\n"
+" -l Exekutatu \"down\" skripta abioan kablerik ez dagoela atzeman ezkero\n"
+" -W Itxoin deabrua hil arte abiaraziriiko deabrua akabatzen denean\n"
+" -M Erabili interfazea monitoreoa"
 
 #. Type: select
 #. Choices
@@ -204,3 +208,4 @@ msgstr ""
 "geldituko du. Saioa berreskuratzen abiaraziko da. Honek zentzua du zuk sare "
 "ingurunea atzemateko lanabes batenbat (adib. guessnet edo whereami) "
 "erabiltzen baduzu esekitzean aldatu egin daitezke eta."
+
diff --git a/debian/po/fr.po b/debian/po/fr.po
index f884b42..d4b7a71 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ifplugd\n"
 "Report-Msgid-Bugs-To: ifplugd@packages.debian.org\n"
-"POT-Creation-Date: 2008-04-05 01:15+0530\n"
-"PO-Revision-Date: 2008-03-16 11:26+0100\n"
+"POT-Creation-Date: 2008-04-04 16:43+0530\n"
+"PO-Revision-Date: 2008-04-05 12:21+0200\n"
 "Last-Translator: Jean-Luc Coulon (f5ibh) <jean-luc.coulon@wanadoo.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -106,12 +106,6 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../ifplugd.templates:3001
-#, fuzzy
-#| msgid ""
-#| "-q Don't run script on daemon quit, -f Ignore detection failure and "
-#| "retry, -u Specify delay for configuring interface, -d Specify delay for "
-#| "deconfiguring interface, -w Wait until daemon fork finished, -I Don't "
-#| "exit on nonzero return value of program executed,"
 msgid ""
 " -q Don't run script on daemon quit\n"
 " -f Ignore detection failure and retry\n"
@@ -120,22 +114,15 @@ msgid ""
 " -w Wait until daemon fork finished\n"
 " -I Don't exit on nonzero return value of program executed"
 msgstr ""
-"-q ne pas lancer le script lorsque le démon quitte, -f ignorer la détection "
-"de pannes et réessayer, -u indiquer le délai de configuration de "
-"l'interface, -w attendre jusqu'à ce que la réplication du démon soit "
-"terminée, -I ne pas quitter lorsque le programme exécuté retourne une valeur "
-"non nulle."
+" -q ne pas lancer le script lorsque le démon quitte\n"
+" -f ignorer la détection de pannes et réessayer\n"
+" -u indiquer le délai de configuration de l'interface\n"
+" -w attendre jusqu'à ce que la réplication du démon soit terminée\n"
+" -I ne pas quitter lorsque le programme exécuté retourne une valeur non nulle"
 
 #. Type: string
 #. Description
 #: ../ifplugd.templates:3001
-#, fuzzy
-#| msgid ""
-#| "-a Do not enable interface automatically,  -s Use stderr instead of "
-#| "syslog for debugging, -b Do not beep, -t Specify poll time in seconds, -p "
-#| "Don't run script on daemon startup, -l Run \"down\" script on startup if "
-#| "no cable is detected, -W Wait until the daemon died when running daemon "
-#| "is killed, -M Use interface monitoring,"
 msgid ""
 " -a Do not enable interface automatically\n"
 " -s Use stderr instead of syslog for debugging\n"
@@ -146,12 +133,14 @@ msgid ""
 " -W Wait until the daemon died when running daemon is killed\n"
 " -M Use interface monitoring"
 msgstr ""
-"-a ne pas activer l'interface automatiquement. -s utiliser stderr plutôt que "
-"syslog pour le débogage, -b ne pas émettre de signal sonore, -t indiquer "
-"l'intervalle de scrutation en secondes, -p ne pas lancer de script au "
-"démarrage du démon, -l lancer le script « down » au démarrage s'il aucun "
-"câble n'est détecté, -W attendre la mort du démon lorsque le démon en cours "
-"est tué, -M utiliser le suivi de l'interface."
+" -a ne pas activer l'interface automatiquement\n"
+" -s utiliser stderr plutôt que syslog pour le débogage\n"
+" -b ne pas émettre de signal sonore\n"
+" -t indiquer l'intervalle de scrutation en secondes\n"
+" -p ne pas lancer de script au démarrage du démon\n"
+" -l lancer le script « down » au démarrage si aucun câble n'est détecté\n"
+" -W attendre la mort du démon lorsque le démon en cours est tué\n"
+" -M utiliser le suivi de l'interface"
 
 #. Type: select
 #. Choices
diff --git a/debian/po/ru.po b/debian/po/ru.po
index b3e762b..e020955 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -1,4 +1,4 @@
-# translation of ifplugd_0.28-5_ru.po to Russian
+# 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
@@ -13,10 +13,10 @@
 # Yuri Kozlov <kozlov.y@gmail.com>, 2006, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: ifplugd 0.28-5\n"
+"Project-Id-Version: ifplugd 0.28-8\n"
 "Report-Msgid-Bugs-To: ifplugd@packages.debian.org\n"
 "POT-Creation-Date: 2008-04-05 01:15+0530\n"
-"PO-Revision-Date: 2008-03-16 14:33+0300\n"
+"PO-Revision-Date: 2008-04-06 08:35+0400\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -107,12 +107,6 @@ msgstr "Вы можете указать параметры для демона
 #. Type: string
 #. Description
 #: ../ifplugd.templates:3001
-#, fuzzy
-#| msgid ""
-#| "-q Don't run script on daemon quit, -f Ignore detection failure and "
-#| "retry, -u Specify delay for configuring interface, -d Specify delay for "
-#| "deconfiguring interface, -w Wait until daemon fork finished, -I Don't "
-#| "exit on nonzero return value of program executed,"
 msgid ""
 " -q Don't run script on daemon quit\n"
 " -f Ignore detection failure and retry\n"
@@ -121,22 +115,16 @@ msgid ""
 " -w Wait until daemon fork finished\n"
 " -I Don't exit on nonzero return value of program executed"
 msgstr ""
-"-q не запускать сценарий при выходе демона, -f игнорировать ошибки "
-"обнаружения и повторить, -u задать задержку при настройке интерфейса, -d "
-"задать задержку при деконфигурировании интерфейса, -w дождаться завершения "
-"создания потомка демона, -I не выходить при ненулевом возвращённом значении "
-"при выполнении программы,"
+" -q не запускать сценарий при выходе демона\n"
+" -f игнорировать ошибки обнаружения и повторить\n"
+" -u задать задержку при настройке интерфейса\n"
+" -d задать задержку при деконфигурировании интерфейса\n"
+" -w дождаться завершения работа потомка демона\n"
+" -I не выходить при ненулевом возвращённом значении при выполнении программы"
 
 #. Type: string
 #. Description
 #: ../ifplugd.templates:3001
-#, fuzzy
-#| msgid ""
-#| "-a Do not enable interface automatically,  -s Use stderr instead of "
-#| "syslog for debugging, -b Do not beep, -t Specify poll time in seconds, -p "
-#| "Don't run script on daemon startup, -l Run \"down\" script on startup if "
-#| "no cable is detected, -W Wait until the daemon died when running daemon "
-#| "is killed, -M Use interface monitoring,"
 msgid ""
 " -a Do not enable interface automatically\n"
 " -s Use stderr instead of syslog for debugging\n"
@@ -147,11 +135,15 @@ msgid ""
 " -W Wait until the daemon died when running daemon is killed\n"
 " -M Use interface monitoring"
 msgstr ""
-"-a не включать интерфейс автоматически, -s использовать stderr вместо syslog "
-"при отладке, -b работать беззвучно, -t задать период опроса в секундах, -p "
-"не запускать сценарий при запуске демона, -l на старте запускать сценарий "
-"\"down\" при обнаружении отсутствия кабеля, -W при \"убийстве\" демона "
-"дождаться завершения его работы, -M использовать интерфейс мониторинга,"
+" -a не включать интерфейс автоматически\n"
+" -s использовать stderr вместо syslog при отладке\n"
+" -b работать беззвучно (-U/-D не выдавать сигнал при поднятии/опускании "
+"инт.)\n"
+" -t задать период опроса в секундах (по умолчанию 1)\n"
+" -p не запускать сценарий при запуске демона\n"
+" -l на старте запускать сценарий \"down\" при обнаружении отсутствия кабеля\n"
+" -W при \"убийстве\" демона дождаться завершения его работы\n"
+" -M использовать интерфейс мониторинга"
 
 #. Type: select
 #. Choices
diff --git a/debian/postinst b/debian/postinst
index 4f499d4..c22dbf6 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -71,7 +71,4 @@ esac
 
 db_stop
 
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
- 
 #DEBHELPER#
diff --git a/debian/postrm b/debian/postrm
index 355e51b..b12de11 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -1,23 +1,7 @@
 #! /bin/sh
-# postrm script for #PACKAGE#
-#
-# see: dh_installdeb(1)
 
 set -e
 
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
 case "$1" in
        purge)
 
@@ -46,9 +30,6 @@ case "$1" in
 
 esac
 
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
 #DEBHELPER#
 
 exit 0
diff --git a/debian/rules b/debian/rules
index b290f3d..d1ccdb9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -71,7 +71,6 @@ install: build
 	install -m 755 debian/apm/ifplugd $(CURDIR)/debian/ifplugd/etc/apm/scripts.d/
 	install -m 755 debian/ifstatus $(CURDIR)/debian/ifplugd/usr/sbin/
 	install -m 755 debian/bug/script $(CURDIR)/debian/ifplugd/usr/share/bug/ifplugd/
-	dh_install
 
 binary-indep: build install