[DRE-commits] r4514 - trunk/ohai/debian

[Bryan McLellan]

Author: btm-guest
Date: 2010-01-09 06:22:18 +0000 (Sat, 09 Jan 2010)
New Revision: 4514

Removed:
   trunk/ohai/debian/ohai.1
Modified:
   trunk/ohai/debian/rules
Log:
install upstream ohai man page


Deleted: trunk/ohai/debian/ohai.1
===================================================================
--- trunk/ohai/debian/ohai.1	2010-01-09 06:10:02 UTC (rev 4513)
+++ trunk/ohai/debian/ohai.1	2010-01-09 06:22:18 UTC (rev 4514)
@@ -1,23 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH OHAI "1" "April 2009" "ohai" "User Commands"
-.SH NAME
-ohai \- collect system information
-.SH SYNOPSIS
-.B ohai
-[\fIOPTION\fR]... 
-.SH DESCRIPTION
-Information about your system is collected and returned as multidimensional
-attributes in a JSON format.
-.TP
-\fB\-d\fR, \fB\-\-directory\fR NAME
-A directory to add to the Ohai search path
-.TP
-\fB\-f\fR, \fB\-\-file\fR NAME
-A file to run Ohai against
-.TP
-\fB\-l\fR, \fB\-\-loglevel\fR NAME
-Set log level for Ohai
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-Show this message
-.IP

Modified: trunk/ohai/debian/rules
===================================================================
--- trunk/ohai/debian/rules	2010-01-09 06:10:02 UTC (rev 4513)
+++ trunk/ohai/debian/rules	2010-01-09 06:22:18 UTC (rev 4514)
@@ -44,7 +44,7 @@
 	rmdir $(CURDIR)/debian/libohai-ruby1.9/usr/bin/
 
 install/ohai::
-	dh_installman debian/ohai.1
+	dh_installman docs/man/man1/ohai.1
 	dh_installchangelogs
 	dh_installdirs