[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. puppet-0.24.5-rc3-1702-g748c076

[Stig Sandbeck Mathisen]

The following commit has been merged in the master branch:
commit 748c076c16f9bc1304c33678cf18f564b42958f4
Author: Stig Sandbeck Mathisen <ssm at debian.org>
Date:   Mon Feb 8 14:16:30 2010 +0000

    Update packaging information for man page fix
    
    Move manpage "puppet.conf.5" from package "puppet" to "puppet-common"

diff --git a/debian/changelog b/debian/changelog
index 2ebc2a6..78adc9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 puppet (0.25.4-2) UNRELEASED; urgency=low
 
+  [ Stig Sandbeck Mathisen ]
   * puppet: do not explicitly remove /var/lib/puppet on purge (Closes: #525852)
+  * upstream cherry-pick: Updated man pages and moved puppet.conf.8 to
+    puppet.conf.5 (Closes: #563567)
 
- -- Stig Sandbeck Mathisen <ssm at debian.org>  Mon, 08 Feb 2010 10:00:10 +0100
+ -- Stig Sandbeck Mathisen <ssm at debian.org>  Mon, 08 Feb 2010 15:06:21 +0100
 
 puppet (0.25.4-1) unstable; urgency=low
 
diff --git a/debian/puppet-common.manpages b/debian/puppet-common.manpages
new file mode 100644
index 0000000..ffd1409
--- /dev/null
+++ b/debian/puppet-common.manpages
@@ -0,0 +1 @@
+man/man5/puppet.conf.5
diff --git a/debian/puppet.manpages b/debian/puppet.manpages
index f07d13e..88bc141 100644
--- a/debian/puppet.manpages
+++ b/debian/puppet.manpages
@@ -1,7 +1,6 @@
 man/man8/puppet.8
 man/man8/filebucket.8  
 man/man8/puppet.8  
-man/man8/puppet.conf.8  
 man/man8/puppetd.8  
 man/man8/puppetdoc.8  
 man/man8/ralsh.8

-- 
Puppet packaging for Debian