[DRE-commits] [ruby-mime-types] 01/04: Merge tag 'upstream/2.1'

[Per Andersson]

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

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

commit 2922b91628ed1305e3f98481c0166a82a39f6cb4
Merge: 1fadc9c 4cae709
Author: Per Andersson <avtobiff at gmail.com>
Date:   Wed Jan 29 01:37:50 2014 +0100

    Merge tag 'upstream/2.1'
    
    Upstream version 2.1
    
    # gpg: Signature made Wed 29 Jan 2014 01:37:47 AM CET using RSA key ID 79F492F8
    # gpg: Good signature from "Per Andersson <avtobiff at fripost.org>"
    # gpg:                 aka "Per Andersson <avtobiff at debian.org>"
    # gpg:                 aka "Per Andersson <avtobiff at gmail.com>"
    # gpg:                 aka "Per Andersson <avtobiff at foo.nu>"

 .autotest                              |    5 +
 .minitest.rb                           |    2 +
 .travis.yml                            |   27 -
 Contributing.rdoc                      |   49 +-
 Gemfile                                |   17 +-
 History-Types.rdoc                     |  209 ++++++
 History.rdoc                           |  122 +++-
 Licence.rdoc                           |    2 +-
 Manifest.txt                           |   43 +-
 README.rdoc                            |  110 +--
 Rakefile                               |  240 ++-----
 checksums.yaml.gz                      |  Bin 425 -> 420 bytes
 checksums.yaml.gz.sig                  |  Bin 256 -> 256 bytes
 data.tar.gz.sig                        |  Bin 256 -> 256 bytes
 data/mime-types.json                   |    1 +
 docs/COPYING.txt                       |  678 +++++++++----------
 docs/artistic.txt                      |  254 +++----
 lib/mime.rb                            |   51 ++
 lib/mime/type.rb                       |  672 ++++++++++++++++++
 lib/mime/types.rb                      | 1164 +++++++-------------------------
 lib/mime/types/application             | 1010 ---------------------------
 lib/mime/types/application.mac         |    3 -
 lib/mime/types/application.nonstandard |  132 ----
 lib/mime/types/application.obsolete    |   41 --
 lib/mime/types/audio                   |  138 ----
 lib/mime/types/audio.nonstandard       |   11 -
 lib/mime/types/audio.obsolete          |    1 -
 lib/mime/types/cache.rb                |   73 ++
 lib/mime/types/image                   |   46 --
 lib/mime/types/image.nonstandard       |   20 -
 lib/mime/types/image.obsolete          |    5 -
 lib/mime/types/loader.rb               |  248 +++++++
 lib/mime/types/loader_path.rb          |   16 +
 lib/mime/types/message                 |   18 -
 lib/mime/types/message.obsolete        |    2 -
 lib/mime/types/model                   |   15 -
 lib/mime/types/multipart               |   14 -
 lib/mime/types/multipart.nonstandard   |    1 -
 lib/mime/types/multipart.obsolete      |    7 -
 lib/mime/types/other.nonstandard       |    8 -
 lib/mime/types/text                    |   61 --
 lib/mime/types/text.nonstandard        |    7 -
 lib/mime/types/text.obsolete           |    8 -
 lib/mime/types/text.vms                |    1 -
 lib/mime/types/video                   |   75 --
 lib/mime/types/video.nonstandard       |   16 -
 lib/mime/types/video.obsolete          |    3 -
 metadata.gz.sig                        |    3 +-
 metadata.yml                           |  179 ++---
 support/apache_mime_types.rb           |   97 +++
 support/benchmarker.rb                 |   55 ++
 support/convert.rb                     |  130 ++++
 support/iana_registry.rb               |  148 ++++
 test/fixture/json.json                 |    1 +
 test/fixture/old-data                  |    9 +
 test/fixture/yaml.yaml                 |   75 ++
 test/minitest_helper.rb                |   22 +
 test/test_mime_type.rb                 |  486 +++++++++----
 test/test_mime_types.rb                |  159 ++---
 test/test_mime_types_cache.rb          |   59 +-
 test/test_mime_types_class.rb          |  135 ++++
 test/test_mime_types_lazy.rb           |    5 +-
 test/test_mime_types_loader.rb         |   42 ++
 63 files changed, 3517 insertions(+), 3714 deletions(-)

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