[SCM] GNU Inetutils branch, master, updated. inetutils-1_6-136-g1699b80

[Simon Josefsson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  1699b8024fab54668d85940768c03424ae870f5a (commit)
      from  01abac288437f0d49c0a8a690f6f6efe14c26441 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=1699b8024fab54668d85940768c03424ae870f5a


commit 1699b8024fab54668d85940768c03424ae870f5a
Author: Simon Josefsson <address@hidden>
Date:   Tue Dec 8 11:12:27 2009 +0100

    Rename *.x to *.h2m.

diff --git a/ChangeLog b/ChangeLog
index aa1f158..403ad3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,33 @@
+2009-12-08  Simon Josefsson  <address@hidden>
+
+       * man/Makefile.am: Rename *.x files to *.h2m, to use the same
+       extension used in the help2man package itself.  It also a more
+       symbolic name than *.x.
+       * man/ftp.x: Rename to *.h2m.
+       * man/ftpd.x: Likewise.
+       * man/hostname.x: Likewise.
+       * man/ifconfig.x: Likewise.
+       * man/inetd.x: Likewise.
+       * man/logger.x: Likewise.
+       * man/ping.x: Likewise.
+       * man/rcp.x: Likewise.
+       * man/rexec.x: Likewise.
+       * man/rexecd.x: Likewise.
+       * man/rlogin.x: Likewise.
+       * man/rlogind.x: Likewise.
+       * man/rsh.x: Likewise.
+       * man/rshd.x: Likewise.
+       * man/syslogd.x: Likewise.
+       * man/talk.x: Likewise.
+       * man/talkd.x: Likewise.
+       * man/telnet.x: Likewise.
+       * man/telnetd.x: Likewise.
+       * man/tftp.x: Likewise.
+       * man/tftpd.x: Likewise.
+       * man/traceroute.x: Likewise.
+       * man/uucpd.x: Likewise.
+       * man/whois.x: Likewise.
+
 2009-12-07  Simon Josefsson  <address@hidden>
 
        * doc/inetutils.texi (hostname invocation): Fix typo.  Reported by
diff --git a/man/Makefile.am b/man/Makefile.am
index f2239f2..97900ea 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -23,60 +23,60 @@ dist_man1_MANS = hostname.1 ifconfig.1 inetd.1 ftp.1 ftpd.1 
logger.1        \
 
 # FIXME: ping6 ifconfig tftp
 
-man_aux = $(dist_man1_MANS:.1=.x)
+man_aux = $(dist_man1_MANS:.1=.h2m)
 EXTRA_DIST = $(man_aux)
 
 MAINTAINERCLEANFILES = $(dist_man1_MANS)
 
-ftp.1: ftp.x $(top_srcdir)/ftp/main.c $(top_srcdir)/configure.ac
+ftp.1: ftp.h2m $(top_srcdir)/ftp/main.c $(top_srcdir)/configure.ac
 
-ftpd.1: ftpd.x $(top_srcdir)/ftpd/ftpd.c $(top_srcdir)/configure.ac
+ftpd.1: ftpd.h2m $(top_srcdir)/ftpd/ftpd.c $(top_srcdir)/configure.ac
 
-hostname.1: hostname.x $(top_srcdir)/hostname/hostname.c 
$(top_srcdir)/configure.ac
+hostname.1: hostname.h2m $(top_srcdir)/hostname/hostname.c 
$(top_srcdir)/configure.ac
 
-ifconfig.1: ifconfig.x $(top_srcdir)/ifconfig/options.c 
$(top_srcdir)/configure.ac
+ifconfig.1: ifconfig.h2m $(top_srcdir)/ifconfig/options.c 
$(top_srcdir)/configure.ac
 
-inetd.1: inetd.x $(top_srcdir)/inetd/inetd.c $(top_srcdir)/configure.ac
+inetd.1: inetd.h2m $(top_srcdir)/inetd/inetd.c $(top_srcdir)/configure.ac
 
-logger.1: logger.x $(top_srcdir)/logger/logger.c $(top_srcdir)/configure.ac
+logger.1: logger.h2m $(top_srcdir)/logger/logger.c $(top_srcdir)/configure.ac
 
-ping.1: ping.x $(top_srcdir)/ping/ping.c $(top_srcdir)/configure.ac
+ping.1: ping.h2m $(top_srcdir)/ping/ping.c $(top_srcdir)/configure.ac
 
-rcp.1: rcp.x $(top_srcdir)/rcp/rcp.c $(top_srcdir)/configure.ac
+rcp.1: rcp.h2m $(top_srcdir)/rcp/rcp.c $(top_srcdir)/configure.ac
 
-rexec.1: rexec.x $(top_srcdir)/rexec/rexec.c $(top_srcdir)/configure.ac
+rexec.1: rexec.h2m $(top_srcdir)/rexec/rexec.c $(top_srcdir)/configure.ac
 
-rexecd.1: rexecd.x $(top_srcdir)/rexecd/rexecd.c $(top_srcdir)/configure.ac
+rexecd.1: rexecd.h2m $(top_srcdir)/rexecd/rexecd.c $(top_srcdir)/configure.ac
 
-rlogin.1: rlogin.x $(top_srcdir)/rlogin/rlogin.c $(top_srcdir)/configure.ac
+rlogin.1: rlogin.h2m $(top_srcdir)/rlogin/rlogin.c $(top_srcdir)/configure.ac
 
-rlogind.1: rlogind.x $(top_srcdir)/rlogind/rlogind.c $(top_srcdir)/configure.ac
+rlogind.1: rlogind.h2m $(top_srcdir)/rlogind/rlogind.c 
$(top_srcdir)/configure.ac
 
-rsh.1: rsh.x $(top_srcdir)/rsh/rsh.c $(top_srcdir)/configure.ac
+rsh.1: rsh.h2m $(top_srcdir)/rsh/rsh.c $(top_srcdir)/configure.ac
 
-rshd.1: rshd.x $(top_srcdir)/rshd/rshd.c $(top_srcdir)/configure.ac
+rshd.1: rshd.h2m $(top_srcdir)/rshd/rshd.c $(top_srcdir)/configure.ac
 
-syslogd.1: syslogd.x $(top_srcdir)/syslogd/syslogd.c $(top_srcdir)/configure.ac
+syslogd.1: syslogd.h2m $(top_srcdir)/syslogd/syslogd.c 
$(top_srcdir)/configure.ac
 
-talk.1: talk.x $(top_srcdir)/talk/talk.c $(top_srcdir)/configure.ac
+talk.1: talk.h2m $(top_srcdir)/talk/talk.c $(top_srcdir)/configure.ac
 
-talkd.1: talkd.x $(top_srcdir)/talkd/talkd.c $(top_srcdir)/configure.ac
+talkd.1: talkd.h2m $(top_srcdir)/talkd/talkd.c $(top_srcdir)/configure.ac
 
-telnet.1: telnet.x $(top_srcdir)/telnet/main.c $(top_srcdir)/configure.ac
+telnet.1: telnet.h2m $(top_srcdir)/telnet/main.c $(top_srcdir)/configure.ac
 
-telnetd.1: telnetd.x $(top_srcdir)/telnetd/telnetd.c $(top_srcdir)/configure.ac
+telnetd.1: telnetd.h2m $(top_srcdir)/telnetd/telnetd.c 
$(top_srcdir)/configure.ac
 
-tftp.1: tftp.x $(top_srcdir)/tftp/main.c $(top_srcdir)/configure.ac
+tftp.1: tftp.h2m $(top_srcdir)/tftp/main.c $(top_srcdir)/configure.ac
 
-tftpd.1: tftpd.x $(top_srcdir)/tftpd/tftpd.c $(top_srcdir)/configure.ac
+tftpd.1: tftpd.h2m $(top_srcdir)/tftpd/tftpd.c $(top_srcdir)/configure.ac
 
-traceroute.1: traceroute.x $(top_srcdir)/traceroute/traceroute.c 
$(top_srcdir)/configure.ac
+traceroute.1: traceroute.h2m $(top_srcdir)/traceroute/traceroute.c 
$(top_srcdir)/configure.ac
 
-uucpd.1: uucpd.x $(top_srcdir)/uucpd/uucpd.c $(top_srcdir)/configure.ac
+uucpd.1: uucpd.h2m $(top_srcdir)/uucpd/uucpd.c $(top_srcdir)/configure.ac
 
-whois.1: whois.x $(top_srcdir)/whois/whois.c $(top_srcdir)/configure.ac
+whois.1: whois.h2m $(top_srcdir)/whois/whois.c $(top_srcdir)/configure.ac
 
-.x.1:
+.h2m.1:
        rm -f $@ address@hidden                                         \
        && {                                                    \
                rm -rf tmp;                                     \
@@ -84,7 +84,7 @@ whois.1: whois.x $(top_srcdir)/whois/whois.c 
$(top_srcdir)/configure.ac
                (cd tmp && $(LN_S) ../../$*/$* $*);             \
                    $(HELP2MAN)                                 \
                     --source='$(PACKAGE_STRING)'               \
-                    --include=$(srcdir)/$*.x                   \
+                    --include=$(srcdir)/$*.h2m                 \
                     --output=tmp/$@ tmp/$*;                    \
        }                                                       \
        && cp tmp/$@ address@hidden                                     \
diff --git a/man/ftp.x b/man/ftp.h2m
similarity index 100%
rename from man/ftp.x
rename to man/ftp.h2m
diff --git a/man/ftpd.x b/man/ftpd.h2m
similarity index 100%
rename from man/ftpd.x
rename to man/ftpd.h2m
diff --git a/man/hostname.x b/man/hostname.h2m
similarity index 100%
rename from man/hostname.x
rename to man/hostname.h2m
diff --git a/man/ifconfig.x b/man/ifconfig.h2m
similarity index 100%
rename from man/ifconfig.x
rename to man/ifconfig.h2m
diff --git a/man/inetd.x b/man/inetd.h2m
similarity index 100%
rename from man/inetd.x
rename to man/inetd.h2m
diff --git a/man/logger.x b/man/logger.h2m
similarity index 100%
rename from man/logger.x
rename to man/logger.h2m
diff --git a/man/ping.x b/man/ping.h2m
similarity index 100%
rename from man/ping.x
rename to man/ping.h2m
diff --git a/man/rcp.x b/man/rcp.h2m
similarity index 100%
rename from man/rcp.x
rename to man/rcp.h2m
diff --git a/man/rexec.x b/man/rexec.h2m
similarity index 100%
rename from man/rexec.x
rename to man/rexec.h2m
diff --git a/man/rexecd.x b/man/rexecd.h2m
similarity index 100%
rename from man/rexecd.x
rename to man/rexecd.h2m
diff --git a/man/rlogin.x b/man/rlogin.h2m
similarity index 100%
rename from man/rlogin.x
rename to man/rlogin.h2m
diff --git a/man/rlogind.x b/man/rlogind.h2m
similarity index 100%
rename from man/rlogind.x
rename to man/rlogind.h2m
diff --git a/man/rsh.x b/man/rsh.h2m
similarity index 100%
rename from man/rsh.x
rename to man/rsh.h2m
diff --git a/man/rshd.x b/man/rshd.h2m
similarity index 100%
rename from man/rshd.x
rename to man/rshd.h2m
diff --git a/man/syslogd.x b/man/syslogd.h2m
similarity index 100%
rename from man/syslogd.x
rename to man/syslogd.h2m
diff --git a/man/talk.x b/man/talk.h2m
similarity index 100%
rename from man/talk.x
rename to man/talk.h2m
diff --git a/man/talkd.x b/man/talkd.h2m
similarity index 100%
rename from man/talkd.x
rename to man/talkd.h2m
diff --git a/man/telnet.x b/man/telnet.h2m
similarity index 100%
rename from man/telnet.x
rename to man/telnet.h2m
diff --git a/man/telnetd.x b/man/telnetd.h2m
similarity index 100%
rename from man/telnetd.x
rename to man/telnetd.h2m
diff --git a/man/tftp.x b/man/tftp.h2m
similarity index 100%
rename from man/tftp.x
rename to man/tftp.h2m
diff --git a/man/tftpd.x b/man/tftpd.h2m
similarity index 100%
rename from man/tftpd.x
rename to man/tftpd.h2m
diff --git a/man/traceroute.x b/man/traceroute.h2m
similarity index 100%
rename from man/traceroute.x
rename to man/traceroute.h2m
diff --git a/man/uucpd.x b/man/uucpd.h2m
similarity index 100%
rename from man/uucpd.x
rename to man/uucpd.h2m
diff --git a/man/whois.x b/man/whois.h2m
similarity index 100%
rename from man/whois.x
rename to man/whois.h2m

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                            |   30 +++++++++++++++++++
 man/Makefile.am                      |   54 +++++++++++++++++-----------------
 man/{ftp.x => ftp.h2m}               |    0
 man/{ftpd.x => ftpd.h2m}             |    0
 man/{hostname.x => hostname.h2m}     |    0
 man/{ifconfig.x => ifconfig.h2m}     |    0
 man/{inetd.x => inetd.h2m}           |    0
 man/{logger.x => logger.h2m}         |    0
 man/{ping.x => ping.h2m}             |    0
 man/{rcp.x => rcp.h2m}               |    0
 man/{rexec.x => rexec.h2m}           |    0
 man/{rexecd.x => rexecd.h2m}         |    0
 man/{rlogin.x => rlogin.h2m}         |    0
 man/{rlogind.x => rlogind.h2m}       |    0
 man/{rsh.x => rsh.h2m}               |    0
 man/{rshd.x => rshd.h2m}             |    0
 man/{syslogd.x => syslogd.h2m}       |    0
 man/{talk.x => talk.h2m}             |    0
 man/{talkd.x => talkd.h2m}           |    0
 man/{telnet.x => telnet.h2m}         |    0
 man/{telnetd.x => telnetd.h2m}       |    0
 man/{tftp.x => tftp.h2m}             |    0
 man/{tftpd.x => tftpd.h2m}           |    0
 man/{traceroute.x => traceroute.h2m} |    0
 man/{uucpd.x => uucpd.h2m}           |    0
 man/{whois.x => whois.h2m}           |    0
 26 files changed, 57 insertions(+), 27 deletions(-)
 rename man/{ftp.x => ftp.h2m} (100%)
 rename man/{ftpd.x => ftpd.h2m} (100%)
 rename man/{hostname.x => hostname.h2m} (100%)
 rename man/{ifconfig.x => ifconfig.h2m} (100%)
 rename man/{inetd.x => inetd.h2m} (100%)
 rename man/{logger.x => logger.h2m} (100%)
 rename man/{ping.x => ping.h2m} (100%)
 rename man/{rcp.x => rcp.h2m} (100%)
 rename man/{rexec.x => rexec.h2m} (100%)
 rename man/{rexecd.x => rexecd.h2m} (100%)
 rename man/{rlogin.x => rlogin.h2m} (100%)
 rename man/{rlogind.x => rlogind.h2m} (100%)
 rename man/{rsh.x => rsh.h2m} (100%)
 rename man/{rshd.x => rshd.h2m} (100%)
 rename man/{syslogd.x => syslogd.h2m} (100%)
 rename man/{talk.x => talk.h2m} (100%)
 rename man/{talkd.x => talkd.h2m} (100%)
 rename man/{telnet.x => telnet.h2m} (100%)
 rename man/{telnetd.x => telnetd.h2m} (100%)
 rename man/{tftp.x => tftp.h2m} (100%)
 rename man/{tftpd.x => tftpd.h2m} (100%)
 rename man/{traceroute.x => traceroute.h2m} (100%)
 rename man/{uucpd.x => uucpd.h2m} (100%)
 rename man/{whois.x => whois.h2m} (100%)


hooks/post-receive
-- 
GNU Inetutils