[ack] 01/03: Merge tag 'upstream/2.18'

[Axel Beckert]

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

abe pushed a commit to branch master
in repository ack.

commit c91f010c3dacc9cb198010a8d2ed9e06ec4804b7
Merge: b2bfbed 5b2ae9a
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Sat Mar 25 12:00:53 2017 +0100

    Merge tag 'upstream/2.18'
    
    Upstream version 2.18
    
    # gpg: Signature made Sat Mar 25 12:00:39 2017 CET
    # gpg:                using RSA key 468C89793B429819E9D761266BE663C75A35C975
    # gpg: please do a --check-trustdb
    # gpg: Good signature from "Axel Beckert <abe at deuxchevaux.org>" [ultimate]
    # gpg:                 aka "Axel Beckert (E-Mail + Jabber) <abe at noone.org>" [ultimate]
    # gpg:                 aka "Axel Beckert (Symlink) <xtaran at symlink.ch>" [ultimate]
    # gpg:                 aka "[jpeg image of size 3155]" [ultimate]
    # gpg:                 aka "Axel Stefan Beckert" [ultimate]
    # gpg:                 aka "Axel Beckert (FSFE Fellow) <abe at fsfe.org>" [ultimate]
    # gpg:                 aka "Axel Beckert (Debian Developer) <abe at debian.org>" [ultimate]

 Ack.pm                  |  28 +++---
 Basic.pm                | 200 --------------------------------------
 CONTRIBUTING.md         |   2 +-
 Changes                 |  55 ++++++++++-
 Collection.pm           |  15 +++
 ConfigDefault.pm        |  14 ++-
 ConfigFinder.pm         |  13 ++-
 ConfigLoader.pm         |  43 +++++++--
 Default.pm              |  11 +++
 Extension.pm            |  10 ++
 ExtensionGroup.pm       |  11 +++
 Filter.pm               |  10 ++
 FirstLineMatch.pm       |  11 +++
 Inverse.pm              |  11 +++
 Is.pm                   |  10 ++
 IsGroup.pm              |  25 +++++
 IsPath.pm               |  10 ++
 IsPathGroup.pm          |  13 +++
 MANIFEST                |   3 -
 META.json               |  16 ++--
 META.yml                |  16 ++--
 Makefile.PL             |  13 ++-
 Match.pm                |  10 ++
 MatchGroup.pm           |  15 +++
 README.md               |   7 +-
 Resource.pm             | 161 ++++++++++++++++++++++++-------
 Resources.pm            |  25 +++--
 ack                     | 250 +++++++++++++++++++++++++-----------------------
 t/00-load.t             |  13 ++-
 t/FilterTest.pm         |   4 +-
 t/ack-color.t           |   4 +-
 t/ack-dump.t            |   4 +-
 t/ack-group.t           |  29 +++---
 t/ack-help-types.t      |   5 +-
 t/ack-line.t            |  19 ++--
 t/ack-o.t               |  12 +--
 t/ack-output.t          |   1 -
 t/ack-passthru.t        |   1 -
 t/ack-removed-options.t |   5 +-
 t/ack-type.t            |   1 -
 t/ack-v.t               |   1 -
 t/command-line-files.t  |   9 +-
 t/config-loader.t       | 119 ++++++++++++++++++++---
 t/context.t             |  38 +++++++-
 t/filetypes.t           |  80 ++++++++--------
 t/lib/00-coverage.t     |   4 +-
 t/lib/Basic.t           |  12 ---
 47 files changed, 815 insertions(+), 554 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/ack.git