[DRE-commits] [ruby-zip] 01/07: Merge tag 'upstream/1.1.6'

[David Suárez]

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

deiv-guest pushed a commit to branch master
in repository ruby-zip.

commit 9f0d8043948fe79bf7726677b8a0d014daed3234
Merge: bb18fe9 63c7cc4
Author: David Suárez <david.sephirot at gmail.com>
Date:   Tue Sep 23 19:31:34 2014 +0200

    Merge tag 'upstream/1.1.6'
    
    Upstream version 1.1.6

 .gitignore                                         |  1 +
 .travis.yml                                        |  4 +-
 Changelog.md                                       | 33 ++++++++++++
 Gemfile                                            |  9 ----
 lib/zip/entry.rb                                   |  8 ++-
 lib/zip/errors.rb                                  |  8 +++
 lib/zip/file.rb                                    |  3 +-
 lib/zip/inflater.rb                                | 59 ++++++----------------
 lib/zip/ioextras/abstract_input_stream.rb          |  6 ++-
 lib/zip/output_stream.rb                           |  2 +-
 lib/zip/streamable_stream.rb                       |  4 ++
 lib/zip/version.rb                                 |  2 +-
 rubyzip.gemspec                                    |  2 +
 samples/example.rb                                 |  4 +-
 samples/example_recursive.rb                       | 13 +++--
 samples/gtkRubyzip.rb                              | 10 ++--
 samples/qtzip.rb                                   | 16 +++---
 samples/write_simple.rb                            |  2 +-
 samples/zipfind.rb                                 | 14 ++---
 test/data/mimetype                                 |  1 +
 test/entry_test.rb                                 | 33 ++++++++++++
 test/errors_test.rb                                | 36 +++++++++++++
 test/file_test.rb                                  | 19 +++++--
 test/input_stream_test.rb                          | 10 ++++
 ....rb => unicode_file_names_and_comments_test.rb} |  2 +
 25 files changed, 207 insertions(+), 94 deletions(-)

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