[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/2.6.0-2-104-g203dd6f

[Mathias Gug]

The following commit has been merged in the master branch:
commit c926d78280b70545a1ca644c6a044cc675839490
Author: Mathias Gug <mathias.gug at canonical.com>
Date:   Wed Aug 18 15:11:46 2010 -0400

    New upstream version:
    
    * New upstream version:
      - fix config.ru file to run puppetmaster as a rack application.
    * Rakefile: use system puppet.rb file to detect version.

diff --git a/Rakefile b/Rakefile
index 8e21ceb..d55d146 100644
--- a/Rakefile
+++ b/Rakefile
@@ -9,7 +9,7 @@ require 'spec'
 require 'spec/rake/spectask'
 
 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 }
diff --git a/debian/changelog b/debian/changelog
index e7d59a1..b234fa8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+puppet (2.6.1~rc2-1) UNRELEASED; urgency=low
+
+  * New upstream version:
+    - fix config.ru file to run puppetmaster as a rack application.
+  * Rakefile: use system puppet.rb file to detect version.
+
+ -- Mathias Gug <mathiaz at ubuntu.com>  Wed, 18 Aug 2010 15:06:06 -0400
+
 puppet (2.6.0-2) unstable; urgency=low
 
   * Bump Standards-Version to 3.9.1

-- 
Puppet packaging for Debian