[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 db94b467fb8abb1e37f717340d439826b8712b6f
Merge: 82c4f0e0886c3d3f4bf310934c2e62967d201464 8aabc57dbd0a181a56060a25ca5d3ccc3bac97cd
Author: Micah Anderson <micah at riseup.net>
Date:   Sun Mar 9 17:57:59 2008 -0400

    Merge branch 'master' of git://git.debian.org/git/pkg-puppet/puppet
    
    Conflicts:
    
    	debian/changelog

diff --combined debian/changelog
index 16b1380,b4f3442..6f14dd5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,8 +1,18 @@@
 -puppet (0.24.1-3) UNRELEASED; urgency=low
 +puppet (0.24.3-1) UNRELEASED; urgency=low
  
++  [ Micah Anderson]
 +  * New upstream release
 +  * Install man pages (Closes: #385529)
 +  * Apply lsb formatted dependency info into initscripts, thanks
 +    Petter Reinholdtsen (Closes: #462915)
 +  * Install more robust puppet-mode.el
 +  * Add factpath and pluginsync=true to the default puppet.conf so that
 +    facts added through pluginsync are loaded by puppet
 +  * Add [plugins] section to fileserver.conf
++  [ Thom May ]
+   * If puppet can't start, continue with package install
  
 - -- Thom May <thom at joost.com>  Thu, 07 Feb 2008 20:07:48 +0100
 + -- Micah Anderson <micah at debian.org>  Sun, 09 Mar 2008 14:03:00 -0400
  
  puppet (0.24.1-2) unstable; urgency=low
  
diff --combined debian/rules
index 9cf9b19,f32e64f..5417620
--- a/debian/rules
+++ b/debian/rules
@@@ -90,9 -90,6 +90,9 @@@ install: buil
  	# 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
  
@@@ -103,9 -100,8 +103,9 @@@ binary-indep: build instal
  	dh_movefiles -i
  	dh_installchangelogs -i CHANGELOG
  	dh_installdocs -i
 +	dh_installman
  	dh_installinit -ppuppetmaster
- 	dh_installinit -ppuppet -- defaults 21
+ 	dh_installinit -ppuppet --error-handler=true -- defaults 21 
  	dh_installlogrotate -i
  	dh_compress -i
  	dh_fixperms -i

-- 
Puppet packaging for Debian