[DRE-commits] [SCM] ruby-carrierwave.git branch, master, updated. upstream/0.8.0-15-g725249c

[Praveen Arimbrathodiyil]

The following commit has been merged in the master branch:
commit b399cef9950019f6a51d7217c7eefdedd86f1cb9
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Jun 5 17:43:58 2013 +0530

    make changes required for mini_magick 3.6

diff --git a/debian/changelog b/debian/changelog
index f6f4e8d..8040c6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ruby-carrierwave (0.8.0-2) unstable; urgency=low
 
-  * Upload to unstable (rspec 2.13 is now available)
+  * Upload to unstable (ruby-sham-rack is now available)
+  * Make ruby-mini-magick dependency (>=3.6)
+  * Upply upstream patch for fixing tests for mini_magick 3.6
 
  -- Praveen Arimbrathodiyil <praveen at debian.org>  Mon, 03 Jun 2013 20:56:37 +0530
 
diff --git a/debian/control b/debian/control
index 05193c7..1d5a046 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 7.0.50~),
                ruby-rspec (>= 2.12~),
                ruby-rmagick,
                ruby-timecop,
-               ruby-mini-magick,
+               ruby-mini-magick (>= 3.6.0),
                cucumber,
                ruby-fog,
                ruby-sham-rack,
diff --git a/debian/patches/fix-for-minimagick3.6.patch b/debian/patches/fix-for-minimagick3.6.patch
new file mode 100644
index 0000000..7dba6a4
--- /dev/null
+++ b/debian/patches/fix-for-minimagick3.6.patch
@@ -0,0 +1,39 @@
+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 41b15b3..519387d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 remove-rubygems-require.patch
 fix-download-test.patch
+fix-for-minimagick3.6.patch

-- 
ruby-carrierwave.git