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

Mathias Gug mathias.gug at canonical.com
Tue Sep 7 14:27:54 UTC 2010


The following commit has been merged in the master branch:
commit 54ff1f0a269d34fcac6537182ed546c7eb6d53ee
Merge: ba1544f69be33bd28a1c17dc9dcfd870eb97ee5e 74f82856eb8314d2b6a3df95060eb79b98c37fbf
Author: Mathias Gug <mathias.gug at canonical.com>
Date:   Tue Sep 7 09:46:24 2010 -0400

    Merge new upstream version 2.6.1~rc4.
    
    * New upstream version:
      - Fix "Puppet standalone broken" (Closes: #594575)

diff --combined debian/changelog
index 1f83ea2,0000000..4ae639e
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,707 -1,0 +1,714 @@@
++puppet (2.6.1~rc4-1) UNRELEASED; urgency=low
++
++  * New upstream version:
++    - Fix "Puppet standalone broken" (Closes: #594575)
++
++ -- Mathias Gug <mathiaz at ubuntu.com>  Tue, 07 Sep 2010 09:37:45 -0400
++
 +puppet (2.6.1~rc3-1) experimental; urgency=low
 +
 +  [ Mathias Gug ]
 +  * New upstream version:
 +    - fix config.ru file to run puppetmaster as a rack application.
 +      (Closes: #593557)
 +  * Fix test suite to run from a package install rather then from the source
 +    directory:
 +    + Rakefile: use system puppet.rb file to detect version.
 +    + spec/unit/application/apply_spec.rb: Fix test suite to use puppet 
 +      system library.
 +    + spec/spec_helper.rb: disable gem.
 +  * Fix init service provider to correctly check the status of services
 +    using upstart jobs (Closes: #584481, LP: #551544).
 +  * etckeeper integration (Closes: #571127)
 +    [server-lucid-puppet-etckeeper-integration]:
 +    + debian/etckeeper-commit-post, debian/etckeeper-commit-pre:
 +       Call "etckeeper commit" before and after catalog runs.
 +       Silently bail out if etckeeper is not available.
 +    + debian/puppet.conf: Call out to the etckeeper hooks using 
 +       the prerun_command and postrun_command hooks.
 +    + debian/rules: Install the etckeeper hook scripts in /etc/puppet.
 +    + debian/README.Debian: add note about etckeeper integration.
 +    + debian/control: the puppet package suggests etckeeper.
 +  * Create puppetmaster-passenger package to automatically setup the
 +    puppetmaster to be run under mod passenger and apache2:
 +    - create new puppetmaster-common package to share files between
 +      puppetmaster (ie webrick) and puppetmaster-passenger.
 +    - move puppetqd to puppetmaster-common.
 +    - debian/puppet.conf: enable ssl options so that the default configuration
 +      works out of the box under passenger.
 +  * debian/puppet-common.postinst: set permissions and ownership of puppet log
 +    directory.
 +  * Move puppetmaster's Recommends to Suggests.
 +
 +  [ Stig Sandbeck Mathisen ]
 +  * Recommend lsb-release (Closes: #593606)
 +  * Recommend debconf-utils (Closes: #593780)
 +  * ext/puppetlast: removed from upstream
 +  * Cherry-pick updated man pages from upstream
 +
 + -- Stig Sandbeck Mathisen <ssm at debian.org>  Fri, 27 Aug 2010 14:32:00 +0200
 +
 +puppet (2.6.0-2) unstable; urgency=low
 +
 +  * Bump Standards-Version to 3.9.1
 +  * Release for unstable
 +
 + -- Stig Sandbeck Mathisen <ssm at debian.org>  Wed, 28 Jul 2010 20:48:21 +0200
 +
 +puppet (2.6.0-1) experimental; urgency=low
 +
 +  * New upstream version
 +  * Fix "short package description doesn't differ from binary package
 +    puppet", update description of binary package. (Closes: #587364)
 +  * Move /usr/bin/puppet to the puppet-common package
 +  * debian/control: Convert Conflicts: to Breaks:
 +  * debian/control: bump policy version and update project homepage
 +  * debian/control: Update dependencies/breakages
 +  * debian/copyright: Remove reference to deprecated bsd license file,
 +    it is included already
 +  * move manpage puppet(8) to package puppet-common
 +  * Debian fix: set correct header in puppet.conf(5)
 +  * Add puppetqd(8) to the puppetmaster package
 +
 + -- Stig Sandbeck Mathisen <ssm at debian.org>  Tue, 20 Jul 2010 09:37:22 +0200
 +
 +puppet (0.25.5-1) unstable; urgency=low
 +
 +  [ Stig Sandbeck Mathisen ]
 +  * New upstream version: 0.25.5
 +  * Adjust conflicts for puppet-common, to ensure upgrade goes well
 +
 +  [ Mathias Gug ]
 +  * Add /etc/puppet/templates and /etc/puppet/modules to the puppet-
 +    common package (Closes: #571129)
 +  * Add binary package "puppet-testsuite" (Closes: #584480)
 +
 + -- Stig Sandbeck Mathisen <ssm at debian.org>  Fri, 25 Jun 2010 17:27:05 +0200
 +
 +puppet (0.25.4-6) unstable; urgency=low
 +
 +  * clarify passenger options in default/puppetmaster 
 +  * add patch to ext/rack/files/apache2.conf for debian-specific settings
 +  * debian/control: add version depends on librack-ruby
 +  * additional start-stop-daemon fix for puppet.init and puppetqd.init
 +  * debian/rules: actually install config.ru owned by the puppet user,
 +    this is necessary for proper suid of passenger (closes: #577366)
 +
 + -- Micah Anderson <micah at debian.org>  Tue, 20 Apr 2010 16:06:38 -0400
 +
 +puppet (0.25.4-5) unstable; urgency=low
 +
 +  * debian/puppetmaster.init: fix invocation of start-stop-daemon (closes:
 +  * #578066)
 +
 + -- Andrew Pollock <apollock at debian.org>  Sat, 17 Apr 2010 20:33:09 -0700
 +
 +puppet (0.25.4-4) unstable; urgency=low
 +
 +  [ Andrew Pollock ]
 +  * debian/watch: update for new upstream location
 +  * apply patch from Mathias Gug to add /etc/puppet to puppet-common's
 +    directories so that it is removed on package purge (if empty). Also removes
 +    /var/log/puppet on purge (closes: #571130)
 +
 +  [ Micah Anderson ]
 +  * add Suggests: libselinux-ruby1.8 as puppet supports it, but only
 +    if the library is present
 +  * cherry-pick: add puppetmasterd dbconnections option to increase 
 +    the rails 'max pool size' (redmine: #2568)
 +  * fix puppetqd initscript status operation 
 +
 +  [ Andrew Pollock ]
 +  * debian/rules: don't install config.ru owned by the puppet user (closes:
 +    #577366)
 +
 + -- Andrew Pollock <apollock at debian.org>  Thu, 15 Apr 2010 21:18:32 -0700
 +
 +puppet (0.25.4-3) unstable; urgency=low
 +
 +  [ Stig Sandbeck Mathisen ]
 +  * Fix "puppetmaster and puppet scripts always return 0" with patch from
 +    Mathias Gug, make sure return codes are actually used (Closes: #573473)
 +
 +  [ Micah Anderson ]
 +  * Disable default puppet.conf option pluginsync=true, see puppet-common.NEWS
 +  * Suggest in puppetmaster package: libapache2-mod-passenger, librack-ruby
 +  * Create puppetmaster.README with information about the server type
 +  * Provide an example apache2.conf for libapache2-mod-passenger
 +  * Ship the rack config.ru, and README as README.rack
 +  * Fix puppet-el.emacsen-startup script to be properly installed
 +  * debian/puppetmaster.init: Fix init stop action to not fail if the
 +    puppetmaster is already stopped, Thanks Mathias Gug (Closes: #574677)
 +  * Add Suggests: stompserver/libstomp-ruby1.8 - needed for puppetqd 
 +  * Add README.queueing to puppetmaster package which describes puppetqd
 +  * Add /etc/init.d/puppetqd and defaults in /etc/defaults/puppetmaster
 +  * Switch to dpkg-source 3.0 (quilt) format
 + 
 + -- Micah Anderson <micah at debian.org>  Tue, 16 Mar 2010 12:27:07 -0400
 +
 +puppet (0.25.4-2) unstable; 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)
 +  * Fix "Improper ownership of /var/lib/puppet/state", explicitly create this
 +    in postinst (and remove in postrm on purge) (Closes: #462551)
 +  * Fix "wrong default location for templates", update default settings, and
 +    create puppet-common.NEWS with information (Closes: #484659)
 +  * Move postinst and postrm handling of shared users and directories to
 +    puppet-common (Closes: #570012)
 +
 + -- Stig Sandbeck Mathisen <ssm at debian.org>  Tue, 16 Feb 2010 06:30:55 +0000
 +
 +puppet (0.25.4-1) unstable; urgency=low
 +
 +  [Nigel Kersten ]
 +  * New upstream version 0.25.4
 + 
 +  [ Micah Anderson ]
 +  * Fix debian/rules typo in install of puppet-mode-init.el
 +  * Fix which package puppet-mode-init.el gets installed into
 +  * Add Suggests for vim-puppet and puppet-el on binary packages
 +
 +  [ Stig Sandbeck Mathisen ]
 +  * Update debian/copyright
 +  * debian/{puppet,puppetmaster}.init: Add status argument, fix pid file
 +    locations (Closes: #545975)
 +  * Refactoring: Add binary packages for puppet-common, puppet-el, vim-puppet
 +
 + -- Stig Sandbeck Mathisen <ssm at debian.org>  Mon, 01 Feb 2010 12:31:58 +0100
 +
 +puppet (0.25.1-3) unstable; urgency=low
 +
 +  [ Nigel Kersten ]
 +  * Require modification of /etc/default/puppet to start puppet client daemon.
 +    (closes: #518831)
 +  * cherry pick upstream fix for puppetrun with tags (closes: #559092)
 +  * cherry pick upstream fix for supplementary groups not being reset.
 +    (CVE-2009-3564) (closes: #551073)
 +
 +  [ Andrew Pollock ]
 +  * debian/{puppet,puppetmaster}.pid: Correct the path to the pidfiles
 +    (closes: #561231)
 +  * debian/control: version the build dependency on facter (closes: #551055)
 +
 + -- Andrew Pollock <apollock at debian.org>  Wed, 16 Dec 2009 11:36:39 -0800
 +
 +puppet (0.25.1-2) unstable; urgency=low
 +
 +  * Add puppetqd executable to puppetmaster package (closes: #554624)
 +
 + -- Nigel Kersten <nigel at explanatorygap.net>  Thu, 05 Nov 2009 11:23:10 -0800
 +
 +puppet (0.25.1-1) unstable; urgency=low
 +
 +  * New upstream release of 0.25.1
 +
 + -- Nigel Kersten <nigel at explanatorygap.net>  Tue, 27 Oct 2009 10:35:40 -0700
 +
 +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)
 +
 +  [ 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
 +
 +  [ Micah Anderson ]
 +  * Cherry-pick upstream versioncmp fix (redmine:#2110)
 +
 +  [ Andrew Pollock ]
 +  * Enable waiting for certificates for the default value (upstream default
 +    that was previously disabled or enabled with a 5 second value)
 +  * Re-ship the vim syntax file in the correct location (it fell out after the
 +    0.24.5-3 upload) (closes: #530752)
 +  * Re-add the 0.24.5-3 changelog entry
 +  * debian/puppet.postrm: don't delete the user or group (closes: #528068,
 +    #527381)
 +  * debian/puppet.{preinst,postinst}: Applied modified patch from Stig
 +    Sandbeck Mathisen to call conditionally call adduser in the postinst, if
 +    it's available
 +
 +  [ Nigel Kersten ]
 +  * Switched to use install.rb, primarily to stop shebangs using /usr/bin/env
 +  * Stopped using dh_movefiles, moved to dh_install
 +  * debian/rules greatly cleaned up due to above two changes
 +
 +  [ Andrew Pollock ]
 +  * debian/control: add rdoc, libopenssl-ruby and facter to build dependencies
 +  * debian/control: depend on ruby1.8 instead of ruby to placate Lintian
 +  * debian/puppet.install: brown paper bag release averted; install 
 +    /usr/lib/ruby/1.8
 +  * debian/rules: ensure permissions on everything under /usr/lib/ruby/1.8 is
 +    correct
 +
 + -- Andrew Pollock <apollock at debian.org>  Tue, 16 Jun 2009 23:37:22 -0700
 +
 +puppet (0.24.8-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * debian/control: Add Nigel Kersten and myself as uploaders
 +  * debian/changelog: wrap long lines
 +  * debian/watch: ignore release candidates
 +  * debian/compat: bump to 5
 +  * debian/control: bump Standards-Version (no changes)
 +
 + -- Andrew Pollock <apollock at debian.org>  Mon, 13 Apr 2009 17:12:47 -0700
 +
 +puppet (0.24.7-2) experimental; urgency=low
 +
 +  * make puppetmaster conflict previous puppet due to man page move
 +
 + -- Micah Anderson <micah at debian.org>  Wed, 28 Jan 2009 10:28:23 -0500
 +
 +puppet (0.24.7-1) experimental; urgency=low
 +
 +  * New upstream release
 +  * Fixed comment in defaults/puppetmaster (Closes: #510881)
 +  * Fixed debian/puppetmaster.manpages and debian/puppet.manpages to
 +    distribute
 +    puppetrun and puppetca correctly, thanks Savvas Radevic (Closes: #511826)
 +  * Added puppetmaster Recommends: libldap-ruby1.8 to silence puppetrun
 +    (Closes: #512639)
 +  * Added puppet Recommends: libaugeas-ruby1.8 for new Augeas support in this
 +    release
 +
 + -- Micah Anderson <micah at debian.org>  Fri, 23 Jan 2009 09:27:09 -0500
 +
 +puppet (0.24.6-1) experimental; urgency=low
 +
 +  * New upstream release (Closes: #506129, #504624, #502163)
 +  * Distribute filebucket binary (Closes: #499999)
 +  * Fix missing check for START variable in defaults files (Closes: #498284)
 +  * Fix maintainer scripts so that they do not ignore errors (set -e)
 +  * Fix maintainer scripts so they don't have prepended paths (thanks lintian)
 +  * Cherry-pick fixes from upstream:
 +    - comparison of String with 0 failed (Closes: #500848)
 +    - filename cannot handle ++ (Closes: #502163)
 +    - tidy must specify size, age or both (Closes: #500852)
 +	
 + -- Micah Anderson <micah at debian.org>  Sat, 29 Nov 2008 13:59:25 -0500
 +
 +puppet (0.24.5-3) unstable; urgency=medium
 +
 +  * Set wait for cert timeout to 5 secs, to avoid resource abuse (Closes:
 +    #509566)
 +  * Distribute filebucket binary (Closes: #499999)
 +  * Place vim syntax in the correct location (LP: #181960)
 +
 + -- Thom May <thom at debian.org>  Wed, 07 Jan 2009 15:15:34 -0500
 +
 +puppet (0.24.5-2) unstable; urgency=low
 +
 +  * Fix puppetlast to work with 0.24.5
 +  * Adjust logcheck to match against new log messages in 0.24.5
 +  * Update standards version to 3.8.0 (no changes)
 +  * Update changelog to reduce length of line to make lintian happy
 +
 + -- Micah Anderson <micah at debian.org>  Sat, 26 Jul 2008 15:43:45 -0400
 +
 +puppet (0.24.5-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Applied patch from Martin Krafft to improve logcheck file installation
 +
 + -- Thom May <thom at debian.org>  Thu, 24 Jul 2008 10:58:08 +0100
 +
 +puppet (0.24.4-8) unstable; urgency=low
 +
 +  * Changed the default port value to 8140 in /etc/default/puppetmaster
 +    to be consistent with the client default port. (Closes: #483823)
 +  * Cherry-picked various bug fixes from upstream:
 +    - further emacs mode updates from Russ Allbery
 +    - misleading error if CA private key can not be decrypted (trac:#1271)
 +    - fix missing bracket in documentation (trac:#1209)
 +    - man pages updates (trac:#1211)
 +    - add dump parameter to mount type (trac:#1212)
 +    - fixed undefined variable in lib/puppet/util/settings.rb (trac:#1218)
 +    - usermod problem on Solaris (trac:#1207)
 +    - added native authorized_keys type
 +    - test within a template if a variable or fact is defined (trac:#1177)
 +    - Fixed Red Hat service disabling (trac:#1219)
 +    - fix crontab provider parse error when line begins w/space (trac:#1216)
 +    - Fix for latest method in rpm provider (trac:#1224)
 +    - puppetd documentation updates (trac:#1227)
 +    - Modified the 'factpath' setting to automatically configure Facter
 +      to load facts there if a new enough version of Facter is used.
 +    - Removing unused file lib/puppet/util/variables.rb (trac:#1229)
 +    - Fixing transaction support for prefetching generated resources.
 +      Previously, we prefetched then generated, which caused generated
 +      resources that needed prefetching not to work.  This just reorders
 +      the calls, so generated resources now get prefetched.
 +    - Respect "replace => false" for symlinks (trac:#1235)
 +    - Added cron random function fixing ticket (trac:#311)
 +    - No more clear_cache failures (trac:#1247)
 +    - Fixed Rakefile to install non-.rb files (trac:#1266)
 +
 + -- Micah Anderson <micah at debian.org>  Sat, 31 May 2008 11:39:47 -0400
 +
 +puppet (0.24.4-7) unstable; urgency=low
 +  
 +  * Update emacs-mode with changes cherry-picked from rra's repository
 +  * Fix typo in puppetmaster.init (Closes: #480019)
 +  * Fix variable name in /etc/default/puppetmaster comments
 +  * Fix incorrect port increment in puppetmaster initscript when mongrel
 +    is used, thanks Francois Deppierraz (Closes: #480263)
 +  * Add puppetmaster.postrm to remove /var/log/puppet on purge
 +  * Added debian/puppetmaster.dirs containing etc/puppet/manifests
 +  * Remove puppet group on purge (Closes: #481511)
 +  * Remove old config files and stray directories (Closes: #454681)
 +  
 + -- Micah Anderson <micah at debian.org>>  Sat, 03 May 2008 16:18:32 -0400
 +  
 +puppet (0.24.4-6) unstable; urgency=low
 +
 +  * Remove bashisms in puppetmaster.init
 +  * Add puppetlast script
 +
 + -- Micah Anderson <micah at debian.org>>  Wed, 30 Apr 2008 07:37:04 -0400
 +
 +puppet (0.24.4-5) unstable; urgency=low
 +
 +  * Fix missing --pidfile piece for mongrel startup and make 
 +    stop consistent, thanks Bart Cortooms (Closes: #476840)
 +  * Add trailing newline missing from default files
 +
 + -- Micah Anderson <micah at debian.org>  Sat, 19 Apr 2008 11:03:35 -0400
 +
 +puppet (0.24.4-4) unstable; urgency=low
 +
 +  * Create /etc/default/puppet and /etc/default/puppetmaster
 +  * Modify /etc/init.d/puppetmaster to support mongrel instances
 +    on multiple ports
 +  * Remove no longer necessary .svn cleaning from debian/rules
 +  * Added $network and $named appropriated places in the LSB
 +    headers in puppet and puppetmaster initscripts, 
 +    thanks Sam Quigley
 +  * Install ralsh (Closes: #476629)
 +  * Cherry-pick upstream patches from 0.24.x branch:
 +    - Install manpages
 +    - Fix shebang issues (#1148)
 +    - Updated fix for (#1020)
 +    - Fix for (#1174)
 +    - Emacs mode updates (#1160)
 +    - Debian service [en|dis]able issue (#1161)
 +    - User type group list validation enhancement
 +    - Fix configtimeout issue (#1176)
 +
 + -- Micah Anderson <micah at debian.org>  Sun, 13 Apr 2008 19:18:46 -0400
 +
 +puppet (0.24.4-3) unstable; urgency=low
 +
 +  * Remove pi binary, puppetdoc provides this functionality now
 +   (Closes: #472850)
 +
 + -- Micah Anderson <micah at debian.org>  Fri, 28 Mar 2008 12:38:30 -0400
 +
 +puppet (0.24.4-2) unstable; urgency=low
 +
 +  * Fix duplicate man8/puppetmasterd.8 install
 +
 + -- Micah Anderson <micah at debian.org>  Tue, 25 Mar 2008 22:58:22 -0400
 +
 +puppet (0.24.4-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Install man pages missing from upstream release
 +
 + -- Micah Anderson <micah at debian.org>  Tue, 25 Mar 2008 18:17:02 -0400
 +
 +puppet (0.24.3-1) unstable; 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
 +  * Updated outdated debian/control substrvar for puppet to ${source:Version}
 +  * Updated link in debian/copyright for new URL to license
 +  * Updated copyright in debian/copyright
 +  * Bumped standards version to 3.7.3.0 (no changes)
 +  * Switch debhelper from Build-Depends-Indep to Build-Depends because it is
 +    required to run clean target (lintian check:
 +    clean-should-be-satisfied-by-build-depends)
 +  * Moved homepage from Description to control field
 +  * Added Vcs-Browser and Vcs-Git fields to debian/control
 +  [ Thom May ]
 +  * If puppet can't start, continue with package install
 +
 + -- Micah Anderson <micah at debian.org>  Sun, 09 Mar 2008 14:03:00 -0400
 +
 +puppet (0.24.1-2) unstable; urgency=low
 +
 +  * Set rundir correctly (Closes: #460203, #459579)
 +  * Apply patch for puppet#1003 to enable collection of tagged resources
 +
 + -- Thom May <thom at debian.org>  Wed, 16 Jan 2008 11:08:55 +0100
 +
 +puppet (0.24.1-1) unstable; urgency=low
 +
 +  * New upstream release (Closes: #445626)
 +  * Set maintainer to pkg-puppet-devel
 +
 + -- Thom May <thom at debian.org>  Sun, 30 Dec 2007 19:13:47 +0100
 +
 +puppet (0.24.0-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Thom May <thom at debian.org>  Wed, 19 Dec 2007 16:00:34 +0100
 +
 +puppet (0.23.2-15) unstable; urgency=low
 +
 +  * No change upload setting maintainer to me whilst waiting for an alioth
 +    project.
 +
 + -- Thom May <thom at debian.org>  Thu, 29 Nov 2007 10:44:50 +0100
 +
 +puppet (0.23.2-14) unstable; urgency=low
 +
 +  * Orphaning.
 +  * Create /var/lib/puppet in the puppet package.  Closes: #452506.
 +  * Start the puppet init script after puppetmaster, to silence whiny bug
 +    reports.  Closes: #452064.
 +  * Add a reload command to the Puppet init script.  Closes: #452060.
 +
 + -- Matthew Palmer <mpalmer at debian.org>  Thu, 29 Nov 2007 10:48:21 +1100
 +
 +puppet (0.23.2-13) unstable; urgency=low
 +
 +  * Drop quotes from an already-quoted value in a query.  Closes: #448179.
 +  * Remove excessive quoting from puppet/network/handler/master.rb.
 +    Closes: #448221.
 +  * Force removal of directories during pluginsync.  Closes: #448180.
 +
 + -- Matthew Palmer <mpalmer at debian.org>  Tue, 30 Oct 2007 14:55:19 +1100
 +
 +puppet (0.23.2-12) unstable; urgency=low
 +
 +  * Create /var/run/puppet and set the perms in the various initscripts, as
 +    well as hardcoding the rundir better in configuration.rb and removing
 +    the explicit rundir setting from puppet.conf.  Closes: #447314.
 +  * Apply additional patch given (backwards) to fix export/collect on some
 +    database backends.  Closes: #445591 (again!)
 +
 + -- Matthew Palmer <mpalmer at debian.org>  Sat, 20 Oct 2007 11:28:50 +1000
 +
 +puppet (0.23.2-11) unstable; urgency=low
 +
 +  * Apply patch from puppet#786 to fix a problem with exported resources not
 +    being properly detected as needing a rerun.  Closes: #445591.
 +  * Fix ignore handling for the plugins mount.  Closes: #446390.
 +
 + -- Matthew Palmer <mpalmer at debian.org>  Mon, 15 Oct 2007 09:11:25 +1000
 +
 +puppet (0.23.2-10) unstable; urgency=low
 +
 +  * Recycle connections when we change (or get) certs.
 +  * Catch and retry more transient errors in the XMLRPC wrapper.
 +
 + -- Matthew Palmer <mpalmer at debian.org>  Thu, 27 Sep 2007 15:06:11 +1000
 +
 +puppet (0.23.2-9) unstable; urgency=low
 +
 +  * Recycle the HTTP connection if we get an EPIPE during a request. 
 +    Closes: #444177.  Thanks to Jos Backus for helping with testing.
 +
 + -- Matthew Palmer <mpalmer at debian.org>  Thu, 27 Sep 2007 09:55:34 +1000
 +
 +puppet (0.23.2-8) unstable; urgency=low
 +
 +  * Remove extraneous debugging output accidentally left behind in the last
 +    release.
 +  * Fix spelling mistakes in debian/control and debian/puppet.preinst. 
 +    Closes: #444158.
 +
 + -- Matthew Palmer <mpalmer at debian.org>  Thu, 27 Sep 2007 07:45:07 +1000
 +
 +puppet (0.23.2-7) unstable; urgency=low
 +
 +  * Ignore ENOENT errors in the module plugin syncing code, since they're
 +    innocuous and expected.
 +  * Allow facts that are downloaded through pluginsync to be used like any
 +    other fact.
 +  * Allow users to still have an old-style plugins mount if they want, by
 +    specifying a path for the mount.  Also track down a fault in old-style
 +    fileserving which did strange slash-stripping.  Closes: #443932.
 +
 + -- Matthew Palmer <mpalmer at debian.org>  Tue, 25 Sep 2007 16:41:32 +1000
 +
 +puppet (0.23.2-6) unstable; urgency=low
 +
 +  * Patch rails/param_name.rb to stop query failures, as per puppet#784.
 +  * Actually honour namevar.
 +  * Only set dbuser if explicitly asked for.
 +  * Fix annoying database deletion error for ParamValue objects.
 +  * Add an accessor for ca_file, since older openssl-ruby only had a writer.
 +  * Fix the fileserver to honour ignore.  Thanks to Nathan Ward for the
 +    bug report on IRC.
 +
 + -- Matthew Palmer <mpalmer at debian.org>  Thu, 20 Sep 2007 16:10:41 +1000
 +
 +puppet (0.23.2-5) unstable; urgency=low
 +
 +  * Add some NEWS for the ssldir transition.  Should have done that earlier.
 +  * Remove the explicit mode change for vardir, and fix up the mode on
 +    statedir, as well.  Closes: #425496.
 +  * Only set some database parameters if they're explicitly set; this makes
 +    life easier for PgSQL ident auth.
 +  * Allow empty config options.
 +
 + -- Matthew Palmer <mpalmer at debian.org>  Thu, 13 Sep 2007 11:09:59 +1000
 +
 +puppet (0.23.2-4) unstable; urgency=low
 +
 +  * Fix puppet#776 in a slightly better way by only flushing the cache when
 +    a value is changed, rather than whenever a value is read.
 +  * Apply patch from puppet#755 to cache connections to the Puppetmaster,
 +    which improves performance by more than a little.
 +  * Modify the fileserver so that it provides a 'plugins' mount which
 +    exports the union of the plugins directory of all modules.
 +
 + -- Matthew Palmer <mpalmer at debian.org>  Fri, 31 Aug 2007 15:32:04 +1000
 +
 +puppet (0.23.2-3) unstable; urgency=low
 +
 +  * Clear the config value cache every time.  This is a titchy little
 +    performance hit, but it works around puppet#776 rather nicely.
 +
 + -- Matthew Palmer <mpalmer at debian.org>  Fri, 24 Aug 2007 16:08:04 +1000
 +
 +puppet (0.23.2-2) unstable; urgency=low
 +
 +  * Move the SSL state directory to a more policy-friendly location,
 +    /var/lib/puppet/ssl.
 +
 + -- Matthew Palmer <mpalmer at debian.org>  Tue, 21 Aug 2007 12:54:40 +1000
 +
 +puppet (0.23.2-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Matthew Palmer <mpalmer at debian.org>  Tue,  7 Aug 2007 12:47:49 +1000
 +
 +puppet (0.23.1-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * Switch primary maintainer to me.  Thanks jaq.
 +  * Make the recommendation for rails >= 1.2.3-2, to avoid
 +    incompatibilities.  This breaks compatibility with stable, but the rails
 +    package from unstable should install cleanly in stable.  Closes: #433999
 +
 + -- Matthew Palmer <mpalmer at debian.org>  Sat, 21 Jul 2007 16:34:36 +1000
 +
 +puppet (0.23.0-1) unstable; urgency=low
 +
 +  * New upstream release.
 +    - Includes a new configuration file handling system; see NEWS.Debian.
 +
 + -- Matthew Palmer <mpalmer at debian.org>  Mon, 25 Jun 2007 09:55:12 +1000
 +
 +puppet (0.22.4-2) unstable; urgency=low
 +
 +  * Depend on libshadow-ruby1.8, for new password modification functionality
 +    added to upstream 0.22.4.
 +  * Several improvements from Micah Anderson:
 +    - Better vim syntax installation process.
 +    - Install Emacs syntax highlighting.
 +    - Install logcheck rules.  Closes: #421851.
 +
 + -- Matthew Palmer <mpalmer at debian.org>  Thu,  3 May 2007 15:04:15 +1000
 +
 +puppet (0.22.4-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Matthew Palmer <mpalmer at debian.org>  Wed,  2 May 2007 12:20:15 +1000
 +
 +puppet (0.22.3-1) unstable; urgency=low
 +
 +  * New upstream release.  Closes: #415773.
 +  * Switch to using our own logrotate config, and enhance it as per
 +    David Schmitt's suggestions.  Closes: #414282.
 +  * Add puppetrun to the puppetmaster package, and actually put puppetdoc
 +    into the puppet package.  Closes: #419273.
 +  * Copy vim syntax highlighting file into the puppet package, and add a
 +    stanza to have Vim automatically highlight .pp files.  Closes: #412868.
 +    Thanks to David Schmitt for researching how to do all of that.
 +  * Add a templatedir setting to the default puppetmasterd.conf to make it
 +    obvious that it can be changed.  Closes: #407506.
 +
 + -- Matthew Palmer <mpalmer at debian.org>  Wed, 18 Apr 2007 14:03:33 +1000
 +
 +puppet (0.22.1-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Matthew Palmer <mpalmer at debian.org>  Fri,  2 Feb 2007 09:06:46 +1100
 +
 +puppet (0.22.0-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * Use --startas instead of --init in init scripts, which (according to
 +    Paul Hampson) makes checking for already-running instances work.
 +    Closes: #405912.
 +
 + -- Matthew Palmer <mpalmer at debian.org>  Mon,  8 Jan 2007 08:41:35 +1100
 +
 +puppet (0.20.1-1) unstable; urgency=low
 +
 +  * New upstream release.  (Closes: #387674)
 +  * Rationalise the puppetmasterd init script.
 +  * Add inclusion of /etc/default files for init scripts.  (Closes: #388178)
 +  * Add puppet.conf to match puppetd.conf.  (Closes: #385646)
 +
 + -- Matthew Palmer <mpalmer at debian.org>  Thu, 30 Nov 2006 10:54:19 +1100
 +
 +puppet (0.18.4-1) unstable; urgency=low
 +
 +  * New upstream release.
 +    - Properly detect all services, including those in rcS.d.
 +      (Closes: #378351)
 +  * Add Homepage: to the long description.  (Closes: #377896)
 +  
 + -- Matthew Palmer <mpalmer at debian.org>  Mon, 24 Jul 2006 19:46:06 +1000
 +
 +puppet (0.18.3-1) unstable; urgency=low
 +
 +  * New upstream version.
 +    - Set DEBIAN_FRONTEND=noninteractive when installing Debian packages.
 +      (Closes: #378338)
 +
 + -- Matthew Palmer <mpalmer at debian.org>  Sun, 16 Jul 2006 10:58:50 +1000
 +
 +puppet (0.18.1-1) unstable; urgency=low
 +
 +  * Make Puppet not wait for a cert at all (to prevent startup hangs).
 +  * Cleanup the init scripts to not have NO_START detritus.
 +  * Apply puppet.debian-frontend, to set DEBIAN_FRONTEND=noninteractive on
 +    package installation.
 +
 + -- Matthew Palmer <mpalmer at debian.org>  Tue, 27 Jun 2006 15:05:32 +1000
 +
 +puppet (0.18.0-1) unstable; urgency=low
 +
 +  * Initial release.  (Closes: #348625)
 +
 + -- Matthew Palmer <mpalmer at debian.org>  Wed, 24 May 2006 13:10:01 +1000
diff --combined spec/spec_helper.rb
index 88e5795,2fe0c36..1baec4a
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@@ -6,22 -6,13 +6,13 @@@ dir = File.expand_path(File.dirname(__F
  $LOAD_PATH.unshift("#{dir}/")
  $LOAD_PATH.unshift("#{dir}/lib") # a spec-specific test lib dir
  $LOAD_PATH.unshift("#{dir}/../lib")
- $LOAD_PATH.unshift("#{dir}/../test/lib")  # Add the old test dir, so that we can still find our local mocha and spec
  
- # include any gems in vendor/gems
- Dir["#{dir}/../vendor/gems/**"].each do |path|
-   libpath = File.join(path, "lib")
-   if File.directory?(libpath)
-     $LOAD_PATH.unshift(libpath)
-   else
-     $LOAD_PATH.unshift(path)
-   end
- end
+ # Don't want puppet getting the command line arguments for rake or autotest
+ ARGV.clear
  
- require 'puppettest'
- require 'puppettest/runnable_test'
+ require 'puppet'
  require 'mocha'
 -gem 'rspec', '>=1.2.9'
 +#gem 'rspec', '>=1.2.9'
  require 'spec/autorun'
  
  # So everyone else doesn't have to include this base constant.
@@@ -29,17 -20,13 +20,13 @@@ module PuppetSpe
    FIXTURE_DIR = File.join(dir = File.expand_path(File.dirname(__FILE__)), "fixtures") unless defined?(FIXTURE_DIR)
  end
  
- # load any monkey-patches
- Dir["#{dir}/monkey_patches/*.rb"].map { |file| require file }
+ require 'monkey_patches/alias_should_to_must'
+ require 'monkey_patches/add_confine_and_runnable_to_rspec_dsl'
+ require 'monkey_patches/publicize_methods'
  
  Spec::Runner.configure do |config|
    config.mock_with :mocha
  
- #  config.prepend_before :all do
- #      setup_mocks_for_rspec
- #      setup if respond_to? :setup
- #  end
- #
    config.prepend_after :each do
      Puppet.settings.clear
      Puppet::Node::Environment.clear
@@@ -88,10 -75,4 +75,4 @@@
    end
  end
  
- # We need this because the RAL uses 'should' as a method.  This
- # allows us the same behaviour but with a different method name.
- class Object
-   alias :must :should
- end
- 
  end

-- 
Puppet packaging for Debian



More information about the Pkg-puppet-devel mailing list