[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.5-639-g8f94f35

[test branch]

The following commit has been merged in the upstream branch:
commit 6f8a1e9bbb48157621edb05a77a5fae96b047705
Author: James Turnbull <james at lovedthanlost.net>
Date:   Thu Apr 15 13:18:22 2010 +1000

    Updated Rake tasks to no longer load puppet.rb

diff --git a/Rakefile b/Rakefile
index 7b6983a..515184a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,15 +1,17 @@
 # Rakefile for Puppet -*- ruby -*-
 
-$: << File.expand_path('lib')
 $LOAD_PATH << File.join(File.dirname(__FILE__), 'tasks')
 
-require 'puppet.rb'
 require 'rake'
 require 'rake/packagetask'
 require 'rake/gempackagetask'
 require 'spec'
 require 'spec/rake/spectask'
 
+module Puppet
+    PUPPETVERSION = File.read('lib/puppet.rb')[/PUPPETVERSION *= *'(.*)'/,1] or fail "Couldn't find PUPPETVERSION"
+end
+
 Dir['tasks/**/*.rake'].each { |t| load t }
 
 FILES = FileList[
diff --git a/tasks/rake/gem.rake b/tasks/rake/gem.rake
index ba9d8ab..d654886 100644
--- a/tasks/rake/gem.rake
+++ b/tasks/rake/gem.rake
@@ -30,9 +30,9 @@ spec = Gem::Specification.new do |spec|
     spec.add_dependency('facter', '>= 1.5.1')
     spec.summary = 'Puppet, an automated configuration management tool'
     spec.description = 'Puppet, an automated configuration management tool'
-    spec.author = 'Reductive Labs'
-    spec.email = 'puppet at reductivelabs.com'
-    spec.homepage = 'http://reductivelabs.com'
+    spec.author = 'Puppet Labs'
+    spec.email = 'puppet at puppetlabs.com'
+    spec.homepage = 'http://puppetlabs.com'
     spec.rubyforge_project = 'puppet'
     spec.has_rdoc = true
     spec.rdoc_options <<

-- 
Puppet packaging for Debian