From da72e57b4a3b51f31f7e00f167faaf03307118c6 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 1 Feb 2004 01:04:52 +0000 Subject: several fixes rename ifstatus git-svn-id: file:///home/lennart/svn/public/ifplugd/trunk@96 2bf48fe7-cfc1-0310-909f-d9042e1e0fef --- Makefile.am | 2 +- configure.ac | 2 +- doc/README.html.in | 8 ++++++-- ifplugd.spec.in | 4 ++-- man/Makefile.am | 12 ++++++------ man/ifplugd.8.xml.in | 2 +- man/ifstatus.8.xml.in | 10 +++++----- src/Makefile.am | 4 ++-- src/ifstatus.c | 6 +++--- 9 files changed, 27 insertions(+), 23 deletions(-) diff --git a/Makefile.am b/Makefile.am index eae1c32..1fa95d9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,7 +31,7 @@ homepage: all dist test -d $$HOME/homepage/lennart mkdir -p $$HOME/homepage/lennart/projects/ifplugd cp *.tar.gz $$HOME/homepage/lennart/projects/ifplugd - cp man/ifplugd.8.xml man/ifstatus.8.xml man/ifplugd.conf.5.xml man/xmltoman.css man/xmltoman.xsl man/xmltoman.dtd doc/README.html doc/style.css doc/NEWS $$HOME/homepage/lennart/projects/ifplugd + cp man/ifplugd.8.xml man/ifplugstatus.8.xml man/ifplugd.conf.5.xml man/xmltoman.css man/xmltoman.xsl man/xmltoman.dtd doc/README.html doc/style.css doc/NEWS $$HOME/homepage/lennart/projects/ifplugd cp $$HOME/homepage/lennart/projects/ifplugd/README.html $$HOME/homepage/lennart/projects/ifplugd/index.html diff --git a/configure.ac b/configure.ac index f7f2c28..c04ee40 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. AC_PREREQ(2.59) -AC_INIT([ifplugd],[0.21b],[mzvscyhtq (at) 0pointer (dot) de]) +AC_INIT([ifplugd],[0.22],[mzvscyhtq (at) 0pointer (dot) de]) AC_CONFIG_SRCDIR([src/ifplugd.c]) AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([foreign -Wall]) diff --git a/doc/README.html.in b/doc/README.html.in index 5d76d1a..a7b3175 100644 --- a/doc/README.html.in +++ b/doc/README.html.in @@ -42,6 +42,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

News

+
Mon Jan 26 2003:

Version +0.22 released, changes include: rename ifstatus to ifplugstatus due to namespace collision

+
Mon Jan 26 2003:

Version 0.21b released, added missing file.

@@ -131,7 +135,7 @@ if you need a facility to configure WEP keys before AP associations succeed.Documentation -

Have a look on the man pages ifplugd(8), ifstatus(8), ifplugd.conf(5). (An XSLT capable browser is required)

+

Have a look on the man pages ifplugd(8), ifplugstatus(8), ifplugd.conf(5). (An XSLT capable browser is required)

Configuration

@@ -291,7 +295,7 @@ on their source codes for learning how to use the link beat ioctls.

Oliver Kurth for packaging ifplugd for Debian and ifplugd's manpage

-

Thomas Hood, Asgeir Nilsen, Sean Reifschneider, R. Steve McKown, David Mitchell, Norbert Preining for patches

+

Thomas Hood, Asgeir Nilsen, Sean Reifschneider, R. Steve McKown, David Mitchell, Norbert Preining, Herbert Graeber for patches

Frederic Lepied for integrating ifplugd into Mandrake Linux

