[DRE-commits] [berkshelf-api] 12/15: refresh patches
Hleb Valoshka
tsfgnu-guest at moszumanska.debian.org
Thu Mar 24 11:24:17 UTC 2016
This is an automated email from the git hooks/post-receive script.
tsfgnu-guest pushed a commit to branch master
in repository berkshelf-api.
commit b328968462d845216f165b5d704bc5aa356d576c
Author: Hleb Valoshka <375gnu at gmail.com>
Date: Thu Mar 24 14:19:09 2016 +0300
refresh patches
---
.../patches/0001-Don-t-require-archive-gem.patch | 44 --------------------
...e-rubygems-bundler-spork-don-t-change-in.patch} | 0
debian/patches/0002-Allow-ruby-hashie-3.patch | 32 ---------------
...h => 0002-Workaround-rspec-core-bug-2064.patch} | 0
....patch => 0003-RSA-private-key-for-tests.patch} | 0
.../patches/0004-Don-t-require-archive-gem.patch | 47 ++++++++++++++++++++++
debian/patches/series | 9 ++---
7 files changed, 51 insertions(+), 81 deletions(-)
diff --git a/debian/patches/0001-Don-t-require-archive-gem.patch b/debian/patches/0001-Don-t-require-archive-gem.patch
deleted file mode 100644
index 27c34a4..0000000
--- a/debian/patches/0001-Don-t-require-archive-gem.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Hleb Valoshka <375gnu at gmail.com>
-Date: Mon, 17 Aug 2015 17:19:57 +0300
-Subject: Don't require archive gem
-
----
- lib/berkshelf/api/site_connector/supermarket.rb | 1 -
- metadata.yml | 14 --------------
- 2 files changed, 15 deletions(-)
-
-diff --git a/lib/berkshelf/api/site_connector/supermarket.rb b/lib/berkshelf/api/site_connector/supermarket.rb
-index b702023..da2b1a8 100644
---- a/lib/berkshelf/api/site_connector/supermarket.rb
-+++ b/lib/berkshelf/api/site_connector/supermarket.rb
-@@ -1,5 +1,4 @@
- require 'open-uri'
--require 'archive'
- require 'tempfile'
-
- module OpenURI
-diff --git a/metadata.yml b/metadata.yml
-index 8889534..1aade76 100644
---- a/metadata.yml
-+++ b/metadata.yml
-@@ -116,20 +116,6 @@ dependencies:
- - !ruby/object:Gem::Version
- version: 3.0.0
- - !ruby/object:Gem::Dependency
-- name: archive
-- requirement: !ruby/object:Gem::Requirement
-- requirements:
-- - - '='
-- - !ruby/object:Gem::Version
-- version: 0.0.6
-- type: :runtime
-- prerelease: false
-- version_requirements: !ruby/object:Gem::Requirement
-- requirements:
-- - - '='
-- - !ruby/object:Gem::Version
-- version: 0.0.6
--- !ruby/object:Gem::Dependency
- name: buff-config
- requirement: !ruby/object:Gem::Requirement
- requirements:
diff --git a/debian/patches/0003-Don-t-require-rubygems-bundler-spork-don-t-change-in.patch b/debian/patches/0001-Don-t-require-rubygems-bundler-spork-don-t-change-in.patch
similarity index 100%
rename from debian/patches/0003-Don-t-require-rubygems-bundler-spork-don-t-change-in.patch
rename to debian/patches/0001-Don-t-require-rubygems-bundler-spork-don-t-change-in.patch
diff --git a/debian/patches/0002-Allow-ruby-hashie-3.patch b/debian/patches/0002-Allow-ruby-hashie-3.patch
deleted file mode 100644
index 69b7d7f..0000000
--- a/debian/patches/0002-Allow-ruby-hashie-3.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Hleb Valoshka <375gnu at gmail.com>
-Date: Mon, 17 Aug 2015 17:20:56 +0300
-Subject: Allow ruby-hashie >= 3
-
----
- metadata.yml | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/metadata.yml b/metadata.yml
-index 1aade76..215192e 100644
---- a/metadata.yml
-+++ b/metadata.yml
-@@ -102,9 +102,6 @@ dependencies:
- - - ">="
- - !ruby/object:Gem::Version
- version: 2.0.4
-- - - "<"
-- - !ruby/object:Gem::Version
-- version: 3.0.0
- type: :runtime
- prerelease: false
- version_requirements: !ruby/object:Gem::Requirement
-@@ -112,9 +109,6 @@ dependencies:
- - - ">="
- - !ruby/object:Gem::Version
- version: 2.0.4
-- - - "<"
-- - !ruby/object:Gem::Version
-- version: 3.0.0
- - !ruby/object:Gem::Dependency
- name: buff-config
- requirement: !ruby/object:Gem::Requirement
diff --git a/debian/patches/0004-Workaround-rspec-core-bug-2064.patch b/debian/patches/0002-Workaround-rspec-core-bug-2064.patch
similarity index 100%
rename from debian/patches/0004-Workaround-rspec-core-bug-2064.patch
rename to debian/patches/0002-Workaround-rspec-core-bug-2064.patch
diff --git a/debian/patches/0005-RSA-private-key-for-tests.patch b/debian/patches/0003-RSA-private-key-for-tests.patch
similarity index 100%
rename from debian/patches/0005-RSA-private-key-for-tests.patch
rename to debian/patches/0003-RSA-private-key-for-tests.patch
diff --git a/debian/patches/0004-Don-t-require-archive-gem.patch b/debian/patches/0004-Don-t-require-archive-gem.patch
new file mode 100644
index 0000000..b200195
--- /dev/null
+++ b/debian/patches/0004-Don-t-require-archive-gem.patch
@@ -0,0 +1,47 @@
+From: Hleb Valoshka <375gnu at gmail.com>
+Date: Thu, 24 Mar 2016 13:59:59 +0300
+Subject: Don't require archive gem
+
+---
+ berkshelf-api.gemspec | 3 ---
+ lib/berkshelf/api/site_connector/supermarket.rb | 1 -
+ 2 files changed, 4 deletions(-)
+
+diff --git a/berkshelf-api.gemspec b/berkshelf-api.gemspec
+index a8284e5..a555329 100644
+--- a/berkshelf-api.gemspec
++++ b/berkshelf-api.gemspec
+@@ -26,7 +26,6 @@ Gem::Specification.new do |s|
+ s.specification_version = 4
+
+ if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+- s.add_runtime_dependency(%q<archive>, ["= 0.0.6"])
+ s.add_runtime_dependency(%q<buff-config>, ["~> 1.0"])
+ s.add_runtime_dependency(%q<celluloid>, ["~> 0.16"])
+ s.add_runtime_dependency(%q<celluloid-io>, ["~> 0.16"])
+@@ -39,7 +38,6 @@ Gem::Specification.new do |s|
+ s.add_runtime_dependency(%q<semverse>, ["~> 1.0"])
+ s.add_runtime_dependency(%q<varia_model>, ["< 0.5.0", ">= 0.4.0"])
+ else
+- s.add_dependency(%q<archive>, ["= 0.0.6"])
+ s.add_dependency(%q<buff-config>, ["~> 1.0"])
+ s.add_dependency(%q<celluloid>, ["~> 0.16"])
+ s.add_dependency(%q<celluloid-io>, ["~> 0.16"])
+@@ -53,7 +51,6 @@ Gem::Specification.new do |s|
+ s.add_dependency(%q<varia_model>, ["< 0.5.0", ">= 0.4.0"])
+ end
+ else
+- s.add_dependency(%q<archive>, ["= 0.0.6"])
+ s.add_dependency(%q<buff-config>, ["~> 1.0"])
+ s.add_dependency(%q<celluloid>, ["~> 0.16"])
+ s.add_dependency(%q<celluloid-io>, ["~> 0.16"])
+diff --git a/lib/berkshelf/api/site_connector/supermarket.rb b/lib/berkshelf/api/site_connector/supermarket.rb
+index b702023..da2b1a8 100644
+--- a/lib/berkshelf/api/site_connector/supermarket.rb
++++ b/lib/berkshelf/api/site_connector/supermarket.rb
+@@ -1,5 +1,4 @@
+ require 'open-uri'
+-require 'archive'
+ require 'tempfile'
+
+ module OpenURI
diff --git a/debian/patches/series b/debian/patches/series
index eca6197..511b818 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
-0001-Don-t-require-archive-gem.patch
-0002-Allow-ruby-hashie-3.patch
-0003-Don-t-require-rubygems-bundler-spork-don-t-change-in.patch
-0004-Workaround-rspec-core-bug-2064.patch
-0005-RSA-private-key-for-tests.patch
+0001-Don-t-require-rubygems-bundler-spork-don-t-change-in.patch
+0002-Workaround-rspec-core-bug-2064.patch
+0003-RSA-private-key-for-tests.patch
+0004-Don-t-require-archive-gem.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/berkshelf-api.git
More information about the Pkg-ruby-extras-commits
mailing list