[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. 2.6.5rc1-398-g19eaa8c

[Stig Sandbeck Mathisen]

The following commit has been merged in the master branch:
commit f90c56ad7554b51c77859c1d54d7f6d5623e5f84
Merge: 1c13e972f63d7f2982f5abb2f19e61b5cb61597e c64af49e1bbd7e5f611766765e7357b709f1e835
Author: Stig Sandbeck Mathisen <ssm at debian.org>
Date:   Tue Mar 1 10:15:12 2011 +0100

    Merge branch 'upstream'
    
    Conflicts:
    	spec/spec_helper.rb

diff --combined Rakefile
index d55d146,38cfec6..bfb7e53
--- a/Rakefile
+++ b/Rakefile
@@@ -5,11 -5,11 +5,11 @@@ $LOAD_PATH << File.join(File.dirname(__
  require 'rake'
  require 'rake/packagetask'
  require 'rake/gempackagetask'
- require 'spec'
- require 'spec/rake/spectask'
+ require 'rspec'
+ require "rspec/core/rake_task"
  
  module Puppet
 -    PUPPETVERSION = File.read('lib/puppet.rb')[/PUPPETVERSION *= *'(.*)'/,1] or fail "Couldn't find PUPPETVERSION"
 +    PUPPETVERSION = File.read('/usr/lib/ruby/1.8/puppet.rb')[/PUPPETVERSION *= *'(.*)'/,1] or fail "Couldn't find PUPPETVERSION"
  end
  
  Dir['tasks/**/*.rake'].each { |t| load t }
@@@ -42,8 -42,7 +42,7 @@@ en
  desc "Create the tarball and the gem - use when releasing"
  task :puppetpackages => [:create_gem, :package]
  
- Spec::Rake::SpecTask.new do |t|
-     t.spec_opts = ['--format','s', '--loadby','mtime','--color']
+ RSpec::Core::RakeTask.new do |t|
      t.pattern ='spec/{unit,integration}/**/*.rb'
      t.fail_on_error = false
  end

-- 
Puppet packaging for Debian