diff --git a/ifplugd.spec.in b/ifplugd.spec.in index 848d49d..d0533be 100644 --- a/ifplugd.spec.in +++ b/ifplugd.spec.in @@ -47,9 +47,9 @@ make DESTDIR=$RPM_BUILD_ROOT PREFIX=%{prefix} install %doc LICENSE README %doc doc/README.html doc/style.css %{_sbindir}/ifplugd -%{_sbindir}/ifstatus +%{_sbindir}/ifplugstatus %{_mandir}/man?/ifplugd* -%{_mandir}/man?/ifstatus* +%{_mandir}/man?/ifplugstatus* %{_sysconfdir}/init.d/ifplugd %config %{_sysconfdir}/ifplugd/ifplugd.conf %config %{_sysconfdir}/ifplugd/ifplugd.action diff --git a/man/Makefile.am b/man/Makefile.am index 182f02a..aa145da 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -16,13 +16,13 @@ # along with ifplugd; if not, write to the Free Software Foundation, # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. -man_MANS = ifplugd.8 ifplugd.conf.5 ifstatus.8 +man_MANS = ifplugd.8 ifplugd.conf.5 ifplugstatus.8 -noinst_DATA = ifplugd.8.xml ifplugd.conf.5.xml ifstatus.8.xml +noinst_DATA = ifplugd.8.xml ifplugd.conf.5.xml ifplugstatus.8.xml -EXTRA_DIST = $(man_MANS) ifplugd.8.xml.in ifplugd.conf.5.xml.in ifstatus.8.xml.in xmltoman.css xmltoman.xsl xmltoman.dtd +EXTRA_DIST = $(man_MANS) ifplugd.8.xml.in ifplugd.conf.5.xml.in ifplugstatus.8.xml.in xmltoman.css xmltoman.xsl xmltoman.dtd -CLEANFILES = ifplugd.8.xml ifplugd.conf.5.xml ifstatus.8.xml +CLEANFILES = ifplugd.8.xml ifplugd.conf.5.xml ifplugstatus.8.xml ifplugd.8.xml: ifplugd.8.xml.in Makefile sed -e 's,@sysconfdir\@,$(sysconfdir),g' -e 's,@sbindir\@,$(sbindir),g' -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@ @@ -30,7 +30,7 @@ ifplugd.8.xml: ifplugd.8.xml.in Makefile ifplugd.conf.5.xml: ifplugd.conf.5.xml.in Makefile sed -e 's,@sysconfdir\@,$(sysconfdir),g' -e 's,@sbindir\@,$(sbindir),g' -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@ -ifstatus.8.xml: ifstatus.8.xml.in Makefile +ifplugstatus.8.xml: ifplugstatus.8.xml.in Makefile sed -e 's,@sysconfdir\@,$(sysconfdir),g' -e 's,@sbindir\@,$(sbindir),g' -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@ if USE_XMLTOMAN @@ -43,7 +43,7 @@ ifplugd.8: ifplugd.8.xml Makefile ifplugd.conf.5: ifplugd.conf.5.xml Makefile xmltoman $< > $@ -ifstatus.8: ifstatus.8.xml Makefile +ifplugstatus.8: ifplugstatus.8.xml Makefile xmltoman $< > $@ endif diff --git a/man/ifplugd.8.xml.in b/man/ifplugd.8.xml.in index a72c9c7..4b57aef 100644 --- a/man/ifplugd.8.xml.in +++ b/man/ifplugd.8.xml.in @@ -280,7 +280,7 @@

, , , + section="5"/>, ,

diff --git a/man/ifstatus.8.xml.in b/man/ifstatus.8.xml.in index bbcf14b..f7bb62a 100644 --- a/man/ifstatus.8.xml.in +++ b/man/ifstatus.8.xml.in @@ -22,14 +22,14 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. --> - + - ifstatus [options] [INTERFACE] + ifplugstatus [options] [INTERFACE] -

ifstatus is an utility which may be used to detect the link +

ifplugstatus is an utility which may be used to detect the link status of a local Linux ethernet device, much in the same way mii-diag, mii-tool and ethtool work. In fact it supports all three different APIs these three tools use. Thus, it provides @@ -44,7 +44,7 @@

You may speicify an ethernet device on the command - line. Otherwise ifstatus will check for eth0..eth9 + line. Otherwise ifplugstatus will check for eth0..eth9 automatically.