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

[Stig Sandbeck Mathisen]

The following commit has been merged in the master branch:
commit 9cd16659fe52ac3f9ebff4f9c7752585e9654efb
Author: Stig Sandbeck Mathisen <ssm at debian.org>
Date:   Mon Feb 7 07:27:14 2011 +0100

    Move puppetstoredconfigclean to puppetmaster-common, and set ruby1.8 as parser to match the rest of the puppet suite

diff --git a/debian/rules b/debian/rules
index 9379abb..817e2c3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -85,7 +85,10 @@ install: build
 
 	# strip off the .rb from the puppetstoredconfigclean.rb
 	$(INSTALL) -m 0755 ext/puppetstoredconfigclean.rb \
-		$(CURDIR)/debian/puppetmaster/usr/sbin/puppetstoredconfigclean
+		$(CURDIR)/debian/puppetmaster-common/usr/sbin/puppetstoredconfigclean
+	# Explicitly set ruby1.8 as parser, as with the rest of puppet
+	sed -i -e 1s/ruby/ruby1.8/ \
+		$(CURDIR)/debian/puppetmaster-common/usr/sbin/puppetstoredconfigclean
 
 	dh_installexamples -p puppet-common examples/*
 

-- 
Puppet packaging for Debian