[DRE-commits] [SCM] ruby-moneta.git branch, master, updated. debian/0.7.14-1-10-g2c5ff27

[Jérémy Bobbio]

The following commit has been merged in the master branch:
commit 2c5796c4e0fc9b16ca0ff3d6c917bc83e290898a
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Tue May 14 09:38:59 2013 +0000

    Refresh patches
    
    Remove 0002-Mark-concurrent-increment-example-as-pending.patch: fixed upstream.

diff --git a/debian/patches/0002-Mark-concurrent-increment-example-as-pending.patch b/debian/patches/0002-Mark-concurrent-increment-example-as-pending.patch
deleted file mode 100644
index a5956ca..0000000
--- a/debian/patches/0002-Mark-concurrent-increment-example-as-pending.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Bobbio?= <lunar at debian.org>
-Date: Tue, 26 Mar 2013 19:35:27 +0100
-Subject: Mark 'concurrent increment' example as pending
-
-It is not reliable enough to be trusted for now.
----
- script/generate-specs |    2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/script/generate-specs b/script/generate-specs
-index c892797..ac1cbf0 100755
---- a/script/generate-specs
-+++ b/script/generate-specs
-@@ -2022,6 +2022,8 @@ SPECS['concurrent_increment'] = %{def increment_thread(name)
- end
- 
- it 'have atomic increment across multiple processes' do
-+  pending "a more reliable implementation suitable for Debian packaging"
-+
-   a = increment_thread('a')
-   b = increment_thread('b')
-   c = increment_thread('c')
diff --git a/debian/patches/0003-Skip-specs-for-which-we-miss-a-dependency.patch b/debian/patches/0003-Skip-specs-for-which-we-miss-a-dependency.patch
index 9d65eb0..41633d3 100644
--- a/debian/patches/0003-Skip-specs-for-which-we-miss-a-dependency.patch
+++ b/debian/patches/0003-Skip-specs-for-which-we-miss-a-dependency.patch
@@ -7,10 +7,10 @@ Subject: Skip specs for which we miss a dependency
  1 file changed, 65 insertions(+), 1 deletion(-)
 
 diff --git a/script/generate-specs b/script/generate-specs
-index ac1cbf0..042ef8d 100755
+index 21224b9..2dd0c9e 100755
 --- a/script/generate-specs
 +++ b/script/generate-specs
-@@ -2357,6 +2357,70 @@ end
+@@ -2359,6 +2359,70 @@ end
  specs_code.gsub!(/\n +\n/, "\n\n")
  File.open(File.join(PATH, 'monetaspecs.rb'), 'w') {|out| out << specs_code }
  
@@ -81,7 +81,7 @@ index ac1cbf0..042ef8d 100755
  TESTS.each do |name, options|
    build = options.delete(:build)
    store = options.delete(:store)
-@@ -2402,5 +2466,5 @@ end
+@@ -2404,5 +2468,5 @@ end
  }
  
    code.gsub!(/\n +\n/, "\n\n")
diff --git a/debian/patches/0099-Re-generate-specs-using-script-generate-specs.patch b/debian/patches/0099-Re-generate-specs-using-script-generate-specs.patch
index e6bcda6..28c7f89 100644
--- a/debian/patches/0099-Re-generate-specs-using-script-generate-specs.patch
+++ b/debian/patches/0099-Re-generate-specs-using-script-generate-specs.patch
@@ -67,8 +67,7 @@ Subject: Re-generate specs using script/generate-specs
  spec/moneta/transformer_tnet_spec.rb               |   54 -------
  spec/moneta/weak_create_spec.rb                    |   30 ----
  spec/moneta/weak_increment_spec.rb                 |   30 ----
- spec/monetaspecs.rb                                |    2 +
- 65 files changed, 5 insertions(+), 5384 deletions(-)
+ 64 files changed, 3 insertions(+), 5384 deletions(-)
 
 diff --git a/spec/moneta/adapter_activerecord_exisiting_connection_spec.rb b/spec/moneta/adapter_activerecord_exisiting_connection_spec.rb
 index c3b3ddf..e69de29 100644
@@ -5795,16 +5794,3 @@ index 2211bca..e69de29 100644
 -  it_should_behave_like 'store_stringkey_stringvalue'
 -  it_should_behave_like 'store_large'
 -end
-diff --git a/spec/monetaspecs.rb b/spec/monetaspecs.rb
-index 528922b..fc8180b 100644
---- a/spec/monetaspecs.rb
-+++ b/spec/monetaspecs.rb
-@@ -17174,6 +17174,8 @@ shared_examples_for 'concurrent_increment' do
-   end
- 
-   it 'have atomic increment across multiple processes' do
-+    pending "a more reliable implementation suitable for Debian packaging"
-+
-     a = increment_thread('a')
-     b = increment_thread('b')
-     c = increment_thread('c')
diff --git a/debian/patches/0100-Do-not-run-action_dispatch-specs.patch b/debian/patches/0100-Do-not-run-action_dispatch-specs.patch
index fcf7546..c80dfa9 100644
--- a/debian/patches/0100-Do-not-run-action_dispatch-specs.patch
+++ b/debian/patches/0100-Do-not-run-action_dispatch-specs.patch
@@ -8,10 +8,10 @@ It's not available in Debian yet.
  1 file changed, 3 insertions(+)
 
 diff --git a/Rakefile b/Rakefile
-index 785b5a5..a86feb8 100644
+index 2961d5b..55ece4c 100644
 --- a/Rakefile
 +++ b/Rakefile
-@@ -44,6 +44,9 @@ task :test do
+@@ -42,6 +42,9 @@ task :test do
    unstable = specs.select {|s| s =~ unstable_re }
    specs -= unstable
  
diff --git a/debian/patches/series b/debian/patches/series
index 3bc4508..8f98711 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 0001-Allow-to-specify-the-MySQL-socket-through-the-MYSQL_.patch
-0002-Mark-concurrent-increment-example-as-pending.patch
 0003-Skip-specs-for-which-we-miss-a-dependency.patch
 0099-Re-generate-specs-using-script-generate-specs.patch
 0100-Do-not-run-action_dispatch-specs.patch

-- 
ruby-moneta.git