[Savannah-hackers-public] address@hidden: [SCM] GNU Inetutils branch, master, updated. inetutils-1_6-127-gb68da88]

[Alfred M. Szmidt]

It seems that `git diff' still gets immensly confused when producing
diff output, man/Makefile.am was not copied from Makefile.am.  The
summary at the end if also confusing, the diff states that Makefile.am
was copied to man/Makefile.am, while the summary says
rexec/Makefile.am was copied to man/Makefile.am.

------- Start of forwarded message -------
To: address@hidden
From: Simon Josefsson <address@hidden>
Date: Mon, 07 Dec 2009 10:45:59 +0000
Subject: [SCM] GNU Inetutils  branch, master,
        updated. inetutils-1_6-127-gb68da88

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  b68da88c4318500bb32a64da58221895be0feb94 (commit)
      from  01469ec1de61765657f4a94660a60b0bdab5b922 (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=b68da88c4318500bb32a64da58221895be0feb94


commit b68da88c4318500bb32a64da58221895be0feb94
Author: Simon Josefsson <address@hidden>
Date:   Mon Dec 7 11:45:55 2009 +0100

    Add (some) man pages.

diff --git a/ChangeLog b/ChangeLog
index 94c9ec4..a6154e5 100644
- --- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-12-07  Simon Josefsson  <address@hidden>
+
+       * configure.ac: Check for help2man.
+       * configure.ac (AC_CONFIG_FILES): Add man/Makefile.
+       * Makefile.am (SUBDIRS): Add man directory.
+       * man/Makefile.am: Add file.
+       * man/telnet.x, man/telnetd.x, man/rshd.x: New files.
+
 2009-12-06  Giuseppe Scrivano  <address@hidden>
 
        * NEWS: Mention the new program rexec.
diff --git a/Makefile.am b/Makefile.am
index 5c9f40c..72437dd 100644
- --- a/Makefile.am
+++ b/Makefile.am
@@ -26,7 +26,7 @@ EXTRA_DIST = README-alpha paths ChangeLog.0
 SUBDIRS = lib headers libinetutils libtelnet \
        hostname inetd telnetd libls ftpd rshd rlogind uucpd rexecd syslogd \
        tftpd talkd telnet ftp rsh rcp rlogin tftp logger whois talk \
- -     libicmp ping doc ifconfig traceroute rexec tests
+       libicmp ping doc ifconfig traceroute rexec tests man
 
 DISTCLEANFILES = pathdefs.make paths.defs
 
diff --git a/configure.ac b/configure.ac
index bfe17bc..d2df5a3 100644
- --- a/configure.ac
+++ b/configure.ac
@@ -132,6 +132,7 @@ AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 AC_PROG_RANLIB
 AC_PROG_YACC
+AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
 
 gl_INIT
 
@@ -844,5 +845,6 @@ confpaths.h:confpaths.h.in
 headers/Makefile
 doc/Makefile
 tests/Makefile
+man/Makefile
 ])
 AC_OUTPUT
diff --git a/Makefile.am b/man/Makefile.am
similarity index 50%
copy from Makefile.am
copy to man/Makefile.am
index 5c9f40c..61235ed 100644
- --- a/Makefile.am
+++ b/man/Makefile.am
@@ -1,6 +1,5 @@
 #
- -# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
- -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2009 Free Software Foundation, Inc.
 #
 # This file is part of GNU Inetutils.
 #
@@ -17,18 +16,24 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
- -AUTOMAKE_OPTIONS = 1.9
+dist_man1_MANS = telnet.1 telnetd.1 rshd.1
 
- -ACLOCAL_AMFLAGS = -I m4 -I am
+man_aux = $(dist_man1_MANS:.1=.x)
+EXTRA_DIST = $(man_aux)
 
- -EXTRA_DIST = README-alpha paths ChangeLog.0
+MAINTAINERCLEANFILES = $(dist_man1_MANS)
 
- -SUBDIRS = lib headers libinetutils libtelnet \
- -     hostname inetd telnetd libls ftpd rshd rlogind uucpd rexecd syslogd \
- -     tftpd talkd telnet ftp rsh rcp rlogin tftp logger whois talk \
- -     libicmp ping doc ifconfig traceroute rexec tests
+telnet.1: telnet.x $(top_srcdir)/telnet/main.c $(top_srcdir)/configure.ac
+       $(HELP2MAN) \
+               --include=telnet.x \
+               --output=$@ $(top_builddir)/telnet/telnet$(EXEEXT)
 
- -DISTCLEANFILES = pathdefs.make paths.defs
+telnetd.1: telnetd.x $(top_srcdir)/telnetd/telnetd.c $(top_srcdir)/configure.ac
+       $(HELP2MAN) \
+               --include=telnetd.x \
+               --output=$@ $(top_builddir)/telnetd/telnetd$(EXEEXT)
 
- -snapshot:
- -     $(MAKE) dist distdir=$(PACKAGE)-`date +"%Y%m%d"`
+rshd.1: rshd.x $(top_srcdir)/rshd/rshd.c $(top_srcdir)/configure.ac
+       $(HELP2MAN) \
+               --include=rshd.x \
+               --output=$@ $(top_builddir)/rshd/rshd$(EXEEXT)
diff --git a/man/rshd.x b/man/rshd.x
new file mode 100644
index 0000000..c3dfb66
- --- /dev/null
+++ b/man/rshd.x
@@ -0,0 +1,4 @@
+[NAME]
+rshd \- Remote shell server
+[SEE ALSO]
+rsh(1)
diff --git a/man/telnet.x b/man/telnet.x
new file mode 100644
index 0000000..1abcd29
- --- /dev/null
+++ b/man/telnet.x
@@ -0,0 +1,4 @@
+[NAME]
+telnet \- User interface to TELNET
+[SEE ALSO]
+telnetd(1)
diff --git a/man/telnetd.x b/man/telnetd.x
new file mode 100644
index 0000000..d9ead50
- --- /dev/null
+++ b/man/telnetd.x
@@ -0,0 +1,4 @@
+[NAME]
+telnetd \- Telnet server
+[SEE ALSO]
+telnet(1)

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

Summary of changes:
 ChangeLog                  |    8 ++++++++
 Makefile.am                |    2 +-
 configure.ac               |    2 ++
 {rexec => man}/Makefile.am |   27 ++++++++++++++++-----------
 man/rshd.x                 |    4 ++++
 man/telnet.x               |    4 ++++
 man/telnetd.x              |    4 ++++
 7 files changed, 39 insertions(+), 12 deletions(-)
 copy {rexec => man}/Makefile.am (53%)
 create mode 100644 man/rshd.x
 create mode 100644 man/telnet.x
 create mode 100644 man/telnetd.x


hooks/post-receive
- -- 
GNU Inetutils 


_______________________________________________
Commit-inetutils mailing list
address@hidden
http://lists.gnu.org/mailman/listinfo/commit-inetutils
------- End of forwarded message -------