[DRE-commits] [ruby-mime-types] 01/06: Merge tag 'upstream/2.6.1'

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ruby-mime-types.

commit 2c348dd9dc586141dd6efa6257d88e6028e1a7e4
Merge: 6753098 90125f6
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Jun 13 11:39:28 2015 -0300

    Merge tag 'upstream/2.6.1'
    
    Upstream version 2.6.1
    
    # gpg: Signature made Sáb 13 Jun 2015 11:39:25 BRT using RSA key ID CD460BDE
    # gpg: Good signature from "Antonio Terceiro <terceiro at softwarelivre.org>"
    # gpg:                 aka "Antonio Terceiro <terceiro at dcc.ufba.br>"
    # gpg:                 aka "Antonio Terceiro <terceiro at colivre.coop.br>"
    # gpg:                 aka "Antonio Terceiro <terceiro at debian.org>"

 .autotest                              |   34 +-
 .gitignore                             |   15 +
 .hoerc                                 |   20 +-
 .minitest.rb                           |    2 -
 Contributing.rdoc                      |  120 +-
 Gemfile                                |    9 -
 History-Types.rdoc                     |  145 +++
 History.rdoc                           |  233 +++-
 Licence.rdoc                           |   22 +-
 Manifest.txt                           |   26 +-
 README.rdoc                            |  216 +++-
 Rakefile                               |  165 ++-
 checksums.yaml.gz                      |  Bin 420 -> 0 bytes
 checksums.yaml.gz.sig                  |  Bin 256 -> 0 bytes
 data.tar.gz.sig                        |    1 -
 data/mime-types.json                   |    2 +-
 data/mime.content_type.column          | 1907 ++++++++++++++++++++++++++++++++
 data/mime.docs.column                  | 1907 ++++++++++++++++++++++++++++++++
 data/mime.encoding.column              | 1907 ++++++++++++++++++++++++++++++++
 data/mime.friendly.column              | 1907 ++++++++++++++++++++++++++++++++
 data/mime.obsolete.column              | 1907 ++++++++++++++++++++++++++++++++
 data/mime.references.column            | 1907 ++++++++++++++++++++++++++++++++
 data/mime.registered.column            | 1907 ++++++++++++++++++++++++++++++++
 data/mime.signature.column             | 1907 ++++++++++++++++++++++++++++++++
 data/mime.system.column                | 1907 ++++++++++++++++++++++++++++++++
 data/mime.use_instead.column           | 1907 ++++++++++++++++++++++++++++++++
 data/mime.xrefs.column                 | 1907 ++++++++++++++++++++++++++++++++
 lib/mime.rb                            |   51 -
 lib/mime/type.rb                       |  442 +++++---
 lib/mime/type/columnar.rb              |  112 ++
 lib/mime/types.rb                      |   82 +-
 lib/mime/types/cache.rb                |   77 +-
 lib/mime/types/columnar.rb             |  160 +++
 lib/mime/types/deprecations.rb         |   53 +
 lib/mime/types/loader.rb               |  136 ++-
 lib/mime/types/loader_path.rb          |    5 +-
 lib/mime/types/logger.rb               |   35 +
 metadata.gz.sig                        |    1 -
 metadata.yml                           |  265 +++--
 support/apache_mime_types.rb           |   15 +-
 support/benchmarker.rb                 |   55 -
 support/benchmarks/load.rb             |   64 ++
 support/benchmarks/load_allocations.rb |   83 ++
 support/benchmarks/object_counts.rb    |   41 +
 support/convert.rb                     |   78 +-
 support/convert/columnar.rb            |   90 ++
 support/iana_registry.rb               |  124 ++-
 test/bad-fixtures/malformed            |    9 +
 test/fixture/json.json                 |    2 +-
 test/fixture/yaml.yaml                 |    9 +-
 test/minitest_helper.rb                |   19 +-
 test/test_mime_type.rb                 |  280 +++--
 test/test_mime_types.rb                |   32 +-
 test/test_mime_types_cache.rb          |   12 +
 test/test_mime_types_class.rb          |   34 +-
 test/test_mime_types_lazy.rb           |    8 +-
 test/test_mime_types_loader.rb         |   40 +-
 57 files changed, 23516 insertions(+), 885 deletions(-)

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