[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, experimental, updated. debian/2.6.8-1-844-g7ec39d5

[Stig Sandbeck Mathisen]

The following commit has been merged in the experimental branch:
commit 2ee1b4ce9a9c0e0da88ae9f6dc9326e942c2bdbe
Merge: 7d55bac9926f22b521851e770fa06e5b05309568 b983386ece1b9816e6d3d59a316ad589e35773df
Author: Stig Sandbeck Mathisen <ssm at debian.org>
Date:   Tue May 10 09:08:10 2011 +0200

    Merge branch 'experimental_upstream' into experimental
    
    Conflicts:
    	CHANGELOG
    	acceptance/tests/ticket_5477_master_not_dectect_sitepp.rb

diff --combined Rakefile
index 8ed074e,e59d20a..87bf196
--- a/Rakefile
+++ b/Rakefile
@@@ -9,7 -9,7 +9,7 @@@ 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 }
@@@ -49,5 -49,5 +49,5 @@@ en
  
  desc "Run the unit tests"
  task :unit do
-     sh "cd test; rake"
+   Dir.chdir("test") { sh "rake" }
  end

-- 
Puppet packaging for Debian