Permalink
Browse files

Merge branch '1.x'

  • Loading branch information...
2 parents 711d289 + 46279a3 commit d6262958e39a8fc28b79fcbf3d2fbf323e2a5531 @haus haus committed Jul 20, 2012
Showing with 20 additions and 2 deletions.
  1. +17 −0 CHANGELOG
  2. +3 −2 tasks/package.rake
View
@@ -1,3 +1,20 @@
+1.0.0rc4
+===
+6887137 (maint) Add Getting Started tutorial
+091fea3 Overhaul Hiera packaging
+7947dd6 Consolidate changelog, update erb templates
+4698cf1 (#15105) Update README YAML examples
+fcd3d2c (maint) Hiera now has a LICENSE file
+ca47463 Remove datadir value in hiera.yaml
+92a148f (maint) Fix failing Hiera::Util specs
+07366d8 Use File::ALT_SEPARATOR to test platform
+1b7f787 Add specs for Hiera::Util
+cdd7364 (#14867) Add windows support
+16c3dd3 (#12122) Merge arrays and hashes across backends
+480d86c (#12122) Correctly fall through backends during loop
+d0fcc57 Add default config to hiera
+3ec4165 match data in puppet ${::fact} style to get rid of puppet deprecation warnings
+
1.0.0rc3
===
a1a885a Adding package task liberally copied from puppet-dashboard.
View
@@ -9,7 +9,7 @@ def get_debversion
end
def get_origversion
- @debversion.split('-')[0..2].join('-')
+ @debversion.split('-')[0]
end
def get_rpmversion
@@ -107,8 +107,9 @@ namespace :package do
cp_p "pkg/#{@name}-#{@version}.tar.gz", "#{temp}"
cd temp do
sh "tar zxf #{@name}-#{@version}.tar.gz"
+ mv "#{@name}-#{@version}", "#{@name}-#{@debversion}"
mv "#{@name}-#{@version}.tar.gz", "#{@name}_#{@origversion}.orig.tar.gz"
- cd "#{@name}-#{@version}" do
+ cd "#{@name}-#{@debversion}" do
mv File.join('ext', 'debian'), '.'
build_cmd = "pdebuild --configfile #{@pbuild_conf} --buildresult #{temp} --pbuilder cowbuilder -- --basepath /var/cache/pbuilder/#{@cow}/"
begin

0 comments on commit d626295

Please sign in to comment.