[DRE-commits] [ruby-mini-magick] 03/03: updating debian/patches/remove-remote-tests and updating Build-Dep's and changelog entry

[Markus Tornow]

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

nadir-guest pushed a commit to branch master
in repository ruby-mini-magick.

commit c988936760aaeab9a86ae14c084680ea9b4b1a75
Author: dude <tornow at riseup.net>
Date:   Thu Dec 19 08:38:53 2013 +0000

    updating debian/patches/remove-remote-tests and updating Build-Dep's and changelog entry
---
 debian/TODO                        |  5 -----
 debian/changelog                   |  1 +
 debian/control                     |  2 +-
 debian/patches/remove-remote-tests | 36 ++++++++++++++++++------------------
 debian/patches/series              |  1 -
 5 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/debian/TODO b/debian/TODO
deleted file mode 100644
index a499b29..0000000
--- a/debian/TODO
+++ /dev/null
@@ -1,5 +0,0 @@
-* patch debian/patches/remove-function-valid_version_installed solved by upstream
-* test/ folder renamed to spec/
-* patch debian/patches/remove-rubygems must be applied for spec/spec_helper.rb instead of test/
-* debian/changelog
-* renaming test/ to spec/ gives errors by dpkg-src:  modified binaries in spec/
diff --git a/debian/changelog b/debian/changelog
index f0eb41f..c45f217 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ruby-mini-magick (3.7.0-1) unstable; urgency=medium
 
   * New upstream release
   * ruby tests are moved from test/ to spec, refreshing patches
+  * updating Build-Dep to new requirements by upstream tests 
 
  -- Markus Tornow <tornow at riseup.net>  Thu, 19 Dec 2013 02:46:19 +0000
 
diff --git a/debian/control b/debian/control
index c465ef6..2e64892 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Markus Tornow <tornow at riseup.net>
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~), imagemagick (>= 8:6.6.3~) ,  rake, ruby-test-unit, ruby-subexec
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~), imagemagick (>= 8:6.6.3~), rake, ruby-subexec, ruby-mocha, ruby-rspec
 Standards-Version: 3.9.4
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-mini-magick.git
 Vcs-Browser: http://anonscm.debian.org/gitweb?p=pkg-ruby-extras/ruby-mini-magick.git;a=summary
diff --git a/debian/patches/remove-remote-tests b/debian/patches/remove-remote-tests
index 2675ef8..d15778c 100644
--- a/debian/patches/remove-remote-tests
+++ b/debian/patches/remove-remote-tests
@@ -5,24 +5,24 @@ Forwarded: no
 Last-Update: 2013-05-09
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- ruby-mini-magick-3.5.0.orig/test/image_test.rb
-+++ ruby-mini-magick-3.5.0/test/image_test.rb
-@@ -55,18 +55,6 @@ class ImageTest < Test::Unit::TestCase
-     image.destroy!
-   end
+--- a/spec/lib/mini_magick/image_spec.rb
++++ b/spec/lib/mini_magick/image_spec.rb
+@@ -57,18 +57,6 @@
+       end.to_not raise_error
+     end
  
--  def test_remote_image
--    image = Image.open("http://upload.wikimedia.org/wikipedia/en/b/bc/Wiki.png")
--    assert image.valid?
--    image.destroy!
--  end
+-    it 'loads remote image' do
+-      image = MiniMagick::Image.open("http://upload.wikimedia.org/wikipedia/en/b/bc/Wiki.png")
+-      image.valid?.should be true
+-      image.destroy!
+-    end
 -
--  def test_remote_image_with_complex_url
--    image = Image.open("http://a0.twimg.com/a/1296609216/images/fronts/logo_withbird_home.png?extra=foo&plus=bar")
--    assert image.valid?
--    image.destroy!
--  end
+-    it 'loads remote image with complex url' do
+-      image = MiniMagick::Image.open("http://a0.twimg.com/a/1296609216/images/fronts/logo_withbird_home.png?extra=foo&plus=bar")
+-      image.valid?.should be true
+-      image.destroy!
+-    end
 -
-   def test_reformat_with_capitalized_extension
-     image = Image.open(CAP_EXT_PATH)
-     image.format "jpg"
+     it 'reformats an image with a given extension' do
+       expect do
+         image = MiniMagick::Image.open(CAP_EXT_PATH)
diff --git a/debian/patches/series b/debian/patches/series
index 43867ec..c909268 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 remove-rubygems
 remove-remote-tests
-remove-function-valid_version_installed

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