[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, maverick, updated. debian/2.6.1.rc3-1-52-gf8125d9

[Mathias Gug]

The following commit has been merged in the maverick branch:
commit 6d410fe3a9bf62c169e0aaff744bec149ceac81b
Merge: ebbb85fea7e4d8ac9bd3568aa436cd0d4505469b 7bd836accf152bb9b651e0fa44a3d2d26fb8bcfa
Author: Mathias Gug <mathias.gug at canonical.com>
Date:   Mon Sep 20 14:37:48 2010 -0400

    Merge branch 'master' into maverick-proposed

diff --combined debian/changelog
index 5cbbf8d,ec4cb06..cdec84c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,27 -1,21 +1,30 @@@
 -puppet (2.6.1-1) UNRELEASED; urgency=low
 +puppet (2.6.1-0ubuntu1) maverick; urgency=low
 +
 +  [ Stig Sandbeck Mathisen ]
 +  * Add dependency on "facter" for "puppet-common"
 +  * Make sure the "puppet-common" package can be purged even when not fully
 +    installed (Closes: #596163)
 +
 +  [ Mathias Gug ]
 +  * New upstream version. 
 +
 + -- Mathias Gug <mathiaz at ubuntu.com>  Tue, 14 Sep 2010 12:05:29 -0400
 +
 +puppet (2.6.1~rc4-0ubuntu1) maverick; urgency=low
  
    [ Mathias Gug ]
    * New upstream version:
      - Fix "Puppet standalone broken" (Closes: #594575)
    * test/lib/puppettest/fakes.rb: Fix puppettest to use puppet system 
      library.
+   * debian/puppetmaster-passenger.postinst: Use cacrl instead of hostcrl to
+     set the location of the CRL in apache2 configuration. Fix apache2 
+     configuration on upgrade as well (LP: #641001).
  
    [ Stig Sandbeck Mathisen ]
    * Fix "require" path for puppet queue.
 -  * Add dependency on "facter" for "puppet-common"
 -  * Make sure the "puppet-common" package can be purged even when not fully
 -    installed (Closes: #596163)
  
 - -- Mathias Gug <mathiaz at ubuntu.com>  Tue, 07 Sep 2010 09:37:45 -0400
 + -- Mathias Gug <mathiaz at ubuntu.com>  Tue, 07 Sep 2010 10:44:22 -0400
  
  puppet (2.6.1~rc3-1) experimental; urgency=low
  

-- 
Puppet packaging for Debian