~soren/ubuntu/lucid/puppet/etckeeper-integration

Viewing all changes in revision 27.

  • Committer: Bazaar Package Importer
  • Author(s): Soren Hansen
  • Date: 2010-02-12 17:31:26 UTC
  • mfrom: (1.1.11 upstream) (3.1.8 sid)
  • Revision ID: james.westby@ubuntu.com-20100212173126-ylkzk60zubc7ldtk
Tags: 0.25.4-1ubuntu1
* Merge from debian testing.  Remaining changes:
  - debian/rules:
    + Don't start puppet when first installing puppet.
  - debian/puppet.conf, lib/puppet/defaults.rb:
    + Move templates to /etc/puppet.
  - lib/puppet/defaults.rb:
    + Fix /var/lib/puppet/state ownership.
    + Change owner/group to "service".  (LP #509625) 
  - debian/control:
    + Move puppetmaster's Recommends to Suggests.
    + Created puppet-testsuite as a seperate package.
      Allow the users to run puppet's testsuite.
  - tests/Rakefile: Fix rakefile so that the testsuite can actually be
    run.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: