[pkg-fso-commits] [SCM] Automatic Display Manager branch, master, updated. debian/0.1-60-g9b91fa4

[Enrico Zini]

The following commit has been merged in the master branch:
commit 11d905ca89a09b8a7300f39e8cf8f6afc6b5e9fb
Author: Enrico Zini <enrico at enricozini.org>
Date:   Mon Feb 23 20:45:50 2009 +0000

    Build and install a manpage

diff --git a/Makefile.am b/Makefile.am
index 8c56e5c..1d4302b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,4 +10,8 @@ nodm.8: nodm
 	help2man --section=8 --name="X display manager for automatic logins" \
 		 --no-info --include=nodm-man-extras ./$< > $@
 
+man_MANS = nodm.8
+
 EXTRA_DIST = test_nodm TODO nodm-man-extras
+
+CLEANFILES = nodm.8
diff --git a/debian/control b/debian/control
index dd400e4..f0fca0c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: misc
 Priority: extra
 Maintainer: Joachim Breitner <nomeata at debian.org>
 Uploaders: Enrico Zini <enrico at debian.org>
-Build-Depends: debhelper (>= 7), po-debconf, libpam0g-dev
+Build-Depends: debhelper (>= 7), po-debconf, libpam0g-dev, help2man
 Standards-Version: 3.8.0
 Vcs-Git: http://git.debian.org/git/pkg-fso/nodm.git
 Vcs-Browser: http://git.debian.org/?p=pkg-fso/nodm.git;a=summary
diff --git a/nodm-man-extras b/nodm-man-extras
new file mode 100644
index 0000000..5944c6a
--- /dev/null
+++ b/nodm-man-extras
@@ -0,0 +1,22 @@
+[DESCRIPTION]
+\fBnodm\fP is a minimal display manager that simply logs in as a given user and
+starts an X session, without asking for username or password.
+.P
+On a normal computer, using \fBnodm\fP is a big security issue because it would
+give anyone access to the computer.
+.P
+However, there are cases where automatic login is needed: for example in an
+embedded system such as a mobile phone, or in a kiosk setup, or in a control
+panel for industrial machinery.  For those cases, \fBnodm\fP is simple to
+setup, lightweight, and it should do exactly the right thing.
+
+[AUTHOR]
+\fBnodm\fP is written and maintained by Enrico Zini <enrico at enricozini.org> and
+Joachim Breitner <nomeata at debian.org>.
+
+[SEE ALSO]
+.BR xinit (1),
+.BR xdm (1),
+.BR gdm (1),
+.BR kdm (1).
+
diff --git a/nodm.8 b/nodm.8
deleted file mode 100644
index cc6fcea..0000000
--- a/nodm.8
+++ /dev/null
@@ -1,37 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH NODM "8" "February 2009" "nodm version 0.2" "System Administration Utilities"
-.SH NAME
-nodm \- X display manager for automatic logins
-.SH SYNOPSIS
-.B nodm
-[\fIoptions\fR]
-.SH DESCRIPTION
-\fBnodm\fP is a minimal display manager that simply logs in as a given user and
-starts an X session, without asking for username or password.
-.P
-On a normal computer, using \fBnodm\fP is a big security issue because it would
-give anyone access to the computer.
-.P
-However, there are cases where automatic login is needed: for example in an
-embedded system such as a mobile phone, or in a kiosk setup, or in a control
-panel for industrial machinery.  For those cases, \fBnodm\fP is simple to
-setup, lightweight, and it should do exactly the right thing.
-.SH OPTIONS
-.TP
-\fB\-\-help\fR
-print this help message
-.TP
-\fB\-\-version\fR
-print nodm's version number
-.TP
-\fB\-\-session\fR=\fIcmd\fR
-run cmd instead of /usr/sbin/nodm
-(use for testing)
-.SH AUTHOR
-\fBnodm\fP is written and maintained by Enrico Zini <enrico at enricozini.org> and
-Joachim Breitner <nomeata at debian.org>.
-.SH "SEE ALSO"
-.BR xinit (1),
-.BR xdm (1),
-.BR gdm (1),
-.BR kdm (1).

-- 
Automatic Display Manager