[ack-grep] 01/02: Merge tag 'upstream/2.14'

[Axel Beckert]

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

abe pushed a commit to branch master
in repository ack-grep.

commit aad97436332d75d2ee436a89aec5d1ef4ec44c62
Merge: 75719ec 4071aec
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Thu Sep 4 09:48:50 2014 +0200

    Merge tag 'upstream/2.14'
    
    Upstream version 2.14
    
    # gpg: Signature made Thu 04 Sep 2014 09:48:45 AM CEST using DSA key ID 95930EDE
    # gpg: Good signature from "Axel Beckert (no legal relevance) <abe at deuxchevaux.org>"
    # gpg:                 aka "Axel Beckert (no legal relevance) <abe at noone.org>"
    # gpg:                 aka "Axel Beckert (no legal relevance) <xtaran at symlink.ch>"
    # gpg:                 aka "Axel Beckert (Debian Developer) <abe at debian.org>"

 Ack.pm                      |  20 +++--
 Basic.pm                    |   6 +-
 Changes                     |  92 ++++++++++++++++++++
 Collection.pm               |  14 +--
 ConfigDefault.pm            | 207 ++++++++++++++++++++++++++++++++------------
 ConfigFinder.pm             |  67 ++++++--------
 ConfigLoader.pm             |  71 ++++++++-------
 Extension.pm                |   3 +-
 ExtensionGroup.pm           |  15 ++--
 IsGroup.pm                  |   2 +
 MANIFEST                    |   1 +
 META.json                   |   2 +-
 META.yml                    |   2 +-
 Makefile.PL                 |  15 ++--
 Match.pm                    |   2 +
 README.md                   |   2 +
 Resources.pm                |  29 ++++++-
 ack                         | 183 +++++++++++++++++++++++++++------------
 squash                      |  20 +++--
 t/00-load.t                 |   9 +-
 t/FilterTest.pm             |  17 ++--
 t/Util.pm                   | 156 ++++++++++++++++++++++++++-------
 t/ack-1.t                   |   8 +-
 t/ack-c.t                   |  12 +--
 t/ack-color.t               |   2 +-
 t/ack-column.t              |   2 +-
 t/ack-create-ackrc.t        |  18 ++--
 t/ack-dump.t                |   7 +-
 t/ack-f.t                   |   2 +-
 t/ack-files-from.t          |   3 +-
 t/ack-filetypes.t           |   3 +-
 t/ack-g.t                   |  14 ++-
 t/ack-group.t               |  30 ++++---
 t/ack-h.t                   |   2 +-
 t/ack-help-types.t          |   2 +-
 t/ack-help.t                |   6 +-
 t/ack-i.t                   |   2 +-
 t/ack-ignore-dir.t          |   2 +-
 t/ack-interactive.t         |   2 +-
 t/ack-invalid-ackrc.t       |  17 ++--
 t/ack-k.t                   |   2 +-
 t/ack-known-types.t         |   2 +-
 t/ack-line.t                |   9 +-
 t/ack-m.t                   |   8 +-
 t/ack-match.t               |  31 +++----
 t/ack-n.t                   |   2 +-
 t/ack-named-pipes.t         |  73 +++++++++-------
 t/ack-o.t                   |  18 ++--
 t/ack-pager.t               |  16 ++--
 t/ack-passthru.t            |   2 +-
 t/ack-print0.t              |   7 +-
 t/ack-removed-options.t     |   2 +-
 t/ack-s.t                   |  27 +++++-
 t/ack-show-types.t          |   4 +-
 t/ack-type-del.t            |   7 +-
 t/ack-type.t                |  52 ++++++-----
 t/ack-v.t                   |   4 +-
 t/ack-w.t                   |  15 +++-
 t/ack-x.t                   |  11 +--
 t/anchored.t                |   2 +-
 t/asp-net-ext.t             |   2 +-
 t/bad-ackrc-opt.t           |   2 +-
 t/basic.t                   |   2 +-
 t/command-line-files.t      |   2 +-
 t/config-backwards-compat.t |   3 +-
 t/config-finder.t           |  69 ++++++++-------
 t/config-loader.t           |  11 +--
 t/context.t                 |  22 ++---
 t/default-filter.t          |   2 +-
 t/exit-code.t               |   2 +-
 t/ext-filter.t              |   2 +-
 t/file-permission.t         |  10 +--
 t/filetypes.t               |  47 +++++-----
 t/filter.t                  |   2 +-
 t/firstlinematch-filter.t   |   2 +-
 t/highlighting.t            |  21 +++--
 t/illegal-regex.t           |   4 +-
 t/incomplete-last-line.t    |   6 +-
 t/inverted-file-filter.t    |   2 +-
 t/is-filter.t               |   2 +-
 t/lib/00-coverage.t         |   2 +-
 t/longopts.t                |  11 ++-
 t/match-filter.t            |   2 +-
 t/mutex-options.t           |   2 +-
 t/noackrc.t                 |   2 +-
 t/noenv.t                   |  17 ++--
 t/process-substitution.t    |  11 ++-
 t/r-lang-ext.t              |   2 +-
 t/resource-iterator.t       |   2 +-
 t/runtests.pl               |   3 +-
 t/text/number.txt           |   1 +
 t/zero.t                    |   2 +-
 92 files changed, 1058 insertions(+), 577 deletions(-)

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