[DRE-commits] [ruby-fastimage] 01/02: Merge tag 'upstream/1.6.8'

[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 c8848ac140f73ed425fa1b3164b601bd97bd02f3
Merge: ae36ca6 bee938c
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Tue Mar 17 00:11:34 2015 +0900

    Merge tag 'upstream/1.6.8'
    
    Upstream version 1.6.8
    
    Conflicts:
    	.gitignore
    	.travis.yml
    	debian/changelog
    	debian/control
    	debian/patches/0001-Drop-RubyGems-Depends.patch
    	debian/patches/series
    	fastimage.gemspec

 .gitignore                          |   1 +
 .travis.yml                         |   1 +
 README.textile                      |  28 +++++++---
 debian/changelog                    |   2 +-
 fastimage.gemspec                   |  20 ++++---
 lib/fastimage.rb                    | 105 +++++++++++++++++++++++++++++++-----
 lib/fastimage/fbr.rb                |   1 -
 test/fixtures/favicon.ico           | Bin 0 -> 1406 bytes
 test/fixtures/gzipped.jpg           | Bin 0 -> 394305 bytes
 test/fixtures/man.ico               | Bin 0 -> 162881 bytes
 test/fixtures/test.cur              | Bin 0 -> 4286 bytes
 test/fixtures/test.ico              | Bin 318 -> 0 bytes
 test/fixtures/test_rgb.ct           | Bin 0 -> 47048 bytes
 test/fixtures/truncated_gzipped.jpg | Bin 0 -> 1023 bytes
 test/fixtures/webp_vp8.webp         | Bin 0 -> 30320 bytes
 test/fixtures/webp_vp8l.webp        | Bin 0 -> 29360 bytes
 test/fixtures/webp_vp8x.webp        | Bin 0 -> 17128 bytes
 test/test.rb                        |  66 ++++++++++++++++++++---
 18 files changed, 189 insertions(+), 35 deletions(-)

diff --cc debian/changelog
index e399d3a,0000000..6e1c3c6
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,6 -1,0 +1,6 @@@
 +ruby-fastimage (1.6.3-1) unstable; urgency=medium
 +
 +  * Team upload.
 +  * Initial release (Closes: #759421)
 +
-  -- Youhei SASAKI <uwabami at gfd-dennou.org>  Mon, 03 Nov 2014 16:01:34 +0900
++ -- Youhei SASAKI <uwabami at gfd-dennou.org>  Wed, 27 Aug 2014 15:01:51 +0900

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