[DRE-commits] [ruby-fastimage] 02/02: Update debian/changelog

[Youhei SASAKI]

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

uwabami-guest pushed a commit to branch master
in repository ruby-fastimage.

commit eb2e4e332f2a41a68db5f18c871670ea7a92fef0
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Tue Mar 17 00:13:17 2015 +0900

    Update debian/changelog
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
 debian/changelog                                          |  6 ++++++
 ...-Drop-some-tests-which-need-network-connectivity.patch | 15 ++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6e1c3c6..262db28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ruby-fastimage (1.6.8-1) unstable; urgency=medium
+
+  * Imported Upstream version 1.6.8
+
+ -- Youhei SASAKI <uwabami at gfd-dennou.org>  Tue, 17 Mar 2015 00:12:42 +0900
+
 ruby-fastimage (1.6.3-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/0002-Drop-some-tests-which-need-network-connectivity.patch b/debian/patches/0002-Drop-some-tests-which-need-network-connectivity.patch
index 769b860..5431d30 100644
--- a/debian/patches/0002-Drop-some-tests-which-need-network-connectivity.patch
+++ b/debian/patches/0002-Drop-some-tests-which-need-network-connectivity.patch
@@ -7,11 +7,9 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
  test/test.rb | 27 +++------------------------
  1 file changed, 3 insertions(+), 24 deletions(-)
 
-diff --git a/test/test.rb b/test/test.rb
-index 1a429b3..771d2ce 100644
 --- a/test/test.rb
 +++ b/test/test.rb
-@@ -34,12 +34,9 @@ TestUrl = "http://example.nowhere/"
+@@ -43,12 +43,9 @@
  
  # this image fetch allows me to really test that fastimage is truly fast
  # but it's not ideal relying on external resources and connectivity speed
@@ -27,7 +25,7 @@ index 1a429b3..771d2ce 100644
  
  GoodFixtures.each do |fn, info|
    FakeWeb.register_uri(:get, "#{TestUrl}#{fn}", :body => File.join(FixturePath, fn))
-@@ -203,19 +200,6 @@ class FastImageTest < Test::Unit::TestCase
+@@ -218,19 +215,6 @@
      FakeWeb.register_uri(:get, from, :response=>resp)
    end
  
@@ -47,7 +45,7 @@ index 1a429b3..771d2ce 100644
    # This test doesn't actually test the proxy function, but at least
    # it excercises the code. You could put anything in the http_proxy and it would still pass.
    # Any ideas on how to actually test this?
-@@ -228,11 +212,6 @@ class FastImageTest < Test::Unit::TestCase
+@@ -250,10 +234,10 @@
      assert_equal actual_size, size
    end
  
@@ -55,7 +53,10 @@ index 1a429b3..771d2ce 100644
 -    size = FastImage.size(HTTPSImage)
 -    assert_equal HTTPSImageInfo[1], size
 -  end
--  
++  # def test_should_handle_https_image
++  #   size = FastImage.size(HTTPSImage)
++  #   assert_equal HTTPSImageInfo[1], size
++  # end
+ 
    require 'pathname'
    def test_should_handle_pathname
-     # bad.jpg does not have the size info in the first 256 bytes

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