[DRE-commits] [ruby-hamster] 03/04: Update to upstream version 3.0.0

[Hanno Zulla]

This is an automated email from the git hooks/post-receive script.

hanno-guest pushed a commit to branch master
in repository ruby-hamster.

commit 908cc00ad4f531d2368700f3a6d2ce571ecdd510
Author: Hanno Zulla <hanno.zulla at epublica.de>
Date:   Wed Feb 24 12:07:46 2016 +0100

    Update to upstream version 3.0.0
---
 debian/patches/01-remove-code-climate.patch |  6 +--
 debian/patches/02-concurrent-ruby.patch     | 67 -----------------------------
 debian/patches/series                       |  1 -
 3 files changed, 3 insertions(+), 71 deletions(-)

diff --git a/debian/patches/01-remove-code-climate.patch b/debian/patches/01-remove-code-climate.patch
index d2cb774..51cf051 100644
--- a/debian/patches/01-remove-code-climate.patch
+++ b/debian/patches/01-remove-code-climate.patch
@@ -3,10 +3,10 @@ Forwarded: no
 Author: Hanno Zulla <kontakt at hanno.de>
 Last-Update: 2016-01-18
 
-Index: ruby-hamster-2.0.0/spec/spec_helper.rb
+Index: ruby-hamster/spec/spec_helper.rb
 ===================================================================
---- ruby-hamster-2.0.0.orig/spec/spec_helper.rb	2016-01-18 14:19:14.000000000 +0100
-+++ ruby-hamster-2.0.0/spec/spec_helper.rb	2016-01-18 14:20:08.164992506 +0100
+--- ruby-hamster.orig/spec/spec_helper.rb	2016-02-24 12:02:25.292257701 +0100
++++ ruby-hamster/spec/spec_helper.rb	2016-02-24 12:02:25.288257758 +0100
 @@ -1,6 +1,3 @@
 -require "codeclimate-test-reporter"
 -CodeClimate::TestReporter.start
diff --git a/debian/patches/02-concurrent-ruby.patch b/debian/patches/02-concurrent-ruby.patch
deleted file mode 100644
index 5d43325..0000000
--- a/debian/patches/02-concurrent-ruby.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Description: Update to concurrent ruby 1.0's updated API
- The current release of Hamster is using an outdated version
- of concurrent-ruby. Since the release, Hamster upstream has
- already fixed this in git commit 74e8944 on 2015-12-02,
- but hasn't released this fix yet.
-Forwarded: no
-Author: Hanno Zulla <kontakt at hanno.de>
-Last-Update: 2016-01-18
-
-Index: ruby-hamster/lib/hamster/list.rb
-===================================================================
---- ruby-hamster.orig/lib/hamster/list.rb	2016-01-26 13:59:44.627949201 +0100
-+++ ruby-hamster/lib/hamster/list.rb	2016-01-26 13:59:44.623949237 +0100
-@@ -1311,7 +1311,7 @@
-     def initialize(&block)
-       @head   = block # doubles as storage for block while yet unrealized
-       @tail   = nil
--      @atomic = Concurrent::Atomic.new(0) # haven't yet run block
-+      @atomic = Concurrent::AtomicReference.new(0) # haven't yet run block
-       @size   = nil
-     end
- 
-Index: ruby-hamster/spec/lib/hamster/list/multithreading_spec.rb
-===================================================================
---- ruby-hamster.orig/spec/lib/hamster/list/multithreading_spec.rb	2016-01-26 13:59:44.627949201 +0100
-+++ ruby-hamster/spec/lib/hamster/list/multithreading_spec.rb	2016-01-26 13:59:44.623949237 +0100
-@@ -4,7 +4,7 @@
- 
- describe Hamster::List do
-   it "ensures each node of a lazy list will only be realized on ONE thread, even when accessed by multiple threads" do
--    counter = Concurrent::Atomic.new(0)
-+    counter = Concurrent::AtomicReference.new(0)
-     list = (1..10000).to_list.map { |x| counter.update { |count| count + 1 }; x * 2 }
- 
-     threads = 10.times.collect do
-@@ -45,4 +45,4 @@
-     elapsed = Time.now - start
-     elapsed.should_not > 0.3
-   end
--end
-\ No newline at end of file
-+end
-Index: ruby-hamster/metadata.yml
-===================================================================
---- ruby-hamster.orig/metadata.yml	2016-01-26 13:58:43.128500837 +0100
-+++ ruby-hamster/metadata.yml	2016-01-26 14:23:25.575685293 +0100
-@@ -14,16 +14,16 @@
-   name: concurrent-ruby
-   requirement: !ruby/object:Gem::Requirement
-     requirements:
--    - - "~>"
-+    - - ">="
-       - !ruby/object:Gem::Version
--        version: '0.8'
-+        version: '1.0.0'
-   type: :runtime
-   prerelease: false
-   version_requirements: !ruby/object:Gem::Requirement
-     requirements:
--    - - "~>"
-+    - - ">="
-       - !ruby/object:Gem::Version
--        version: '0.8'
-+        version: '1.0.0'
- - !ruby/object:Gem::Dependency
-   name: bundler
-   requirement: !ruby/object:Gem::Requirement
diff --git a/debian/patches/series b/debian/patches/series
index 85f6964..e4f2364 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 01-remove-code-climate.patch
-02-concurrent-ruby.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-hamster.git