[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. db94b467fb8abb1e37f717340d439826b8712b6f

[Micah Anderson]

The following commit has been merged in the master branch:
commit 2c5df631ad06d76e92819b5ced4b769a8fece0b6
Author: Micah Anderson <micah at riseup.net>
Date:   Sun Mar 9 14:27:40 2008 -0400

    add upstream man pages by splitting them out for each binary

diff --git a/debian/changelog b/debian/changelog
index 82ca1ee..b97c999 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 puppet (0.24.3-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * Install man pages (Closes: #385529)
   * Apply lsb formatted dependency info into initscripts, thanks
     Petter Reinholdtsen (Closes: #462915)
 
diff --git a/debian/puppet.manpages b/debian/puppet.manpages
new file mode 100644
index 0000000..c1389d9
--- /dev/null
+++ b/debian/puppet.manpages
@@ -0,0 +1 @@
+man/man8/puppet.8
\ No newline at end of file
diff --git a/debian/puppetmaster.manpages b/debian/puppetmaster.manpages
new file mode 100644
index 0000000..c107737
--- /dev/null
+++ b/debian/puppetmaster.manpages
@@ -0,0 +1 @@
+man/man8/puppetmaster.8
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index ecabcba..9cf9b19 100755
--- a/debian/rules
+++ b/debian/rules
@@ -90,6 +90,9 @@ install: build
 	# packages
 	find debian/tmp debian/puppet debian/puppetmaster -name .svn |xargs rm -rf
 
+	# puppet(8) and puppetmaster(8) are one man page, we want one for each
+	cp man/man8/puppet.8 man/man8/puppetmaster.8
+
 # Build architecture-dependent files here.
 binary-arch: build install
 
@@ -100,6 +103,7 @@ binary-indep: build install
 	dh_movefiles -i
 	dh_installchangelogs -i CHANGELOG
 	dh_installdocs -i
+	dh_installman
 	dh_installinit -ppuppetmaster
 	dh_installinit -ppuppet -- defaults 21
 	dh_installlogrotate -i

-- 
Puppet packaging for Debian