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

[Mathias Gug]

The following commit has been merged in the master branch:
commit ff060206de11e4002137759c8fc46fea1bfdca13
Merge: 490df0696f87652e439e0e64320e0b159b55b654 801da58566e9e4adf3a80e4401737057e115457c
Author: Mathias Gug <mathias.gug at canonical.com>
Date:   Fri Nov 12 09:11:21 2010 -0500

    Merge branch 'upstream'

diff --combined spec/spec_helper.rb
index 270ba01,ed4e2c2..74d8729
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@@ -12,7 -12,7 +12,7 @@@ ARGV.clea
  
  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.
@@@ -20,7 -20,7 +20,7 @@@ module PuppetSpe
    FIXTURE_DIR = File.join(dir = File.expand_path(File.dirname(__FILE__)), "fixtures") unless defined?(FIXTURE_DIR)
  end
  
- require 'spec/lib/puppet_spec/files'
+ require 'lib/puppet_spec/files'
  require 'monkey_patches/alias_should_to_must'
  require 'monkey_patches/add_confine_and_runnable_to_rspec_dsl'
  require 'monkey_patches/publicize_methods'

-- 
Puppet packaging for Debian