From: František Dvořák Date: Thu, 13 Mar 2014 15:23:23 +0000 (+0100) Subject: rOCCI-api 4.2.1, patch out rubygems. X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=1f9c2aca581197c706d6d8427d9815a9424a24f8;p=rOCCI-packaging.git rOCCI-api 4.2.1, patch out rubygems. --- diff --git a/rocci-api/debian/control b/rocci-api/debian/control index fa4de3e..8befe1a 100644 --- a/rocci-api/debian/control +++ b/rocci-api/debian/control @@ -14,7 +14,7 @@ Architecture: all XB-Ruby-Versions: ${ruby:Versions} Depends: ${misc:Depends}, ruby | ruby-interpreter, - ruby-occi-core (>= 4.2.10), ruby-occi-core (<< 4.3), + ruby-occi-core (>= 4.2.11), ruby-occi-core (<< 4.3), ruby-httparty, ruby-json Description: Ruby OCCI API OCCI (the Open Cloud Computing Interface) is a standard by the Open Grid Forum, diff --git a/rocci-api/debian/patches/rubygems.patch b/rocci-api/debian/patches/rubygems.patch new file mode 100644 index 0000000..5c81b32 --- /dev/null +++ b/rocci-api/debian/patches/rubygems.patch @@ -0,0 +1,17 @@ +commit de52684dbc45815484f1c2e56460c23cf5d052d4 +Author: FrantiÅ¡ek Dvořák +Date: Thu Mar 13 16:17:08 2014 +0100 + + Patch out rubyjems as required by guidelines. + +diff --git a/lib/occi-api.rb b/lib/occi-api.rb +index 48ee787..9497d67 100644 +--- a/lib/occi-api.rb ++++ b/lib/occi-api.rb +@@ -1,6 +1,3 @@ +-require 'rubygems' +-require 'rubygems/package' +- + require 'occi-core' + + module Occi::Api; end diff --git a/rocci-api/debian/patches/series b/rocci-api/debian/patches/series new file mode 100644 index 0000000..7c57a99 --- /dev/null +++ b/rocci-api/debian/patches/series @@ -0,0 +1 @@ +rubygems.patch diff --git a/rocci-api/debian/require-rubygems.overrides b/rocci-api/debian/require-rubygems.overrides deleted file mode 100644 index 4a36497..0000000 --- a/rocci-api/debian/require-rubygems.overrides +++ /dev/null @@ -1 +0,0 @@ -debian/ruby-occi-api/usr/lib/ruby/vendor_ruby/occi-api.rb