rOCCI-cli 4.2.1, patch out rubygems.

diff --git a/rocci-cli/debian/control b/rocci-cli/debian/control
index 0bac714..8a94e14 100644 (file)
--- a/rocci-cli/debian/control
+++ b/rocci-cli/debian/control
@@ -12,7 +12,7 @@ Package: rocci-cli
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${misc:Depends}, ruby | ruby-interpreter, ruby-json,
- ruby-occi-api (>= 4.2.0), ruby-occi-api (<< 4.3), ruby-highline
+ ruby-occi-api (>= 4.2.1), ruby-occi-api (<< 4.3), ruby-highline
 Description: rOCCI client
  OCCI (the Open Cloud Computing Interface) is a standard by the Open Grid Forum,
  specifying a protocol and API to perform various remote management tasks in

diff --git a/rocci-cli/debian/patches/rubygems.patch b/rocci-cli/debian/patches/rubygems.patch
new file mode 100644 (file)
index 0000000..6f27a96
--- /dev/null
+++ b/rocci-cli/debian/patches/rubygems.patch
@@ -0,0 +1,15 @@
+commit 56e17ab473aeea917717a2aae0c76a04b416dbbb
+Author: František Dvořák <valtri@civ.zcu.cz>
+Date:   Thu Mar 13 16:30:31 2014 +0100
+
+    Patch out rubygems as required by guidelines.
+
+diff --git a/lib/occi-cli.rb b/lib/occi-cli.rb
+index 9a450a9..a9a1072 100644
+--- a/lib/occi-cli.rb
++++ b/lib/occi-cli.rb
+@@ -1,4 +1,3 @@
+-require 'rubygems'
+ require 'occi-api'
+ 
+ module Occi::Cli; end

diff --git a/rocci-cli/debian/patches/series b/rocci-cli/debian/patches/series
new file mode 100644 (file)
index 0000000..7c57a99
--- /dev/null
+++ b/rocci-cli/debian/patches/series
@@ -0,0 +1 @@
+rubygems.patch

diff --git a/rocci-cli/debian/require-rubygems.overrides b/rocci-cli/debian/require-rubygems.overrides
deleted file mode 100644 (file)
index 20cd91d..0000000
--- a/rocci-cli/debian/require-rubygems.overrides
+++ /dev/null
@@ -1 +0,0 @@
-debian/rocci-cli/usr/lib/ruby/vendor_ruby/occi-cli.rb