[DRE-commits] [SCM] ruby-hiera-puppet.git branch, master, updated. upstream/0.3.0-10-gb4ac339

[Patrick Ringl]

The following commit has been merged in the master branch:
commit b4ac3399a548da72d9061d686ad72e96f02d39a7
Author: Patrick Ringl <patrick_ at freenet.de>
Date:   Wed Jun 20 02:21:04 2012 +0200

    reflected the changes needed for 1.0.0rc1

diff --git a/debian/changelog b/debian/changelog
index 2e8245a..36c8d15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ruby-hiera-puppet (0.3.0-1) unstable; urgency=low
+ruby-hiera-puppet (1.0.0~rc1-1) unstable; urgency=low
 
   * Initial release (Closes: #677877)
 
diff --git a/debian/control b/debian/control
index f5f6f26..c2aa0ee 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, puppet-common (>= 2.6.2)
 Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-hiera-puppet.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-hiera-puppet.git;a=summary
 Homepage: https://github.com/puppetlabs/hiera-puppet
-XS-Ruby-Versions: ruby1.8
+XS-Ruby-Versions: all
 
 Package: ruby-hiera-puppet
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8, ruby-hiera (>= 0.3.0)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-hiera (>= 1.0.0~)
 Recommends: puppet-common (>= 2.6.2)
 Description: data backend for ruby-hiera and puppet query function interface
  ruby-hiera-puppet is a data backend for ruby-hiera that can query the
diff --git a/debian/patches/dont-require-rubygems b/debian/patches/dont-require-rubygems
new file mode 100644
index 0000000..78177e1
--- /dev/null
+++ b/debian/patches/dont-require-rubygems
@@ -0,0 +1,25 @@
+Description: don't require rubygems, as the package is debianized.
+ Removing all calls to the rubygems framework is enforced by the 'pkg-ruby-extra'-team policy.
+Forwarded: not-needed
+Origin: vendor
+Author: Patrick Ringl <patrick_ at freenet.de>
+
+--- ruby-hiera-puppet-1.0.0~rc1.orig/bin/extlookup2hiera
++++ ruby-hiera-puppet-1.0.0~rc1/bin/extlookup2hiera
+@@ -50,7 +50,6 @@ when :yaml
+     File.open(options[:out], "w") {|f| f.write hieradata.to_yaml}
+ 
+ when :json
+-    require 'rubygems'
+     require 'json'
+     File.open(options[:out], "w") {|f| f.write JSON.pretty_generate hieradata}
+ end
+--- ruby-hiera-puppet-1.0.0~rc1.orig/spec/spec_helper.rb
++++ ruby-hiera-puppet-1.0.0~rc1/spec/spec_helper.rb
+@@ -1,6 +1,5 @@
+ $:.insert(0, File.join([File.dirname(__FILE__), "..", "..", "lib"]))
+ 
+-require 'rubygems'
+ require 'rspec'
+ require 'hiera/backend/puppet_backend'
+ require 'hiera/scope'
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..281b00c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+dont-require-rubygems
diff --git a/debian/rules b/debian/rules
index a5e7dc8..9d2cbbb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@
 #
 # Uncomment to ignore some test failures (but the tests will run anyway).
 # Valid values:
-#export DH_RUBY_IGNORE_TESTS=ruby1.8 ruby1.9.1 require-rubygems
+export DH_RUBY_IGNORE_TESTS=ruby1.9.1
 #
 # If you need to specify the .gemspec (eg there is more than one)
 #export DH_RUBY_GEMSPEC=gem.gemspec

-- 
ruby-hiera-puppet.git