[DRE-commits] [ruby-upr] 02/03: Drop patch for Moneta 0.7 compatibility: merged upstream

[Jérémy Bobbio]

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

lunar pushed a commit to branch master
in repository ruby-upr.

commit eee8acaa62b9343938f9ecc4b62b8770c2d728fa
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Wed Aug 7 12:12:14 2013 +0200

    Drop patch for Moneta 0.7 compatibility: merged upstream
---
 ...-Update-Upr-Monitor-to-use-Moneta-0.7-API.patch |   70 --------------------
 debian/patches/series                              |    1 -
 2 files changed, 71 deletions(-)

diff --git a/debian/patches/0001-Update-Upr-Monitor-to-use-Moneta-0.7-API.patch b/debian/patches/0001-Update-Upr-Monitor-to-use-Moneta-0.7-API.patch
deleted file mode 100644
index 3ab8445..0000000
--- a/debian/patches/0001-Update-Upr-Monitor-to-use-Moneta-0.7-API.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Bobbio?= <lunar at debian.org>
-Date: Sat, 22 Jun 2013 15:22:54 +0000
-Subject: Update Upr::Monitor to use Moneta 0.7 API
-
-We need to deactivate the serialization in Moneta so that the assumption
-(currently used in the tests) that the status object will be the same across
-the calls to the monitor still hold.
----
- lib/upr/monitor.rb |    9 ++++-----
- metadata.yml       |    4 ++--
- upr.gemspec        |    2 +-
- 3 files changed, 7 insertions(+), 8 deletions(-)
-
-diff --git a/lib/upr/monitor.rb b/lib/upr/monitor.rb
-index 2b4732c..ec285c9 100644
---- a/lib/upr/monitor.rb
-+++ b/lib/upr/monitor.rb
-@@ -5,10 +5,10 @@ module Upr
-   # This uses any {Moneta}[http://github.com/wycats/moneta]
-   # store to monitor upload progress.
-   #
--  # Usage (in config.ru with Moneta::Memory store):
-+  # Usage (in config.ru with Moneta Memory store):
-   #   require 'upr'
--  #   require 'moneta/memory'
--  #   use Upr, :backend => Upr::Monitor.new(Moneta::Memory.new)
-+  #   require 'moneta'
-+  #   use Upr, :backend => Upr::Monitor.new(Moneta.new(:Memory, :serializer => nil))
-   #   run YourApplication.new
-   class Monitor < Struct.new(:moneta)
-     # nuke anything not read/updated in 60 seconds
-@@ -17,8 +17,7 @@ module Upr
-     def initialize(moneta_store = nil)
-       super
-       if moneta_store.nil?
--        require 'moneta/memory' # moneta does not autoload :<
--        self.moneta = Moneta::Memory.new
-+        self.moneta = Moneta.new(:Memory, :serializer => nil)
-       end
-     end
- 
-diff --git a/metadata.yml b/metadata.yml
-index 011045f..87739bf 100644
---- a/metadata.yml
-+++ b/metadata.yml
-@@ -18,9 +18,9 @@ dependencies:
-   version_requirement: 
-   version_requirements: !ruby/object:Gem::Requirement 
-     requirements: 
--    - - ">="
-+    - - "~>"
-       - !ruby/object:Gem::Version 
--        version: "0"
-+        version: "0.7"
-     version: 
- - !ruby/object:Gem::Dependency 
-   name: rack
-diff --git a/upr.gemspec b/upr.gemspec
-index f99c088..f6bed03 100644
---- a/upr.gemspec
-+++ b/upr.gemspec
-@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
-   s.require_paths = %w(lib)
-   s.rubyforge_project = %q{rainbows}
- 
--  s.add_dependency(%q<moneta>)
-+  s.add_dependency(%q<moneta>, '~>0.7')
-   s.add_dependency(%q<rack>)
- 
-   # Folks on intranets sharing humongous files can use Unicorn, too
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index ed00446..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Update-Upr-Monitor-to-use-Moneta-0.7-API.patch

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