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

[Stig Sandbeck Mathisen]

The following commit has been merged in the master branch:
commit eba19576abec234eb2b3dc0d182ff928eb892434
Author: Nigel Kersten <nigelk at google.com>
Date:   Sun Aug 16 06:05:21 2009 -0700

    bump changelog, deal with sbindir change upstream

diff --git a/debian/changelog b/debian/changelog
index 82ab829..ed07f09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,20 @@
-puppet (0.24.8-3) UNRELEASED; urgency=low
+puppet (0.25.0-1) unstable; urgency=low
 
+  * New upstream release
+  * Tweak .install files to cope with new use of sbindir from upstream.
+  * Add the new auth.conf config file to the puppetmaster package.
+
+ -- Nigel Kersten <nigel at explanatorygap.net>  Sun, 16 Aug 2009 05:34:17 -0700
+
+puppet (0.24.8-3) unstable; urgency=low
+
+  [ Micah Anderson ]
   * Make logcheck ignore 'Reopening log files' on puppetmaster (Closes: #538721)
 
- -- Micah Anderson <micah at debian.org>  Tue, 04 Aug 2009 16:43:35 -0400
+  [ Nigel Kersten ]
+  * switch from unreleased to unstable. 
+
+ -- Nigel Kersten <nigel at explanatorygap.net>  Sun, 16 Aug 2009 05:33:53 -0700
 
 puppet (0.24.8-2) unstable; urgency=high
 
diff --git a/debian/puppet.install b/debian/puppet.install
index 18b8000..0d438ef 100644
--- a/debian/puppet.install
+++ b/debian/puppet.install
@@ -2,6 +2,6 @@ debian/puppet.conf etc/puppet
 debian/tmp/usr/bin/filebucket usr/bin
 debian/tmp/usr/bin/puppet usr/bin
 debian/tmp/usr/bin/puppetdoc usr/bin
-debian/tmp/usr/bin/puppetd usr/sbin
+debian/tmp/usr/sbin/puppetd usr/sbin
 debian/tmp/usr/bin/ralsh usr/bin
 debian/tmp/usr/lib/ruby/1.8/* usr/lib/ruby/1.8
diff --git a/debian/puppetmaster.install b/debian/puppetmaster.install
index 886d78c..2aa4c15 100644
--- a/debian/puppetmaster.install
+++ b/debian/puppetmaster.install
@@ -1,7 +1,6 @@
 debian/fileserver.conf etc/puppet
+conf/auth.conf etc/puppet
 ext/puppetlast usr/bin
-# As of puppet 0.25.0 this will no longer be necessary
-# as sbindir will be used by install.rb
-debian/tmp/usr/bin/puppetmasterd usr/sbin
-debian/tmp/usr/bin/puppetca usr/sbin
-debian/tmp/usr/bin/puppetrun usr/sbin
+debian/tmp/usr/sbin/puppetmasterd usr/sbin
+debian/tmp/usr/sbin/puppetca usr/sbin
+debian/tmp/usr/sbin/puppetrun usr/sbin

-- 
Puppet packaging for Debian