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

[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 a2281a9cf2047bbaf70c79e9af77744508d6f10f
Merge: 727eec6 94c162a
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Sat Feb 14 17:12:34 2015 +0100

    Merge tag 'upstream/2.15.01'
    
    Upstream version 2.15.01
    
    # gpg: Signature made Sat 14 Feb 2015 05:12:22 PM CET
    # gpg:                using RSA key 6BE663C75A35C975
    # gpg: please do a --check-trustdb
    # gpg: Good signature from "Axel Beckert <abe at deuxchevaux.org>"
    # gpg:                 aka "Axel Beckert (E-Mail + Jabber) <abe at noone.org>"
    # gpg:                 aka "Axel Beckert (Symlink) <xtaran at symlink.ch>"
    # gpg:                 aka "[jpeg image of size 3155]"
    # gpg:                 aka "Axel Stefan Beckert"
    # gpg:                 aka "Axel Beckert (FSFE Fellow) <abe at fsfe.org>"
    # gpg:                 aka "Axel Beckert (Debian Developer) <abe at debian.org>"

 Ack.pm                            |   8 +-
 Basic.pm                          |  11 +
 CONTRIBUTING.md                   |  28 ++
 Changes                           |  21 ++
 ConfigDefault.pm                  |   3 +
 ConfigLoader.pm                   |  91 +++--
 Filter.pm                         |   2 -
 IsGroup.pm                        |   2 +-
 IsPath.pm                         |  44 +++
 IsGroup.pm => IsPathGroup.pm      |   7 +-
 MANIFEST                          |  25 +-
 META.json                         |  67 ----
 META.yml                          |  74 ++--
 Makefile.PL                       |   7 +-
 Match.pm                          |  11 +-
 MatchGroup.pm                     |  43 +++
 Resource.pm                       |  11 +
 ack                               | 763 ++++++++++++++++++++------------------
 t/Util.pm                         |   2 +-
 t/ack-f.t                         |   3 +
 t/ack-ignore-dir.t                |  78 +++-
 t/ack-ignore-file.t               |  10 +
 t/ack-n.t                         |  12 +-
 t/default-filter.t                |   9 +
 t/inverted-file-filter.t          |   3 +
 t/issue244.t                      |  17 +
 t/issue276.t                      |  33 ++
 t/issue491.t                      |  33 ++
 t/issue522.t                      |  22 ++
 t/lib/IsPath.t                    |  12 +
 t/lib/IsPathGroup.t               |  12 +
 t/lib/MatchGroup.t                |  12 +
 t/lua-shebang.t                   |  12 +
 t/resource-iterator.t             |   9 +
 t/swamp/groceries/dir.d/CVS/fruit |   3 +
 t/swamp/groceries/dir.d/CVS/junk  |   3 +
 t/swamp/groceries/dir.d/CVS/meat  |   3 +
 t/swamp/groceries/dir.d/RCS/fruit |   3 +
 t/swamp/groceries/dir.d/RCS/junk  |   3 +
 t/swamp/groceries/dir.d/RCS/meat  |   3 +
 t/swamp/groceries/dir.d/fruit     |   3 +
 t/swamp/groceries/dir.d/junk      |   3 +
 t/swamp/groceries/dir.d/meat      |   3 +
 43 files changed, 1006 insertions(+), 518 deletions(-)

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