Imported Debian patch 0.28-6

16 files changed, 648 insertions, 103 deletions

diff --git a/debian/bug/script b/debian/bug/script
new file mode 100644
index 0000000..ef5b949
--- /dev/null
+++ b/debian/bug/script
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+exec >&3
+
+echo " /proc/net/dev interfaces:"
+grep ":" /proc/net/dev | cut -f1 -d":"
diff --git a/debian/changelog b/debian/changelog
index cfdd621..9398803 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,33 @@
+ifplugd (0.28-6) unstable; urgency=low
+
+  * Remove reference to hotplug, it has been udev for a while now.
+  * In ifplugd.8 -w option, 3 = link beat not detected and 2 = link beat
+    detected.  Update 02_manpage_paths_and_typos based on this change from
+    Jérémie Corbier <jcorbier@ubuntu.com>
+  * Don't install patches/Makefile.* files in docs.
+  * Patch 03_split_README_ChangeLog_FAQ to split README into README, ChangeLog
+    and FAQ because they were hidden.
+  * Add --disable-lynx and remove build dependency on lynx.  We can use the
+    pre-generated README file.
+  * Move creation of /etc/ifplugd/action.d/ to dirs for dh_installdirs
+  * Modify init script to prevent attempting stop/suspend of non existent
+    interfaces
+  * Use dh_installudev for installing the udev rules file.  So, we don't
+    invoke 'dpkg --compare-versions' anymore, hence ... (Closes: #374253)
+  * Start ifplugd in all multi-user runlevels.  Stop in other valid Debian
+    runlevels.  Thanks Jörg Sommer <joerg@alea.gnuu.de> (Closes: #470223)
+  * Add a reportbug script to list the interfaces from /proc/net/dev
+  * ifplugd is Linux only, so adjust Architecture: in debian/control based on
+    the output of "dpkg-architecture -L"
+  * Thanks for updated debconf translations
+    + Russian: Yuri Kozlov <kozlov.y@gmail.com> (Closes: #471163)
+    + German: Holger Wansing <linux@wansing-online.de> (Closes: #471179)
+  * LSB headers Required-{Start,Stop} depend on $remote_fs.  Remove useless
+    X-UnitedLinux-* sections.  Thanks Kel Modderman <kel@otaku42.de> for the
+    patch (Closes: #471307)
+
+ -- Y Giridhar Appaji Nag <giridhar@appaji.net>  Mon, 17 Mar 2008 15:51:42 +0530
+
 ifplugd (0.28-5) unstable; urgency=low
 
   * Adopted by Y Giridhar Appaji Nag <giridhar@appaji.net> (Closes: #452184)
diff --git a/debian/control b/debian/control
index 89a7451..d2bba3e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,14 @@ Source: ifplugd
 Section: net
 Priority: optional
 Maintainer: Y Giridhar Appaji Nag <giridhar@appaji.net>
-Build-Depends: debhelper (>= 5), dpatch, autotools-dev, libdaemon-dev (>= 0.7), lynx, pkg-config, po-debconf
+Build-Depends: debhelper (>= 5), dpatch, autotools-dev, libdaemon-dev (>= 0.7), pkg-config, po-debconf
 Standards-Version: 3.7.3
 Homepage: http://0pointer.de/lennart/projects/ifplugd/
 Vcs-Svn: svn://svn.debian.org/svn/collab-maint/ext-maint/ifplugd/unstable
 Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/ext-maint/ifplugd/unstable/?op=log
 
 Package: ifplugd
-Architecture: any
+Architecture: armel lpia i386 ia64 alpha amd64 armeb arm hppa m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc
 Depends:  ${shlibs:Depends}, debconf (>= 1.2.0) | debconf-2.0
 Recommends: ifupdown (>= 0.6.4-4.2)
 Description: A configuration daemon for ethernet devices
diff --git a/debian/dirs b/debian/dirs
index 1896965..a388f53 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -4,7 +4,6 @@ etc/apm/event.d
 etc/apm/suspend.d
 etc/apm/resume.d
 etc/apm/other.d
-etc/udev/
-etc/udev/rules.d/
 lib/udev
-
+etc/ifplugd/action.d/
+usr/share/bug/ifplugd/
diff --git a/debian/docs b/debian/docs
index a7fe20e..4072d38 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,6 +1,7 @@
 doc/NEWS
 doc/README
+doc/FAQ
 doc/README.html
 doc/style.css
 doc/SUPPORTED_DRIVERS
-patches
+patches/8139too.c.0.9.26.patch
diff --git a/debian/ifplugd.init b/debian/ifplugd.init
index 13a14d8..ee87993 100644
--- a/debian/ifplugd.init
+++ b/debian/ifplugd.init
@@ -17,25 +17,15 @@
 # along with ifplugd; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 
-# ifplugd      Brings up/down network automatically
-#
-# chkconfig: 2345 11 89
-# description: Brings networks interfaces up and down automatically when \
-#              the cable is removed / inserted
-#
-# processname: /usr/sbin/ifplugd
-# config: /etc/default/ifplugd
-
 ### BEGIN INIT INFO
 # Provides:          ifplugd
-# Required-Start:    $network
-# X-UnitedLinux-Should-Start:
-# Required-Stop:     $network
-# X-UnitedLinux-Should-Stop: $
-# Default-Start:     3 5
-# Default-Stop:      0 1 2 6
-# Short-Description: ifplugd daemon
-# Description:       Start ifplugd
+# Required-Start:    $network $remote_fs
+# Required-Stop:     $network $remote_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Brings up/down network automatically
+# Description:       Brings networks interfaces up and down automatically when
+#                    the cable is removed / inserted
 ### END INIT INFO
 
 CFG=/etc/default/ifplugd
@@ -73,6 +63,7 @@ case "$VERB" in
     stop)
         echo -n "Stopping Network Interface Plugging Daemon:"
         for IF in $INTERFACES ; do 
+            grep --quiet $IF /proc/net/dev || continue
             $IFPLUGD -k --wait-on-kill -i $IF
             echo -n " $IF"
         done
@@ -86,6 +77,7 @@ case "$VERB" in
     suspend)
         echo -n "Suspending Network Interface Plugging Daemon:"
         for IF in $INTERFACES ; do
+            grep --quiet $IF /proc/net/dev || continue
             $IFPLUGD -S -i $IF
             echo -n " $IF"
         done
diff --git a/debian/ifplugd.udev.rules b/debian/ifplugd.udev
index 02fea85..02fea85 100644
--- a/debian/ifplugd.udev.rules
+++ b/debian/ifplugd.udev
diff --git a/debian/ifplugd.udev.agent b/debian/ifplugd.udev.agent
index b90ede1..5c4671a 100644
--- a/debian/ifplugd.udev.agent
+++ b/debian/ifplugd.udev.agent
@@ -1,5 +1,5 @@
 #!/bin/sh
-# hotplug agent script
+# udev agent script
 
 DAEMON_NAME=ifplugd
 
@@ -8,8 +8,6 @@ CFG=/etc/default/$DAEMON_NAME
 
 [ -x $DAEMON ] || exit 0
 
-# for old hotplug:
-#HOTPLUGFUNCS=/etc/hotplug/hotplug.functions
 HOTPLUGFUNCS=/lib/udev/hotplug.functions
 
 [ -f $HOTPLUGFUNCS ] || exit 1
diff --git a/debian/patches/00list b/debian/patches/00list
index 0c9d72f..876c832 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,2 +1,3 @@
 01_loff_t_dev_t_conflict
 02_manpage_paths_and_typos
+03_split_README_ChangeLog_FAQ
diff --git a/debian/patches/02_manpage_paths_and_typos.dpatch b/debian/patches/02_manpage_paths_and_typos.dpatch
index f7e9aac..3e7017c 100644
--- a/debian/patches/02_manpage_paths_and_typos.dpatch
+++ b/debian/patches/02_manpage_paths_and_typos.dpatch
@@ -3,11 +3,12 @@
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Path and typo fixes made a dpatch, fix lintian W: hyphen-used-as-minus-sign
+## DP: Fix ifplugd.8 -w option retval, thanks Jérémie Corbier <jcorbier@ubuntu.com>
 
 @DPATCH@
 diff -urNad ifplugd-0.28~/doc/README ifplugd-0.28/doc/README
---- ifplugd-0.28~/doc/README	2008-03-02 21:04:33.000000000 +0530
-+++ ifplugd-0.28/doc/README	2008-03-02 21:04:39.000000000 +0530
+--- ifplugd-0.28~/doc/README	2008-03-07 07:33:56.000000000 +0530
++++ ifplugd-0.28/doc/README	2008-03-07 17:59:17.000000000 +0530
 @@ -186,7 +186,7 @@
  
     When you are using the hotplug subsystem (Debian package hotplug) you
@@ -18,8 +19,8 @@ diff -urNad ifplugd-0.28~/doc/README ifplugd-0.28/doc/README
     available. This was the default behavior in the Debian hotplug package
     prior to release 0.0.20030117-1, for example. To prevent this you
 diff -urNad ifplugd-0.28~/doc/README.html ifplugd-0.28/doc/README.html
---- ifplugd-0.28~/doc/README.html	2008-03-02 21:04:33.000000000 +0530
-+++ ifplugd-0.28/doc/README.html	2008-03-02 21:04:39.000000000 +0530
+--- ifplugd-0.28~/doc/README.html	2008-03-07 07:33:56.000000000 +0530
++++ ifplugd-0.28/doc/README.html	2008-03-07 17:59:17.000000000 +0530
 @@ -188,7 +188,7 @@
  <p>When you are using the hotplug subsystem (Debian package
  <tt>hotplug</tt>) you may notice that the network device is configured
@@ -30,8 +31,8 @@ diff -urNad ifplugd-0.28~/doc/README.html ifplugd-0.28/doc/README.html
  becomes available.  This was the default behavior in the Debian
  <tt>hotplug</tt> package prior to release <tt>0.0.20030117-1</tt>, for
 diff -urNad ifplugd-0.28~/doc/README.html.in ifplugd-0.28/doc/README.html.in
---- ifplugd-0.28~/doc/README.html.in	2008-03-02 21:04:33.000000000 +0530
-+++ ifplugd-0.28/doc/README.html.in	2008-03-02 21:04:39.000000000 +0530
+--- ifplugd-0.28~/doc/README.html.in	2008-03-07 07:33:56.000000000 +0530
++++ ifplugd-0.28/doc/README.html.in	2008-03-07 17:59:17.000000000 +0530
 @@ -188,7 +188,7 @@
  <p>When you are using the hotplug subsystem (Debian package
  <tt>hotplug</tt>) you may notice that the network device is configured
@@ -42,8 +43,8 @@ diff -urNad ifplugd-0.28~/doc/README.html.in ifplugd-0.28/doc/README.html.in
  becomes available.  This was the default behavior in the Debian
  <tt>hotplug</tt> package prior to release <tt>0.0.20030117-1</tt>, for
 diff -urNad ifplugd-0.28~/man/ifplugd.8 ifplugd-0.28/man/ifplugd.8
---- ifplugd-0.28~/man/ifplugd.8	2008-03-02 21:04:33.000000000 +0530
-+++ ifplugd-0.28/man/ifplugd.8	2008-03-02 21:04:55.000000000 +0530
+--- ifplugd-0.28~/man/ifplugd.8	2005-06-05 01:11:50.000000000 +0530
++++ ifplugd-0.28/man/ifplugd.8	2008-03-07 18:00:12.000000000 +0530
 @@ -9,88 +9,88 @@
  
  It uses your distribution's native ifup/ifdown programs, but can be configured to do anything you wish when the state of the interface changes. It may ignore short unplugged whiles (\fB-d\f1 option) or plugged whiles (\fB-u\f1 option).
@@ -113,8 +114,9 @@ diff -urNad ifplugd-0.28~/man/ifplugd.8 ifplugd-0.28/man/ifplugd.8
  Don't call the script for network shutdown on deamon quit (default: off) 
  .TP
 -\fB-w | --wait-on-fork\f1
+-When daemonizing, wait until the background process finished with the initial link beat detection. When this is enabled, the parent process will return the link status on exit. 1 means link beat detected, 2 stands for link beat not detected, everything else is an error. 
 +\fB\-w | \-\-wait-on-fork\f1
- When daemonizing, wait until the background process finished with the initial link beat detection. When this is enabled, the parent process will return the link status on exit. 1 means link beat detected, 2 stands for link beat not detected, everything else is an error. 
++When daemonizing, wait until the background process finished with the initial link beat detection. When this is enabled, the parent process will return the link status on exit. 2 means link beat detected, 3 stands for link beat not detected, everything else is an error. 
  .TP
 -\fB-W | --wait-on-kill\f1
 -When killing a running daemon (with -k) wait until the daemon died. 
@@ -187,8 +189,17 @@ diff -urNad ifplugd-0.28~/man/ifplugd.8 ifplugd-0.28/man/ifplugd.8
  ifplugd was written by Lennart Poettering <mzvscyhtq (at) 0pointer (dot) de>. ifplugd is available at \fBhttp://0pointer.de/lennart/projects/ifplugd/\f1
  .SH SEE ALSO
 diff -urNad ifplugd-0.28~/man/ifplugd.8.xml.in ifplugd-0.28/man/ifplugd.8.xml.in
---- ifplugd-0.28~/man/ifplugd.8.xml.in	2008-03-02 21:04:33.000000000 +0530
-+++ ifplugd-0.28/man/ifplugd.8.xml.in	2008-03-02 21:04:39.000000000 +0530
+--- ifplugd-0.28~/man/ifplugd.8.xml.in	2005-03-30 21:44:39.000000000 +0530
++++ ifplugd-0.28/man/ifplugd.8.xml.in	2008-03-07 18:00:00.000000000 +0530
+@@ -162,7 +162,7 @@
+ 		<optdesc><p> When daemonizing, wait until the background
+ 		process finished with the initial link beat detection. When
+ 		this is enabled, the parent process will return the link
+-		status on exit. 1 means link beat detected, 2 stands for link
++		status on exit. 2 means link beat detected, 3 stands for link
+ 		beat not detected, everything else is an error.
+ 		</p></optdesc>
+ 	  </option>
 @@ -185,7 +185,7 @@
  	  <option>
  	  	<p><opt>-M | --monitor</opt></p>
@@ -225,8 +236,8 @@ diff -urNad ifplugd-0.28~/man/ifplugd.8.xml.in ifplugd-0.28/man/ifplugd.8.xml.in
  		
  	  <p><file>/var/run/ifplugd.&lt;iface&gt;.pid</file>: the pid file
 diff -urNad ifplugd-0.28~/man/ifplugd.conf.5 ifplugd-0.28/man/ifplugd.conf.5
---- ifplugd-0.28~/man/ifplugd.conf.5	2008-03-02 21:04:33.000000000 +0530
-+++ ifplugd-0.28/man/ifplugd.conf.5	2008-03-02 21:04:39.000000000 +0530
+--- ifplugd-0.28~/man/ifplugd.conf.5	2008-03-07 07:33:56.000000000 +0530
++++ ifplugd-0.28/man/ifplugd.conf.5	2008-03-07 17:59:17.000000000 +0530
 @@ -2,7 +2,7 @@
  .SH NAME
  ifplugd.conf \- ifplugd configuration file
@@ -237,8 +248,8 @@ diff -urNad ifplugd-0.28~/man/ifplugd.conf.5 ifplugd-0.28/man/ifplugd.conf.5
  .SH DESCRIPTION
  ifplugd.conf is the configuration file for ifplugd. It is a shell script that is sourced by the init script starting the daemon. It shall be used to set environment variables which are interpreted by the init script:
 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	2008-03-02 21:04:33.000000000 +0530
-+++ ifplugd-0.28/man/ifplugd.conf.5.xml.in	2008-03-02 21:04:39.000000000 +0530
+--- ifplugd-0.28~/man/ifplugd.conf.5.xml.in	2008-03-07 07:33:56.000000000 +0530
++++ ifplugd-0.28/man/ifplugd.conf.5.xml.in	2008-03-07 17:59:17.000000000 +0530
 @@ -25,7 +25,7 @@
    <manpage name="ifplugd.conf" section="5" desc="ifplugd configuration file">
  
@@ -258,8 +269,8 @@ diff -urNad ifplugd-0.28~/man/ifplugd.conf.5.xml.in ifplugd-0.28/man/ifplugd.con
  		interfaces for monitoring more than one device. A special
  		value is supported as well: "auto" will enable a more or less
 diff -urNad ifplugd-0.28~/man/ifplugstatus.8 ifplugd-0.28/man/ifplugstatus.8
---- ifplugd-0.28~/man/ifplugstatus.8	2008-03-02 21:04:33.000000000 +0530
-+++ ifplugd-0.28/man/ifplugstatus.8	2008-03-02 21:04:39.000000000 +0530
+--- ifplugd-0.28~/man/ifplugstatus.8	2008-03-07 07:33:56.000000000 +0530
++++ ifplugd-0.28/man/ifplugstatus.8	2008-03-07 17:59:17.000000000 +0530
 @@ -23,19 +23,19 @@
  .SH OPTIONS
  You may specify an ethernet device on the command line. Otherwise ifplugstatus will check all available network interfaces.
diff --git a/debian/patches/03_split_README_ChangeLog_FAQ.dpatch b/debian/patches/03_split_README_ChangeLog_FAQ.dpatch
new file mode 100644
index 0000000..9aacff3
--- /dev/null
+++ b/debian/patches/03_split_README_ChangeLog_FAQ.dpatch
@@ -0,0 +1,498 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_split_README_ChangeLog_FAQ.dpatch by Y Giridhar Appaji Nag <giridhar@appaji.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Split README into README, ChangeLog and FAQ because they were hidden
+
+@DPATCH@
+diff -urNad ifplugd-0.28~/doc/ChangeLog ifplugd-0.28/doc/ChangeLog
+--- ifplugd-0.28~/doc/ChangeLog	1970-01-01 05:30:00.000000000 +0530
++++ ifplugd-0.28/doc/ChangeLog	2008-03-07 19:00:50.000000000 +0530
+@@ -0,0 +1,116 @@
++   Sat Jun 4 2005:
++
++   [10]Version 0.28 released, changes include: build fixes from Stefan
++   Seyfried.
++
++   Wed Mar 30 2005:
++
++   [11]Version 0.27 released, changes include: new option --no-startup.
++
++   Sun Dec 19 2004:
++
++   [12]Version 0.26 released, changes include: changed MII code for
++   better compatibility with some 3COM Boomerang cards.
++
++   Mon May 10 2004:
++
++   [13]Version 0.25 released, changes include: Revert to more classic
++   link checking support. The new checking order is: ETHTOOL, MII, WLAN,
++   IFF. The obsolete API "PRIV" is no longer checked by the automatic API
++   detection code. However, you may enable it forcibly by passing -m priv
++   on the command line.
++
++   Mon Apr 12 2004:
++
++   [14]Version 0.24 released, changes include: add IFF_RUNNING link check
++   support and make it the default. This might break some setups. You may
++   workaround this by passing -m to the daemon for selecting a different
++   API. Please report breakages!
++
++   Wed Apr 7 2004:
++
++   [15]Version 0.23 released, changes include: don't make /dev/tty1 the
++   controlling TTY when beeping
++
++   Tue Feb 10 2004:
++
++   [16]Version 0.22 released, changes include: rename ifstatus to
++   ifplugstatus due to namespace collision, minor fixes
++
++   Mon Jan 26 2004:
++
++   [17]Version 0.21b released, added missing file.
++
++   Mon Jan 26 2004:
++
++   [18]Version 0.21 released, changes include: better compatibility with
++   wireless devices, compatibility with newer kernels
++
++   Sun Nov 9 2003:
++
++   [19]Version 0.20 released, changes include: fix wrong message, build
++   fix
++
++   Mon Oct 20 2003:
++
++   [20]Version 0.19 released, changes include: New option
++   --wait-for-kill, this requires [21]libdaemon 0.3
++
++   Fri Oct 17 2003:
++
++   [22]Version 0.18 released, changes include: Some bugs fixed
++
++   Fri Sep 13 2003:
++
++   [23]Version 0.17b released, changes include: typo and date fix
++
++   Fri Sep 13 2003:
++
++   [24]Version 0.17 released, changes include: documentation update,
++   better support for multiple interfaces, gcc 2.95 build fix
++
++   Thu Aug 13 2003:
++
++   [25]Version 0.16 released, changes include: RPM spec file added, build
++   fixes, WLAN improvements (including compatibility with the upcoming
++   waproamd, a WLAN roaming daemon), monitor mode for use in conjunction
++   with PCMCIA devices, better support for multiple interface setups,
++   SUPPORTED_DRIVERS returns
++
++   Thu July 10 2003:
++
++   [26]Version 0.15 released, changes include: bad umask fix,
++   documentation update
++
++   Mon July 7 2003:
++
++   [27]Version 0.14 released, changes include: autoconf usage, new
++   dependency [28]libdaemon, wireless LAN support, support for
++   suspending/resuming, many fixes
++
++    Lennart Poettering <mzvscyhtq (at) 0pointer (dot) de>, June 2005
++
++   $Id: README.html.in 124 2005-06-04 19:22:59Z lennart $
++
++References
++
++   9. README#download
++  10. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.27.tar.gz
++  11. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.27.tar.gz
++  12. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.26.tar.gz
++  13. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.25.tar.gz
++  14. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.24.tar.gz
++  15. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.23.tar.gz
++  16. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.22.tar.gz
++  17. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.21b.tar.gz
++  18. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.21.tar.gz
++  19. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.20.tar.gz
++  20. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.19.tar.gz
++  21. http://0pointer.de/lennart/projects/libdaemon/
++  22. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.18.tar.gz
++  23. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.17b.tar.gz
++  24. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.17.tar.gz
++  25. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.16.tar.gz
++  26. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.15.tar.gz
++  27. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.14.tar.gz
++  28. http://0pointer.de/lennart/projects/libdaemon/
+diff -urNad ifplugd-0.28~/doc/FAQ ifplugd-0.28/doc/FAQ
+--- ifplugd-0.28~/doc/FAQ	1970-01-01 05:30:00.000000000 +0530
++++ ifplugd-0.28/doc/FAQ	2008-03-07 19:00:50.000000000 +0530
+@@ -0,0 +1,63 @@
++
++  FAQ
++
++    1. Q: I want to use ifplugd with my PCMCIA device, but ifplugd quits
++       when it doesn't find eth0, when I have not inserted the card. What
++       can I do?
++       A: Use the -f switch. This is not very clean however, since
++       modprobe is called on each cable detection query of ifplugd to
++       load a module for the network device. This is suboptimal. You
++       should probably run ifplugd only when the card is really inserted.
++    2. Q: I am using the -f switch, but the kernel logs are getting
++       filled with messages like "modprobe: modprobe: Can't locate module
++       eth0". What can I do?
++       A: Make sure you have a line like alias eth0 off in your
++       /etc/modules.conf
++    3. Q: When the cable is unplugged and the interface shut down it is
++       still available with ifconfig and markes as UP. Why this?
++       A: ifplugd cannot detect the link beat with a shut down interface
++       on certain (most as of kernel 2.4.19) network drivers. Thus
++       ifplugd enables the interface before querying the link status.
++       This may be switched off with -a flag. You might want to use it if
++       you have a sane network driver (e.g. eepro100). The subdirectory
++       patches/ in the ifplugd distribution includes a patch for the
++       8139too 0.9.26 driver, which makes the driver compatible with -a.
++       Don't ask me how to apply this patch. If you don't know, you won't
++       need it.
++    4. Q: Does it work with anything else than plain ethernet or wireless
++       LAN?
++       A: Certainly not, since the MII and ETHTOOL ioctl()s and the
++       wireless extension don't exist on other network device types.
++    5. Q: I have a Realtek 8139 based network card. Everytime ifplugd
++       starts on bootup my machine freezes. What can I do?
++       A: This is a bug in the 8139too driver 0.9.25 (at least) shipped
++       with Linux 2.4.19, please upgrade to 8139too 0.9.26 (Linux 2.4.20
++       or seperately at
++       [33]http://www.sourceforge.net/projects/gkernel/).
++    6. Q: There are already laptop-net's ifd and miid, why did you write
++       your own daemon?
++       A: laptop-net was too integrated with its profile system and
++       didn't work on my hardware when I had a look on it. It seemed
++       easier to me to write a simple but feature complete replacement
++       than using laptop-net without most of the special features
++       disabled. I didn't know about miid when I wrote ifplugd, but in
++       any case ifplugd is much better than miid. For a comparison of
++       miid and ifplugd, have a look on
++       [34]http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=162763&repeat
++       merged=yes
++    7. Q: I have two interfaces (e.g. WLAN and copper ethernet), both
++       controlled by ifplugd, and want to force the network traffic to go
++       over the faster one of them, in case both are available at the
++       same time. How can I do this?
++       A: A tool I wrote called [35]ifmetric might be exactly what you're
++       looking for.
++
++    Lennart Poettering <mzvscyhtq (at) 0pointer (dot) de>, June 2005
++
++   $Id: README.html.in 124 2005-06-04 19:22:59Z lennart $
++
++References
++
++  33. http://www.sourceforge.net/projects/gkernel/
++  34. http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=162763&repeatmerged=yes
++  35. http://0pointer.de/lennart/projects/ifmetric/
+diff -urNad ifplugd-0.28~/doc/NEWS ifplugd-0.28/doc/NEWS
+--- ifplugd-0.28~/doc/NEWS	2004-05-10 04:50:56.000000000 +0530
++++ ifplugd-0.28/doc/NEWS	2008-03-07 19:01:01.000000000 +0530
+@@ -1,5 +1,5 @@
+ 
+-[[[ newer changes are recorded in the README file only ]]]
++[[[ newer changes are recorded in the ChangeLog file only ]]]
+ 
+ 
+ 0.20 :: 9 Nov 2003 :: SVN 71
+diff -urNad ifplugd-0.28~/doc/README ifplugd-0.28/doc/README
+--- ifplugd-0.28~/doc/README	2008-03-07 19:00:50.000000000 +0530
++++ ifplugd-0.28/doc/README	2008-03-07 19:00:50.000000000 +0530
+@@ -1,126 +1,4 @@
+-
+                                  ifplugd 0.28
+-
+-   Copyright 2002-2005 Lennart Poettering <mzvscyhtq (at) 0pointer (dot)
+-   de>
+-     * [1]License
+-     * [2]News
+-     * [3]Overview
+-     * [4]Current Status
+-     * [5]Documentation
+-     * [6]Requirements
+-     * [7]Installation
+-     * [8]Acknowledgements
+-     * [9]Download
+-
+-License
+-
+-   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., 675 Mass Ave, Cambridge, MA 02139, USA.
+-
+-News
+-
+-   Sat Jun 4 2005:
+-
+-   [10]Version 0.28 released, changes include: build fixes from Stefan
+-   Seyfried.
+-
+-   Wed Mar 30 2005:
+-
+-   [11]Version 0.27 released, changes include: new option --no-startup.
+-
+-   Sun Dec 19 2004:
+-
+-   [12]Version 0.26 released, changes include: changed MII code for
+-   better compatibility with some 3COM Boomerang cards.
+-
+-   Mon May 10 2004:
+-
+-   [13]Version 0.25 released, changes include: Revert to more classic
+-   link checking support. The new checking order is: ETHTOOL, MII, WLAN,
+-   IFF. The obsolete API "PRIV" is no longer checked by the automatic API
+-   detection code. However, you may enable it forcibly by passing -m priv
+-   on the command line.
+-
+-   Mon Apr 12 2004:
+-
+-   [14]Version 0.24 released, changes include: add IFF_RUNNING link check
+-   support and make it the default. This might break some setups. You may
+-   workaround this by passing -m to the daemon for selecting a different
+-   API. Please report breakages!
+-
+-   Wed Apr 7 2004:
+-
+-   [15]Version 0.23 released, changes include: don't make /dev/tty1 the
+-   controlling TTY when beeping
+-
+-   Tue Feb 10 2004:
+-
+-   [16]Version 0.22 released, changes include: rename ifstatus to
+-   ifplugstatus due to namespace collision, minor fixes
+-
+-   Mon Jan 26 2004:
+-
+-   [17]Version 0.21b released, added missing file.
+-
+-   Mon Jan 26 2004:
+-
+-   [18]Version 0.21 released, changes include: better compatibility with
+-   wireless devices, compatibility with newer kernels
+-
+-   Sun Nov 9 2003:
+-
+-   [19]Version 0.20 released, changes include: fix wrong message, build
+-   fix
+-
+-   Mon Oct 20 2003:
+-
+-   [20]Version 0.19 released, changes include: New option
+-   --wait-for-kill, this requires [21]libdaemon 0.3
+-
+-   Fri Oct 17 2003:
+-
+-   [22]Version 0.18 released, changes include: Some bugs fixed
+-
+-   Fri Sep 13 2003:
+-
+-   [23]Version 0.17b released, changes include: typo and date fix
+-
+-   Fri Sep 13 2003:
+-
+-   [24]Version 0.17 released, changes include: documentation update,
+-   better support for multiple interfaces, gcc 2.95 build fix
+-
+-   Thu Aug 13 2003:
+-
+-   [25]Version 0.16 released, changes include: RPM spec file added, build
+-   fixes, WLAN improvements (including compatibility with the upcoming
+-   waproamd, a WLAN roaming daemon), monitor mode for use in conjunction
+-   with PCMCIA devices, better support for multiple interface setups,
+-   SUPPORTED_DRIVERS returns
+-
+-   Thu July 10 2003:
+-
+-   [26]Version 0.15 released, changes include: bad umask fix,
+-   documentation update
+-
+-   Mon July 7 2003:
+-
+-   [27]Version 0.14 released, changes include: autoconf usage, new
+-   dependency [28]libdaemon, wireless LAN support, support for
+-   suspending/resuming, many fixes
+-
+ Overview
+ 
+    ifplugd is a Linux daemon which will automatically configure your
+@@ -212,59 +90,6 @@
+    software for the Linux distributions to add such scripts to their
+    packages.
+ 
+-  FAQ
+-
+-    1. Q: I want to use ifplugd with my PCMCIA device, but ifplugd quits
+-       when it doesn't find eth0, when I have not inserted the card. What
+-       can I do?
+-       A: Use the -f switch. This is not very clean however, since
+-       modprobe is called on each cable detection query of ifplugd to
+-       load a module for the network device. This is suboptimal. You
+-       should probably run ifplugd only when the card is really inserted.
+-    2. Q: I am using the -f switch, but the kernel logs are getting
+-       filled with messages like "modprobe: modprobe: Can't locate module
+-       eth0". What can I do?
+-       A: Make sure you have a line like alias eth0 off in your
+-       /etc/modules.conf
+-    3. Q: When the cable is unplugged and the interface shut down it is
+-       still available with ifconfig and markes as UP. Why this?
+-       A: ifplugd cannot detect the link beat with a shut down interface
+-       on certain (most as of kernel 2.4.19) network drivers. Thus
+-       ifplugd enables the interface before querying the link status.
+-       This may be switched off with -a flag. You might want to use it if
+-       you have a sane network driver (e.g. eepro100). The subdirectory
+-       patches/ in the ifplugd distribution includes a patch for the
+-       8139too 0.9.26 driver, which makes the driver compatible with -a.
+-       Don't ask me how to apply this patch. If you don't know, you won't
+-       need it.
+-    4. Q: Does it work with anything else than plain ethernet or wireless
+-       LAN?
+-       A: Certainly not, since the MII and ETHTOOL ioctl()s and the
+-       wireless extension don't exist on other network device types.
+-    5. Q: I have a Realtek 8139 based network card. Everytime ifplugd
+-       starts on bootup my machine freezes. What can I do?
+-       A: This is a bug in the 8139too driver 0.9.25 (at least) shipped
+-       with Linux 2.4.19, please upgrade to 8139too 0.9.26 (Linux 2.4.20
+-       or seperately at
+-       [33]http://www.sourceforge.net/projects/gkernel/).
+-    6. Q: There are already laptop-net's ifd and miid, why did you write
+-       your own daemon?
+-       A: laptop-net was too integrated with its profile system and
+-       didn't work on my hardware when I had a look on it. It seemed
+-       easier to me to write a simple but feature complete replacement
+-       than using laptop-net without most of the special features
+-       disabled. I didn't know about miid when I wrote ifplugd, but in
+-       any case ifplugd is much better than miid. For a comparison of
+-       miid and ifplugd, have a look on
+-       [34]http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=162763&repeat
+-       merged=yes
+-    7. Q: I have two interfaces (e.g. WLAN and copper ethernet), both
+-       controlled by ifplugd, and want to force the network traffic to go
+-       over the faster one of them, in case both are available at the
+-       same time. How can I do this?
+-       A: A tool I wrote called [35]ifmetric might be exactly what you're
+-       looking for.
+-
+ Requirements
+ 
+    A newer Linux Kernel (I think 2.2 is good enough, alltough I tested it
+@@ -282,20 +107,6 @@
+ 
+    ifplugd needs [36]libdaemon.
+ 
+-Installation
+-
+-   As this package is made with the GNU autotools you should run
+-   ./configure inside the distribution directory for configuring the
+-   source tree. After that you should run make for compilation and make
+-   install (as root) for installation of ifplugd.
+-
+-   The installation scripts create an init script in
+-   ${sysconfdir}/init.d/ifplugd, however no /etc/rc?.d/ links are created
+-   for it.
+-
+-   Extensive installation instructions for installation of ifplugd on
+-   Fedora Core 1 are available at [37]Geoff Ericksson's web site.
+-
+ Acknowledgements
+ 
+    For the developers of mii-diag, ethtool and laptop-net, since I looked
+@@ -309,82 +120,15 @@
+ 
+    Frederic Lepied for integrating ifplugd into Mandrake Linux
+ 
+-Download
+-
+-   The newest release is always available from
+-   [38]http://0pointer.de/lennart/projects/ifplugd/
+-
+-   The current release is [39]0.28
+-
+-   Get ifplugd's development sources from the [40]Subversion
+-   [41]repository ([42]viewcvs):
+-svn checkout svn://seth.intheinter.net/ifplugd/trunk ifplugd
+-
+-   You may find an up to date Debian package of ifplugd on the [43]Debian
+-   package repository.
+-
+-   ifplugd is nowadays included in many popular distributions (Mandrake,
+-   Gentoo, Suse, Debian, Ubuntu); [44]Conectiva packages are available
+-   courtesy of Gonzalo Nemmi. Fedora Core packages are available from
+-   [45]Dag Wieers.
+-
+-   If you want to be notified whenever I release a new version of this
+-   software use the subscription feature of [46]Freshmeat.
+-
+-   New! There is a joint ifplugd and waproamd [47]mailing list available.
+-     _________________________________________________________________
+-
+-
+     Lennart Poettering <mzvscyhtq (at) 0pointer (dot) de>, June 2005
+ 
+    $Id: README.html.in 124 2005-06-04 19:22:59Z lennart $
+ 
+ References
+ 
+-   1. README#license
+-   2. README#news
+-   3. README#overview
+-   4. README#status
+-   5. README#documentation
+-   6. README#requirements
+-   7. README#installation
+-   8. README#acks
+-   9. README#download
+-  10. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.27.tar.gz
+-  11. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.27.tar.gz
+-  12. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.26.tar.gz
+-  13. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.25.tar.gz
+-  14. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.24.tar.gz
+-  15. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.23.tar.gz
+-  16. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.22.tar.gz
+-  17. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.21b.tar.gz
+-  18. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.21.tar.gz
+-  19. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.20.tar.gz
+-  20. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.19.tar.gz
+-  21. http://0pointer.de/lennart/projects/libdaemon/
+-  22. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.18.tar.gz
+-  23. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.17b.tar.gz
+-  24. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.17.tar.gz
+-  25. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.16.tar.gz
+-  26. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.15.tar.gz
+-  27. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.14.tar.gz
+   28. http://0pointer.de/lennart/projects/libdaemon/
+   29. http://0pointer.de/lennart/projects/waproamd/
+   30. http://0pointer.de/lennart/projects/ifplugd/ifplugd.8.xml
+   31. http://0pointer.de/lennart/projects/ifplugd/ifplugstatus.8.xml
+   32. http://0pointer.de/lennart/projects/ifplugd/ifplugd.conf.5.xml
+   33. http://www.sourceforge.net/projects/gkernel/
+-  34. http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=162763&repeatmerged=yes
+-  35. http://0pointer.de/lennart/projects/ifmetric/
+-  36. http://0pointer.de/lennart/projects/libdaemon/
+-  37. http://www.acmc.uq.edu.au/~gbe/linux/installation_of_ifplugd.html
+-  38. http://0pointer.de/lennart/projects/ifplugd/
+-  39. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.28.tar.gz
+-  40. http://subversion.tigris.org/
+-  41. svn://seth.intheinter.net/ifplugd
+-  42. http://0pointer.de/cgi-bin/viewcvs.cgi/?root=ifplugd
+-  43. http://packages.debian.org/ifplugd
+-  44. http://www.linuxdicas.com.ar/caleb/rpm
+-  45. http://dag.wieers.com/packages/ifplugd/
+-  46. http://freshmeat.net/projects/ifplugd/
+-  47. https://seth.intheinter.net/mailman/listinfo/ifplugd-discuss
diff --git a/debian/po/de.po b/debian/po/de.po
index d7607d6..8f4e350 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -1,4 +1,4 @@
-# translation of ifplugd_0.26-2_templates.po to German
+# translation of ifplugd_0.26-5_templates.po to German
 #
 #    Translators, if you are not familiar with the PO format, gettext
 #    documentation is worth reading, especially sections dedicated to
@@ -10,14 +10,14 @@
 #         or http://www.debian.org/intl/l10n/po-debconf/README-trans#
 #    Developers do not need to manually edit POT or PO files.
 # Jens Nachtigall <nachtigall@web.de>, 2005.
-# Holger Wansing <linux@wansing-online.de>, 2006.
+# Holger Wansing <linux@wansing-online.de>, 2006, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ifplugd 0.28-2\n"
+"Project-Id-Version: ifplugd 0.28-5\n"
 "Report-Msgid-Bugs-To: ifplugd@packages.debian.org\n"
 "POT-Creation-Date: 2008-03-04 20:07+0530\n"
-"PO-Revision-Date: 2006-12-02 13:05+0100\n"
+"PO-Revision-Date: 2008-03-16 13:32+0100\n"
 "Last-Translator: Holger Wansing <linux@wansing-online.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -45,9 +45,9 @@ msgstr ""
 "Geben Sie hier, durch Leerzeichen getrennt, die zu überwachenden "
 "Schnittstellen ein. Für jede dieser Schnittstellen wird ein ifplugd-Prozess "
 "gestartet, sobald das Init-Skript von ifplugd mit dem »start«-Argument "
-"aufgerufen wird. Sie können das magische Wort »auto« verwenden, um für ALLE "
+"aufgerufen wird. Sie können den magischen Wert »auto« verwenden, um für ALLE "
 "eth- und wlan-Schnittstellen, die laut /proc/net/dev verfügbar sind, einen "
-"ifplugd-Prozess zu starten oder zu beenden. Beachten Sie, dass die Liste der "
+"ifplugd-Prozess zu starten bzw. zu beenden. Beachten Sie, dass die Liste der "
 "Schnittstellen, die in /proc/net/dev auftaucht, davon abhängt, welche Kernel-"
 "Module Sie geladen haben."
 
@@ -85,7 +85,7 @@ msgid ""
 "You may use the magic string \"all\" to make the hotplug script start an "
 "ifplugd process for any hotplugged interface."
 msgstr ""
-"Sie können den speziellen Wert »all« benutzen, damit das hotplug-Skript für "
+"Sie können den magischen Wert »all« benutzen, damit das hotplug-Skript für "
 "alle von ihm gesteuerten Schnittstellen einen ifplugd-Prozess startet."
 
 #. Type: string
@@ -106,16 +106,11 @@ msgstr "Argumente für 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 ""
-"Sie können hier Argumente für den ifplugd-Daemon angeben. Eine Beschreibung "
-"dieser Argumente finden Sie auf der Handbuchseite von ifplugd oder rufen Sie "
-"»ifplugd -h« auf."
+"Sie können hier Argumente für den ifplugd-Daemon angeben. Gültige Optionen "
+"sind:"
 
 #. Type: string
 #. Description
@@ -126,6 +121,13 @@ msgid ""
 "deconfiguring interface, -w Wait until daemon fork finished, -I Don't exit "
 "on nonzero return value of program executed,"
 msgstr ""
+"-q  Kein Skript ausführen bei Beenden des Daemons\n"
+"-f  Fehler bei der Erkennung ignorieren und erneut versuchen\n"
+"-u  Verzögerung festlegen zur Konfiguration der Schnittstellen\n"
+"-d  Verzögerung festlegen zur Dekonfiguration der Schnittstellen\n"
+"-w  Warten auf den Abschluß des Daemon-Forks (Aufspaltung)\n"
+"-I  Nicht beenden, wenn Rückgabewerte von ausgeführten Programmen\n"
+"    nicht Null sind"
 
 #. Type: string
 #. Description
@@ -137,6 +139,14 @@ msgid ""
 "detected, -W Wait until the daemon died when running daemon is killed, -M "
 "Use interface monitoring,"
 msgstr ""
+"-a  Schnittstelle nicht automatisch aktivieren\n"
+"-s  Nutze stderr statt syslog für Fehlersuche\n"
+"-b  Keine Systemklänge\n"
+"-t  Abfragetakt in Sekunden festlegen\n"
+"-p  Kein Skript ausführen bei Starten des Daemons\n"
+"-l  »down«-Skript bei Start ausführen, wenn kein Kabel eingesteckt ist\n"
+"-W  Warten bis der Daemon beendet ist, wenn laufender Daemon beendet wird\n"
+"-M  Benutze Schnittstellenüberwachung"
 
 #. Type: select
 #. Choices
@@ -176,7 +186,7 @@ msgstr ""
 #. Description
 #: ../ifplugd.templates:4002
 msgid "none: no action"
-msgstr "nichts: tue garnichts"
+msgstr "nichts: keine Aktion"
 
 #. Type: select
 #. Description
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 3d57f25..fd13baa 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -1,4 +1,4 @@
-# translation of ifplugd_debconf_ru.po to Russian
+# translation of ifplugd_0.28-5_ru.po to Russian
 #
 #    Translators, if you are not familiar with the PO format, gettext
 #    documentation is worth reading, especially sections dedicated to
@@ -10,21 +10,20 @@
 #         or http://www.debian.org/intl/l10n/po-debconf/README-trans#
 #    Developers do not need to manually edit POT or PO files.
 #
-# Yuri Kozlov <kozlov.y@gmail.com>, 2006.
+# Yuri Kozlov <kozlov.y@gmail.com>, 2006, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: 0.28-2\n"
+"Project-Id-Version: ifplugd 0.28-5\n"
 "Report-Msgid-Bugs-To: ifplugd@packages.debian.org\n"
 "POT-Creation-Date: 2008-03-04 20:07+0530\n"
-"PO-Revision-Date: 2006-12-05 23:34+0300\n"
+"PO-Revision-Date: 2008-03-16 14:33+0300\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"
 "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: string
 #. Description
@@ -48,7 +47,7 @@ msgstr ""
 "сценария ifplugd с параметром \"start\" для каждого из этих интерфейсов "
 "будет запущен процесс ifplugd. Можно указать слово \"auto\" и тогда init-"
 "сценарий будет запускать и останавливать процессы ifplugd для ВСЕХ "
-"имеющихся, согласно proc/net/dev, eth и wlan интерфейсах. Заметим, что "
+"имеющихся интерфейсов (согласно proc/net/dev, eth и wlan). Заметим, что "
 "список интерфейсов в /proc/net/dev зависит от загруженных модулей ядра."
 
 #. Type: string
@@ -86,10 +85,8 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../ifplugd.templates:2001
-msgid ""
-"Hotplugged interfaces are usually interfaces on PCMCIA or WLAN adapters."
-msgstr ""
-"Обычно оперативно заменяемые интерфейсы имеются у адаптеров PCMCIA или WLAN."
+msgid "Hotplugged interfaces are usually interfaces on PCMCIA or WLAN adapters."
+msgstr "Обычно оперативно заменяемые интерфейсы имеются у адаптеров PCMCIA или WLAN."
 
 #. Type: string
 #. Description
@@ -100,15 +97,8 @@ msgstr "Параметры 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 ""
-"Вы можете указать параметры для демона ifplug. Подробней смотрите на "
-"странице руководства или запустите ifplugd -h."
+msgid "You can give arguments to the ifplug daemon here.  Relevant options are:"
+msgstr "Вы можете указать параметры для демона ifplug. Существенные параметры:"
 
 #. Type: string
 #. Description
@@ -119,6 +109,13 @@ msgid ""
 "deconfiguring interface, -w Wait until daemon fork finished, -I Don't exit "
 "on nonzero return value of program executed,"
 msgstr ""
+"-q не запускать сценарий при выходе демона, "
+"-f игнорировать ошибки обнаружения и повторить, "
+"-u задать задержку при настройке интерфейса, "
+"-d задать задержку при деконфигурировании интерфейса, "
+"-w дождаться завершения создания потомка демона, "
+"-I не выходить при ненулевом возвращённом значении при выполнении "
+"программы,"
 
 #. Type: string
 #. Description
@@ -130,6 +127,14 @@ msgid ""
 "detected, -W Wait until the daemon died when running daemon is killed, -M "
 "Use interface monitoring,"
 msgstr ""
+"-a не включать интерфейс автоматически, "
+"-s использовать stderr вместо syslog при отладке, "
+"-b работать беззвучно, "
+"-t задать период опроса в секундах, "
+"-p не запускать сценарий при запуске демона, "
+"-l на старте запускать сценарий \"down\" при обнаружении отсутствия кабеля, "
+"-W при \"убийстве\" демона дождаться завершения его работы, "
+"-M использовать интерфейс мониторинга,"
 
 #. Type: select
 #. Choices
@@ -141,7 +146,7 @@ msgstr "ничего не делать"
 #. Choices
 #: ../ifplugd.templates:4001
 msgid "suspend"
-msgstr "приостановить"
+msgstr "режим ожидания"
 
 #. Type: select
 #. Choices
@@ -162,7 +167,7 @@ msgid ""
 "When you put your notebook into suspend mode, you can choose between three "
 "actions:"
 msgstr ""
-"При переводе ноутбука в режим приостановки (suspend), можно выполнить одно "
+"При переводе ноутбука в режим ожидания (suspend), можно выполнить одно "
 "из следующих трёх действий:"
 
 #. Type: select
@@ -178,7 +183,7 @@ msgid ""
 "suspend: this puts ifplugd into suspend mode. In this mode, ifplugd does not "
 "check the link status. This is necessary for some broken network drivers."
 msgstr ""
-"приостановить: перевести ifplugd в режим приостановки. В этом режиме ifplugd "
+"режим ожидания: перевести ifplugd в режим ожидания. В этом режиме ifplugd "
 "не проверяет состояние подключения к сети. Такое поведение требуется для "
 "некоторых некорректно работающих сетевых драйверов."
 
@@ -195,4 +200,5 @@ msgstr ""
 "остановит интерфейс. После возобновления работы, он будет перезапущен. Это "
 "нужно, если есть какой-то механизм (например, guessnet или whereami) для "
 "определения сетевых настроек, которые могут измениться, пока компьютер "
-"находился в режиме приостановки."
+"находился в режиме ожидания."
+
diff --git a/debian/postinst b/debian/postinst
index 0c90f26..4f499d4 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -31,9 +31,9 @@ write_default (){
 	    echo "# as their default values, thus preserving the administrator's changes."
             echo "#"
             echo "# This file is sourced by both the init script /etc/init.d/ifplugd and"
-            echo "# the hotplug script /etc/hotplug.d/net/ifplugd.hotplug to give default"
-            echo "# values. The init script starts ifplugd for all interfaces listed in"
-            echo "# INTERFACES, and the hotplug script starts ifplugd for all interfaces"
+            echo "# the udev script /lib/udev/ifplugd.agent to give default values."
+            echo "# The init script starts ifplugd for all interfaces listed in"
+            echo "# INTERFACES, and the udev script starts ifplugd for all interfaces"
             echo "# listed in HOTPLUG_INTERFACES. The special value "all" starts one"
             echo "# ifplugd for all interfaces being present."
 	) >> $DEFAULTTMP
@@ -63,11 +63,6 @@ case "$1" in
 				ln -nsf ../scripts.d/ifplugd $F
 			done
 		fi
-
-		# create udev rules file
-		if [ -z "$2" ] || [ "$2" = "<unknown>" ] || dpkg --compare-versions "$2" lt 0.28 ; then
-			ln -sf ../ifplugd.rules /etc/udev/rules.d/030_ifplugd.rules
-        	fi
         ;;
  
     abort-upgrade|abort-remove|abort-deconfigure)
@@ -80,4 +75,3 @@ db_stop
 # generated by other debhelper scripts.
  
 #DEBHELPER#
-
diff --git a/debian/preinst b/debian/preinst
index e9fb922..25c9e6c 100644
--- a/debian/preinst
+++ b/debian/preinst
@@ -53,6 +53,12 @@ case "$1" in
 		    chmod 644 /etc/udev/ifplugd.rules
 	    fi
 
+	    # Remove hand-linked /etc/udev/rules.d/030_ifplugd.rules
+	    # Now handled by dh_installudev
+	    if [ -f /etc/udev/rules.d/030_ifplugd.rules ] ; then
+		    rm -f /etc/udev/rules.d/030_ifplugd.rules
+	    fi
+
 	    if dpkg --compare-versions "$2" le "$LASTVERSION"; then
 		    rm_conffile ifplugd "/etc/hotplug.d/net/ifplugd.hotplug"
 	    fi
diff --git a/debian/rules b/debian/rules
index 58640b2..d1ccdb9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,8 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 endif
 
 confopts = --disable-subversion \
-	--disable-xmltoman
+	--disable-xmltoman \
+	--disable-lynx
 
 config.status: patch configure-stamp
 configure-stamp:
@@ -35,7 +36,6 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	cp -f /usr/share/misc/config.guess config.guess
 endif
 	[ ! -f doc/README.html ] || mv -f doc/README.html doc/README.html.ups
-	[ ! -f doc/README ] || mv -f doc/README doc/README.ups
 	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --sysconfdir=/etc CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" $(confopts)
 	touch $@
 
@@ -43,12 +43,6 @@ build: build-stamp
 build-stamp: patch-stamp config.status
 	dh_testdir
 	$(MAKE)
-	# replace arbitrary paths with paths that make sense: (sick...)
-	( cd doc; \
-          sed "s%file://localhost/.*doc/README%file://localhost/usr/share/doc/README%" \
-		< README > README.tmp; \
-          mv README.tmp README \
-        )
 	touch $@
 
 clean: clean-patched unpatch
@@ -57,7 +51,6 @@ clean-patched:
 	dh_testroot
 	rm -f build-stamp configure-stamp
 	[ ! -f Makefile ] || $(MAKE) distclean
-	[ ! -f doc/README.ups ] || mv -f doc/README.ups doc/README
 	[ ! -f doc/README.html.ups ] || mv -f doc/README.html.ups doc/README.html
 	rm -f config.guess config.sub
 	[ ! -f ifplugd.spec.ups ] || mv -f ifplugd.spec.ups ifplugd.spec
@@ -73,22 +66,22 @@ install: build
 	# now handled by debconf:
 	rm -f $(CURDIR)/debian/ifplugd/etc/ifplugd/ifplugd.conf
 	install -m 755 debian/ifplugd.udev.agent $(CURDIR)/debian/ifplugd/lib/udev/ifplugd.agent
-	install -m 644 debian/ifplugd.udev.rules $(CURDIR)/debian/ifplugd/etc/udev/ifplugd.rules
-	mkdir -p $(CURDIR)/debian/ifplugd/etc/ifplugd/action.d/
 	install -m 755 debian/ifplugd.action $(CURDIR)/debian/ifplugd/etc/ifplugd/
 	install -m 755 debian/ifupdown.action $(CURDIR)/debian/ifplugd/etc/ifplugd/action.d/ifupdown
 	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/
 
 binary-indep: build install
 
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs 
+	dh_installchangelogs doc/ChangeLog
 	dh_installdocs
 	dh_installdebconf
 	dh_installinit
+	dh_installudev
 	dh_installman
 	dh_link
 	dh_strip