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

[Micah Anderson]

The following commit has been merged in the master branch:
commit f4019f3ff7526d9f85e951dbe975d063703b071d
Author: Micah Anderson <micah at riseup.net>
Date:   Tue Mar 25 17:59:05 2008 -0400

    add in upstream man pages that are not included in the release
    
    Signed-off-by: Micah Anderson <micah at riseup.net>

diff --git a/debian/puppet.manpages b/debian/puppet.manpages
index d2b8b0d..d9b86cd 100644
--- a/debian/puppet.manpages
+++ b/debian/puppet.manpages
@@ -1 +1,11 @@
 man/man8/puppet.8
+man/man8/filebucket.8  
+man/man8/pi.8  
+man/man8/puppet.8  
+man/man8/puppetca.8  
+man/man8/puppet.conf.8  
+man/man8/puppetd.8  
+man/man8/puppetdoc.8  
+man/man8/puppetmasterd.8  
+man/man8/puppetrun.8  
+man/man8/ralsh.8
diff --git a/debian/puppetmaster.manpages b/debian/puppetmaster.manpages
index 4f42524..08717a0 100644
--- a/debian/puppetmaster.manpages
+++ b/debian/puppetmaster.manpages
@@ -1 +1 @@
-man/man8/puppetmaster.8
+man/man8/puppetmasterd.8
diff --git a/debian/rules b/debian/rules
index e3e6da5..851eefd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,6 @@ clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-	rm -f man/man8/puppetmaster.8
 	dh_clean 
 
 install: build
@@ -91,9 +90,6 @@ 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
 

-- 
Puppet packaging for Debian