[DRE-commits] [SCM] ruby-hiera.git branch, master, updated. upstream/1.0.0_rc3-8-g332a0a6

[Patrick Ringl]

The following commit has been merged in the master branch:
commit 332a0a6fdd9ff3bca4b42d9e32be992052d07726
Author: Patrick Ringl <patrick_ at freenet.de>
Date:   Wed Jun 20 01:03:26 2012 +0200

    Adapted debian/ struct to reflect the 1.0.0rc3 upstream changes (i.e. now ruby1.9 compatible ^_^)

diff --git a/debian/changelog b/debian/changelog
index a346799..16c4ec1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ruby-hiera (0.3.0-1) unstable; urgency=low
+ruby-hiera (1.0.0~rc3-1) unstable; urgency=low
 
   * Initial release (Closes: #677875)
 
diff --git a/debian/control b/debian/control
index 77a2c9c..662b5bc 100644
--- a/debian/control
+++ b/debian/control
@@ -4,17 +4,17 @@ Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Patrick Ringl <patrick_ at freenet.de>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.17~), rake, ruby-rspec, ruby-mocha
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.13~), rake, ruby-rspec, ruby-mocha
 Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-hiera.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-hiera.git;a=summary
 Homepage: https://github.com/puppetlabs/hiera/
-XS-Ruby-Versions: ruby1.8
+XS-Ruby-Versions: all
 
 Package: ruby-hiera
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
 Recommends: puppet-common (>= 2.6.2), mcollective-common (>= 2.0.0)
 Description: Light weight hierarcical data store
  ruby-hiera is a simple pluggable hierarchical database. It can be
diff --git a/debian/patches/dont-require-rubygems b/debian/patches/dont-require-rubygems
index 42b0484..dc5ff5b 100644
--- a/debian/patches/dont-require-rubygems
+++ b/debian/patches/dont-require-rubygems
@@ -4,25 +4,31 @@ Forwarded: not-needed
 Origin: vendor
 Author: Patrick Ringl <patrick_ at freenet.de>
 
---- ruby-hiera-0.3.0.orig/bin/hiera
-+++ ruby-hiera-0.3.0/bin/hiera
-@@ -11,7 +11,6 @@
+--- ruby-hiera-1.0.0rc3.orig/bin/hiera
++++ ruby-hiera-1.0.0rc3/bin/hiera
+@@ -11,10 +11,6 @@
  #
  # $ hiera release 'rel/%{location}' location=dc2 --yaml some.node.yaml
  
--require 'rubygems'
+-begin
+-  require 'rubygems'
+-rescue LoadError
+-end
  require 'hiera'
  require 'optparse'
  
---- ruby-hiera-0.3.0.orig/lib/hiera.rb
-+++ ruby-hiera-0.3.0/lib/hiera.rb
-@@ -1,4 +1,3 @@
--require 'rubygems'
+--- ruby-hiera-1.0.0rc3.orig/lib/hiera.rb
++++ ruby-hiera-1.0.0rc3/lib/hiera.rb
+@@ -1,7 +1,3 @@
+-begin
+-  require 'rubygems'
+-rescue LoadError
+-end
  require 'yaml'
  
  class Hiera
---- ruby-hiera-0.3.0.orig/spec/spec_helper.rb
-+++ ruby-hiera-0.3.0/spec/spec_helper.rb
+--- ruby-hiera-1.0.0rc3.orig/spec/spec_helper.rb
++++ ruby-hiera-1.0.0rc3/spec/spec_helper.rb
 @@ -1,6 +1,5 @@
  $:.insert(0, File.join([File.dirname(__FILE__), "..", "lib"]))
  
diff --git a/debian/ruby-hiera.docs b/debian/ruby-hiera.docs
new file mode 100644
index 0000000..b43bf86
--- /dev/null
+++ b/debian/ruby-hiera.docs
@@ -0,0 +1 @@
+README.md

-- 
ruby-hiera.git