[ack] 02/03: Merge tag 'upstream/2.15.03'

[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 3eda199cafd494fad0085d3f568a168ec0ffcc3f
Merge: 47e5cc7 ec4d06d
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Sun Mar 5 19:25:00 2017 +0100

    Merge tag 'upstream/2.15.03'
    
    Upstream version 2.15.03
    
    # gpg: Signature made Sun Mar  5 19:24:49 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                     |   8 +--
 CONTRIBUTING.md            |  11 +++
 Changes                    |  55 +++++++++++++-
 ConfigDefault.pm           |  17 +++--
 ConfigLoader.pm            |   6 +-
 MANIFEST                   |   7 +-
 META.json                  |  69 ++++++++++++++++++
 META.yml                   |  75 +++++++++----------
 Makefile.PL                |   2 +-
 ack                        | 172 +++++++++++++++++++++-----------------------
 t/Util.pm                  |   2 +-
 t/ack-1.t                  |   2 +-
 t/ack-c.t                  |  10 +--
 t/ack-f.t                  |   1 +
 t/ack-filetypes.t          |   2 +
 t/ack-g.t                  |   8 +--
 t/ack-ignore-dir.t         |  16 ++++-
 t/ack-ignore-file.t        |   4 +-
 t/ack-interactive.t        |   8 +--
 t/ack-m.t                  |   2 +-
 t/ack-match.t              |   1 +
 t/ack-n.t                  |   2 +-
 t/ack-o.t                  |   8 +--
 t/ack-output.t             | 175 +++++++++++++++++++++++++++++++++++++++++++++
 t/ack-pager.t              |  18 ++---
 t/ack-v.t                  |   4 +-
 t/ack-w.t                  |  83 +++++++++++++++++++--
 t/ack-x.t                  |   2 +-
 t/anchored.t               |   6 +-
 t/context.t                |   2 +-
 t/default-filter.t         |   1 +
 t/highlighting.t           |   6 +-
 t/inverted-file-filter.t   |   1 +
 t/issue562.t               |  23 ++++++
 t/issue571.t               |  23 ++++++
 t/resource-iterator.t      |   1 +
 t/swamp/swamp/ignoreme.txt |   1 +
 37 files changed, 644 insertions(+), 190 deletions(-)

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