[DRE-commits] [SCM] ruby-moneta.git branch, master, updated. debian/0.6.0-4-16-g741fce5

[Jérémy Bobbio]

The following commit has been merged in the master branch:
commit 2f1d28ba17e2405e0e5155f2f5a98c1ec112a113
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Mon Mar 25 16:26:36 2013 +0000

    Remove obsolete patches

diff --git a/debian/patches/modify_spec_helper.patch b/debian/patches/modify_spec_helper.patch
deleted file mode 100644
index bdab76e..0000000
--- a/debian/patches/modify_spec_helper.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-Author: Cédric Boutillier <cedric.boutillier at gmail.com>
-Description: Drop rubygems bits, adjust requires for split shared examples
-Forwarded: no
-
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
-@@ -1,7 +1,10 @@
- $TESTING=true
--$:.push File.join(File.dirname(__FILE__), '..', 'lib')
-+#$:.push File.join(File.dirname(__FILE__), '..', 'lib')
- 
--require "rubygems"
-+#require "rubygems"
- require "moneta"
- 
--require File.expand_path(File.join(File.dirname(__FILE__), "shared"))
-+require "shared"
-+require "shared_not_expired"
-+
-+#require File.expand_path(File.join(File.dirname(__FILE__), "shared"))
diff --git a/debian/patches/remove_rubygems_stuff_from_moneta_datamapper.rb b/debian/patches/remove_rubygems_stuff_from_moneta_datamapper.rb
deleted file mode 100644
index e9e3986..0000000
--- a/debian/patches/remove_rubygems_stuff_from_moneta_datamapper.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- coding: utf-8 -*-
-Author: Cédric Boutillier <cedric.boutillier at gmail.com>
-Description: Drop rubygems bits from datamapper.rb
-Forwarded: not-needed
-
---- a/lib/moneta/datamapper.rb
-+++ b/lib/moneta/datamapper.rb
-@@ -1,5 +1,5 @@
- begin
--  gem "dm-core", "0.9.10"
-+#  gem "dm-core", "0.9.10"
-   require "dm-core"
- rescue LoadError
-   puts "You need the dm-core gem in order to use the DataMapper moneta store"
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index db8eafa..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-split_shared_examples_for_specs.patch
-modify_spec_helper.patch
-remove_rubygems_stuff_from_moneta_datamapper.rb
diff --git a/debian/patches/split_shared_examples_for_specs.patch b/debian/patches/split_shared_examples_for_specs.patch
deleted file mode 100644
index 7f3fe19..0000000
--- a/debian/patches/split_shared_examples_for_specs.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-# -*- coding: utf-8 -*-
-Author: Cédric Boutillier <cedric.boutillier at gmail.com>
-Description: Move nested shared_examples_for into its own file
-Forwarded: no
---- a/spec/shared.rb
-+++ b/spec/shared.rb
-@@ -62,23 +62,23 @@
-       @cache.store("key", "value", :expires_in => 1)
-     end
- 
--    shared_examples_for "not expired" do
--      it "still has the key" do
--        @cache.key?("key").should be_true
--      end
--
--      it "returns the value when indexed" do
--        @cache["key"].should == "value"
--      end
--
--      it "returns the value when fetched" do
--        @cache.fetch("key", "value2").should == "value"
--      end
--
--      it "returns the value when deleted" do
--        @cache.delete("key").should == "value"
--      end      
--    end
-+#    shared_examples_for "not expired" do
-+#      it "still has the key" do
-+#        @cache.key?("key").should be_true
-+#      end
-+#
-+#      it "returns the value when indexed" do
-+#        @cache["key"].should == "value"
-+#      end
-+#
-+#      it "returns the value when fetched" do
-+#        @cache.fetch("key", "value2").should == "value"
-+#      end
-+#
-+#      it "returns the value when deleted" do
-+#        @cache.delete("key").should == "value"
-+#      end      
-+#    end
- 
-     describe "when expired" do
-       before(:each) do
-@@ -119,4 +119,4 @@
-       it_should_behave_like "not expired"
-     end          
-   end
--end
-\ No newline at end of file
-+end
---- /dev/null
-+++ b/spec/shared_not_expired.rb
-@@ -0,0 +1,17 @@
-+shared_examples_for "not expired" do
-+  it "still has the key" do
-+    @cache.key?("key").should be_true
-+  end
-+
-+  it "returns the value when indexed" do
-+    @cache["key"].should == "value"
-+  end
-+
-+  it "returns the value when fetched" do
-+    @cache.fetch("key", "value2").should == "value"
-+  end
-+
-+  it "returns the value when deleted" do
-+    @cache.delete("key").should == "value"
-+  end      
-+end

-- 
ruby-moneta.git