[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/2.6.1-1-61-g3619aa2

[Mathias Gug]

The following commit has been merged in the master branch:
commit 7918872e26b5c342c60a4e2f1b0301246dc49d11
Merge: 626d07945740054dda19d627f71b753d286e5220 1f6c832d659a0829e05427fb4e266980741a3481
Author: Mathias Gug <mathias.gug at canonical.com>
Date:   Thu Oct 21 10:02:45 2010 -0400

    Merge branch 'upstream'

diff --combined install.rb
index b61fa2d,f7541c8..cb49aa5
--- a/install.rb
+++ b/install.rb
@@@ -458,8 -458,8 +458,8 @@@ prepare_installatio
  #run_tests(tests) if InstallOptions.tests
  #build_rdoc(rdoc) if InstallOptions.rdoc
  #build_ri(ri) if InstallOptions.ri
 -#build_man(bins, sbins) if InstallOptions.man
 +build_man(bins, sbins) if InstallOptions.man
  do_bins(sbins, InstallOptions.sbin_dir)
  do_bins(bins, InstallOptions.bin_dir)
  do_libs(libs)
- do_man(man) if InstallOptions.man
+ do_man(man) unless $operatingsystem == "windows"

-- 
Puppet packaging for Debian