[DRE-commits] [ruby-carrierwave] 07/07: remove fix-for-minimagick3.6.patch

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository ruby-carrierwave.

commit 89ce2f328662e6393e2197004cb324199e5089f8
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Apr 24 21:14:32 2014 +0530

    remove fix-for-minimagick3.6.patch
---
 debian/patches/fix-for-minimagick3.6.patch | 39 ------------------------------
 debian/patches/series                      |  1 -
 2 files changed, 40 deletions(-)

diff --git a/debian/patches/fix-for-minimagick3.6.patch b/debian/patches/fix-for-minimagick3.6.patch
deleted file mode 100644
index 7dba6a4..0000000
--- a/debian/patches/fix-for-minimagick3.6.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 992e81e841b0a7a1f1b418fb6559e005b19af1b4 Mon Sep 17 00:00:00 2001
-From: Jason Woodward <jason at recovend.com>
-Date: Wed, 22 May 2013 13:31:46 -0400
-Subject: [PATCH] update tests to match changes in MiniMagick v3.6.0 committed
- in 26e955d9854f9acbf7eb809dce968156de09780a
-
----
- carrierwave.gemspec                 | 2 +-
- spec/processing/mini_magick_spec.rb | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/carrierwave.gemspec b/carrierwave.gemspec
-index f8662b1..197addc 100644
---- a/carrierwave.gemspec
-+++ b/carrierwave.gemspec
-@@ -35,6 +35,6 @@ Gem::Specification.new do |s|
-   s.add_development_dependency "sham_rack"
-   s.add_development_dependency "timecop"
-   s.add_development_dependency "fog", ">= 1.3.1"
--  s.add_development_dependency "mini_magick"
-+  s.add_development_dependency "mini_magick", ">= 3.6.0"
-   s.add_development_dependency "rmagick"
- end
-diff --git a/spec/processing/mini_magick_spec.rb b/spec/processing/mini_magick_spec.rb
-index ca50ccd..0c3833b 100644
---- a/spec/processing/mini_magick_spec.rb
-+++ b/spec/processing/mini_magick_spec.rb
-@@ -53,7 +53,7 @@
-       @instance.resize_and_pad(200, 200)
-       image = ::MiniMagick::Image.open(@instance.current_path)
-       x, y = 0, 0
--      color = image.run_command("convert", "#{image.escaped_path}[1x1+#{x}+#{y}]", "-depth 8", "txt:").split("\n")[1]
-+      color = image.run_command("convert", "#{image.path}[1x1+#{x}+#{y}]", "-depth", "8", "txt:").split("\n")[1]
-       color.should include('#FFFFFF')
-     end
- 
--- 
-1.8.1.6
-
diff --git a/debian/patches/series b/debian/patches/series
index 519387d..41b15b3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 remove-rubygems-require.patch
 fix-download-test.patch
-fix-for-minimagick3.6.patch

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