[SCM] Packaging of ack-grep in Debian branch, master, updated. debian/1.96-2-23-gc94836c
gregor herrmann
gregoa at debian.org
Sat May 11 17:44:59 UTC 2013
The following commit has been merged in the master branch:
commit 2c6f975d13bf3fc5f7415ceea46d9ebf803cb6c3
Author: gregor herrmann <gregoa at debian.org>
Date: Sat May 11 18:26:01 2013 +0200
Refresh patch app-rename.
diff --git a/debian/patches/app-rename b/debian/patches/app-rename
index 360dced..982a3b4 100644
--- a/debian/patches/app-rename
+++ b/debian/patches/app-rename
@@ -1,25 +1,12 @@
Description: rename the program from ack to ack-grep in the POD documentation
Forwarded: not-needed
Author: Ryan Niebur <ryan at debian.org>
+Reviewed-by: gregor herrmann <gregoa at debian.org>
+Last-Update: 2013-05-11
-Index: ack-grep/ack-base
-===================================================================
---- ack-grep.orig/ack-base 2012-06-03 22:39:44.000000000 -0700
-+++ ack-grep/ack-base 2012-06-03 22:45:42.000000000 -0700
-@@ -9,10 +9,11 @@
- # These are all our globals.
-
- use App::Ack ();
-+$App::Ack::debian_internal_name = App::Ack::_my_program();
-
- MAIN: {
- if ( $App::Ack::VERSION ne $main::VERSION ) {
-- App::Ack::die( "Program/library version mismatch\n\t$0 is $main::VERSION\n\t$INC{'App/Ack.pm'} is $App::Ack::VERSION" );
-+ App::Ack::die( "Program/library version mismatch\n\t$App::Ack::debian_internal_name is $main::VERSION\n\t$INC{'App/Ack.pm'} is $App::Ack::VERSION" );
- }
-
- # Do preliminary arg checking;
-@@ -112,39 +113,39 @@
+--- a/ack
++++ b/ack
+@@ -1023,12 +1023,12 @@
=head1 NAME
@@ -35,66 +22,72 @@ Index: ack-grep/ack-base
=head1 DESCRIPTION
--Ack is designed as a replacement for 99% of the uses of F<grep>.
-+Ack-Grep is designed as a replacement for 99% of the uses of F<grep>.
+@@ -1036,7 +1036,7 @@
--Ack searches the named input FILEs (or standard input if no files are
-+Ack-Grep searches the named input FILEs (or standard input if no files are
- named, or the file name - is given) for lines containing a match to the
--given PATTERN. By default, ack prints the matching lines.
-+given PATTERN. By default, ack-grep prints the matching lines.
+ Ack searches the named input FILEs (or standard input if no files
+ are named, or the file name - is given) for lines containing a match
+-to the given PATTERN. By default, ack prints the matching lines.
++to the given PATTERN. By default, ack-grep prints the matching lines.
--Ack can also list files that would be searched, without actually searching
--them, to let you take advantage of ack's file-type filtering capabilities.
-+Ack-Grep can also list files that would be searched, without actually searching
-+them, to let you take advantage of ack-grep's file-type filtering capabilities.
+ PATTERN is a Perl regular expression. Perl regular expressions
+ are commonly found in other programming languages, but for the particulars
+@@ -1044,25 +1044,25 @@
+ L<http://perldoc.perl.org/perlreref.html|perlreref>. If you don't know
+ how to use regular expression but are interested in learning, you may
+ consult L<http://perldoc.perl.org/perlretut.html|perlretut>. If you do not
+-need or want ack to use regular expressions, please see the
++need or want ack-grep to use regular expressions, please see the
+ C<-Q>/C<--literal> option.
+
+ Ack can also list files that would be searched, without actually
+-searching them, to let you take advantage of ack's file-type filtering
++searching them, to let you take advantage of ack-grep's file-type filtering
+ capabilities.
=head1 FILE SELECTION
+ If files are not specified for searching, either on the command
+-line or piped in with the C<-x> option, I<ack> delves into
++line or piped in with the C<-x> option, I<ack-grep> delves into
+ subdirectories selecting files for searching.
+
-I<ack> is intelligent about the files it searches. It knows about
+I<ack-grep> is intelligent about the files it searches. It knows about
certain file types, based on both the extension on the file and,
in some cases, the contents of the file. These selections can be
made with the B<--type> option.
--With no file selections, I<ack> only searches files of types that
--it recognizes. If you have a file called F<foo.wango>, and I<ack>
--doesn't know what a .wango file is, I<ack> won't search it.
-+With no file selections, I<ack-grep> only searches files of types that
-+it recognizes. If you have a file called F<foo.wango>, and I<ack-grep>
-+doesn't know what a .wango file is, I<ack-grep> won't search it.
-
--The B<-a> option tells I<ack> to select all files, regardless of
-+The B<-a> option tells I<ack-grep> to select all files, regardless of
- type.
+-With no file selection, I<ack> searches through regular files that
++With no file selection, I<ack-grep> searches through regular files that
+ are not explicitly excluded by B<--ignore-dir> and B<--ignore-file>
+ options, either present in F<ackrc> files or on the command line.
--Some files will never be selected by I<ack>, even with B<-a>,
-+Some files will never be selected by I<ack-grep>, even with B<-a>,
- including:
-
- =over 4
-@@ -155,13 +156,13 @@
+@@ -1079,15 +1079,15 @@
=back
+-Run I<ack> with the C<--dump> option to see what settings are set.
++Run I<ack-grep> with the C<--dump> option to see what settings are set.
+
-However, I<ack> always searches the files given on the command line,
+-no matter what type. If you tell I<ack> to search in a coredump,
+However, I<ack-grep> always searches the files given on the command line,
- no matter what type. Furthermore, by specifying the B<-u> option all
- files will be searched.
++no matter what type. If you tell I<ack-grep> to search in a coredump,
+ it will search in a coredump.
=head1 DIRECTORY SELECTION
-I<ack> descends through the directory tree of the starting directories
+I<ack-grep> descends through the directory tree of the starting directories
- specified. However, it will ignore the shadow directories used by
+ specified. If no directories are specified, the current working directory is
+ used. However, it will ignore the shadow directories used by
many version control systems, and the build directories used by the
- Perl MakeMaker system. You may add or remove a directory from this
-@@ -169,11 +170,11 @@
+@@ -1096,11 +1096,11 @@
to add/remove multiple directories from the ignore list.
For a complete list of directories that do not get searched, run
--F<ack --help>.
-+F<ack-grep --help>.
+-C<ack --dump>.
++C<ack-grep --dump>.
=head1 WHEN TO USE GREP
@@ -103,43 +96,82 @@ Index: ack-grep/ack-base
throw I<grep> away, because there are times you'll still need it.
E.g., searching through huge files looking for regexes that can be
-@@ -210,7 +211,7 @@
+@@ -1137,7 +1137,7 @@
number of lines for each file that has lines matching. Without
B<-l>, some line counts may be zeroes.
--If combined with B<-h> (B<--no-filename>) ack outputs only one total count.
-+If combined with B<-h> (B<--no-filename>) ack-grep outputs only one total count.
+-If combined with B<-h> (B<--no-filename>) ack outputs only one total
++If combined with B<-h> (B<--no-filename>) ack-grep outputs only one total
+ count.
- =item B<--color>, B<--nocolor>
+ =item B<--[no]color>, B<--[no]colour>
+@@ -1168,7 +1168,7 @@
-@@ -241,13 +242,13 @@
- =item B<--env>, B<--noenv>
+ =item B<--create-ackrc>
- B<--noenv> disables all environment processing. No F<.ackrc> is read
--and all environment variables are ignored. By default, F<ack> considers
-+and all environment variables are ignored. By default, F<ack-grep> considers
- F<.ackrc> and settings in the environment.
+-Dumps the default ack options to standard output. This is useful for
++Dumps the default ack-grep options to standard output. This is useful for
+ when you want to customize the defaults.
+
+ =item B<--dump>
+@@ -1179,13 +1179,13 @@
+ =item B<--[no]env>
+
+ B<--noenv> disables all environment processing. No F<.ackrc> is
+-read and all environment variables are ignored. By default, F<ack>
++read and all environment variables are ignored. By default, F<ack-grep>
+ considers F<.ackrc> and settings in the environment.
=item B<--flush>
B<--flush> flushes output immediately. This is off by default
--unless ack is running interactively (when output goes to a pipe
-+unless ack-grep is running interactively (when output goes to a pipe
- or file).
+-unless ack is running interactively (when output goes to a pipe or
++unless ack-grep is running interactively (when output goes to a pipe or
+ file).
=item B<-f>
-@@ -316,8 +317,8 @@
+@@ -1202,7 +1202,7 @@
+
+ =item B<--[no]filter>
- The I<DIRNAME> must always be a simple directory name. Nested directories like
- F<foo/bar> are NOT supported. You would need to specify B<--ignore-dir=foo> and
--then no files from any foo directory are taken into account by ack unless given
--explicitly on the command line.
-+then no files from any foo directory are taken into account by ack-grep unless
-+given explicitly on the command line.
+-Forces ack to act as if it were recieving input via a pipe.
++Forces ack-grep to act as if it were recieving input via a pipe.
- =item B<--line=I<NUM>>
+ =item B<--[no]follow>
-@@ -342,8 +343,8 @@
+@@ -1252,9 +1252,9 @@
+
+ =item B<--ignore-ack-defaults>
+
+-Tells ack to completely ignore the default definitions provided with ack.
++Tells ack-grep to completely ignore the default definitions provided with ack-grep.
+ This is useful in combination with B<--create-ackrc> if you I<really> want
+-to customize ack.
++to customize ack-grep.
+
+ =item B<--[no]ignore-dir=I<DIRNAME>>, B<--[no]ignore-directory=I<DIRNAME>>
+
+@@ -1267,7 +1267,7 @@
+ The I<DIRNAME> must always be a simple directory name. Nested
+ directories like F<foo/bar> are NOT supported. You would need to
+ specify B<--ignore-dir=foo> and then no files from any foo directory
+-are taken into account by ack unless given explicitly on the command
++are taken into account by ack-grep unless given explicitly on the command
+ line.
+
+ =item B<--ignore-file=I<FILTERTYPE:FILTERARGS>>
+@@ -1277,8 +1277,8 @@
+
+ =item B<-k>, B<--known-types>
+
+-Limit selected files to those with types that ack knows about. This is
+-equivalent to the default behavior found in ack 1.
++Limit selected files to those with types that ack-grep knows about. This is
++equivalent to the default behavior found in ack-grep 1.
+
+ =item B<--lines=I<NUM>>
+
+@@ -1302,8 +1302,8 @@
same set of files.
# search for foo and bar in given files
@@ -150,16 +182,16 @@ Index: ack-grep/ack-base
=item B<-m=I<NUM>>, B<--max-count=I<NUM>>
-@@ -369,7 +370,7 @@
+@@ -1331,7 +1331,7 @@
- =item B<--pager=I<program>>
+ =item B<--pager=I<program>>, B<--nopager>
--Direct ack's output through I<program>. This can also be specified
-+Direct ack-grep's output through I<program>. This can also be specified
+-B<--pager> directs ack's output through I<program>. This can also be specified
++B<--pager> directs ack-grep's output through I<program>. This can also be specified
via the C<ACK_PAGER> and C<ACK_PAGER_COLOR> environment variables.
Using --pager does not suppress grouping and coloring like piping
-@@ -382,7 +383,7 @@
+@@ -1347,7 +1347,7 @@
still seeing the entire file, as in:
# Watch a log file, and highlight a certain IP address
@@ -168,7 +200,7 @@ Index: ack-grep/ack-base
=item B<--print0>
-@@ -391,7 +392,7 @@
+@@ -1356,7 +1356,7 @@
helpful when dealing with filenames that contain whitespace, e.g.
# remove all files of type html
@@ -177,10 +209,10 @@ Index: ack-grep/ack-base
=item B<-Q>, B<--literal>
-@@ -419,11 +420,11 @@
+@@ -1383,11 +1383,11 @@
=item B<--sort-files>
- Sorts the found files lexically. Use this if you want your file
+ Sorts the found files lexicographically. Use this if you want your file
-listings to be deterministic between runs of I<ack>.
+listings to be deterministic between runs of I<ack-grep>.
@@ -191,25 +223,23 @@ Index: ack-grep/ack-base
Works with B<-f> and B<-g> options.
-@@ -446,7 +447,7 @@
+@@ -1404,7 +1404,7 @@
Type specifications can be repeated and are ORed together.
-See I<ack --help=types> for a list of valid types.
+See I<ack-grep --help=types> for a list of valid types.
- =item B<--type-add I<TYPE>=I<.EXTENSION>[,I<.EXT2>[,...]]>
+ =item B<--type-add I<TYPE>:I<FILTER>:I<FILTERARGS>>
-@@ -514,7 +515,7 @@
+@@ -1481,33 +1481,33 @@
as they are not interpreted by the shell. Basically, each I<line>
in the F<.ackrc> file is interpreted as one element of C<@ARGV>.
--F<ack> looks in your home directory for the F<.ackrc>. You can
-+F<ack-grep> looks in your home directory for the F<.ackrc>. You can
- specify another location with the F<ACKRC> variable, below.
-
- If B<--noenv> is specified on the command line, the F<.ackrc> file
-@@ -522,27 +523,27 @@
+-F<ack> looks in several locations for F<.ackrc> files; the searching
++F<ack-grep> looks in several locations for F<.ackrc> files; the searching
+ process is detailed in L</"ACKRC LOCATION SEMANTICS">. These
+ files are not considered if B<--noenv> is specified on the command line.
=head1 Defining your own types
@@ -224,62 +254,56 @@ Index: ack-grep/ack-base
+I<ack-grep --perl foo> searches for foo in all perl files. I<ack-grep --help=types>
tells you, that perl files are files ending
in .pl, .pm, .pod or .t. So what if you would like to include .xs
--files as well when searching for --perl files? I<ack --type-add perl=.xs --perl foo>
-+files as well when searching for --perl files? I<ack-grep --type-add perl=.xs --perl foo>
+-files as well when searching for --perl files? I<ack --type-add perl:ext:xs --perl foo>
++files as well when searching for --perl files? I<ack-grep --type-add perl:ext:xs --perl foo>
does this for you. B<--type-add> appends
additional extensions to an existing type.
If you want to define a new type, or completely redefine an existing
--type, then use B<--type-set>. I<ack --type-set
-+type, then use B<--type-set>. I<ack-grep --type-set
- eiffel=.e,.eiffel> defines the type I<eiffel> to include files with
+-type, then use B<--type-set>. I<ack --type-set eiffel:ext:e,eiffel> defines
++type, then use B<--type-set>. I<ack-grep --type-set eiffel:ext:e,eiffel> defines
+ the type I<eiffel> to include files with
the extensions .e or .eiffel. So to search for all eiffel files
--containing the word Bertrand use I<ack --type-set eiffel=.e,.eiffel --eiffel Bertrand>.
-+containing the word Bertrand use I<ack-grep --type-set eiffel=.e,.eiffel --eiffel Bertrand>.
+-containing the word Bertrand use I<ack --type-set eiffel:ext:e,eiffel --eiffel Bertrand>.
++containing the word Bertrand use I<ack-grep --type-set eiffel:ext:e,eiffel --eiffel Bertrand>.
As usual, you can also write B<--type=eiffel>
instead of B<--eiffel>. Negation also works, so B<--noeiffel> excludes
--all eiffel files from a search. Redefining also works: I<ack --type-set cc=.c,.h>
-+all eiffel files from a search. Redefining also works: I<ack-grep --type-set cc=.c,.h>
+-all eiffel files from a search. Redefining also works: I<ack --type-set cc:ext:c,h>
++all eiffel files from a search. Redefining also works: I<ack-grep --type-set cc:ext:c,h>
and I<.xs> files no longer belong to the type I<cc>.
When defining your own types in the F<.ackrc> file you have to use
-@@ -561,7 +562,7 @@
-
+@@ -1526,9 +1526,9 @@
- In order to see all currently defined types, use I<--help types>, e.g.
--I<ack --type-set backup=.bak --type-add perl=.perl --help types>
-+I<ack-grep --type-set backup=.bak --type-add perl=.perl --help types>
- Restrictions:
+ In order to see all currently defined types, use I<--help-types>, e.g.
+-I<ack --type-set backup:ext:bak --type-add perl:ext:perl --help-types>
++I<ack-grep --type-set backup:ext:bak --type-add perl:ext:perl --help-types>
-@@ -578,7 +579,7 @@
- 'shell' and 'xml' cannot be redefined by I<--type-set>, it is always
- active. However, the shebang line is only examined for files where the
- extension is not recognised. Therefore it is possible to say
--I<ack --type-set perl=.perl --type-set foo=.pl,.pm,.pod,.t --perl --nofoo> and
-+I<ack-grep --type-set perl=.perl --type-set foo=.pl,.pm,.pod,.t --perl --nofoo> and
- only find your shiny new I<.perl> files (and all files with unrecognized extension
- and perl on the shebang line).
-
-@@ -586,7 +587,7 @@
+-In addition to filtering based on extension (like ack 1.x allowed), ack 2
++In addition to filtering based on extension (like ack-grep 1.x allowed), ack-grep 2
+ offers additional filter types. The generic syntax is
+ I<--type-set TYPE:FILTER:FILTERARGS>; I<FILTERARGS> depends on the value
+ of I<FILTER>.
+@@ -1578,7 +1578,7 @@
=head1 ENVIRONMENT VARIABLES
--For commonly-used ack options, environment variables can make life much easier.
-+For commonly-used ack-grep options, environment variables can make life much easier.
- These variables are ignored if B<--noenv> is specified on the command line.
+-For commonly-used ack options, environment variables can make life
++For commonly-used ack-grep options, environment variables can make life
+ much easier. These variables are ignored if B<--noenv> is specified
+ on the command line.
- =over 4
-@@ -594,7 +595,7 @@
+@@ -1587,7 +1587,7 @@
=item ACKRC
- Specifies the location of the F<.ackrc> file. If this file doesn't
+ Specifies the location of the user's F<.ackrc> file. If this file doesn't
-exist, F<ack> looks in the default location.
+exist, F<ack-grep> looks in the default location.
=item ACK_OPTIONS
-@@ -637,11 +638,11 @@
+@@ -1630,11 +1630,11 @@
=item ACK_PAGER
Specifies a pager program, such as C<more>, C<less> or C<most>, to which
@@ -293,7 +317,7 @@ Index: ack-grep/ack-base
C<ACK_PAGER_COLOR> overrides C<ACK_PAGER> if both are specified.
-@@ -659,13 +660,13 @@
+@@ -1652,18 +1652,18 @@
=head2 Vim integration
@@ -302,16 +326,23 @@ Index: ack-grep/ack-base
+F<ack-grep> integrates easily with the Vim text editor. Set this in your
+F<.vimrc> to use F<ack-grep> instead of F<grep>:
-- set grepprg=ack\ -a
-+ set grepprg=ack-grep\ -a
+- set grepprg=ack\ -k
++ set grepprg=ack-grep\ -k
- That examples uses C<-a> to search through all files, but you may
--use other default flags. Now you can search with F<ack> and easily
-+use other default flags. Now you can search with F<ack-grep> and easily
- step through the results in Vim:
+-That example uses C<-k> to search through only files of the types ack
++That example uses C<-k> to search through only files of the types ack-grep
+ knows about, but you may use other default flags. Now you can search
+-with F<ack> and easily step through the results in Vim:
++with F<ack-grep> and easily step through the results in Vim:
:grep Dumper perllib
-@@ -683,13 +684,13 @@
+
+-Miles Sterrett has written a Vim plugin for F<ack> which allows you to use
++Miles Sterrett has written a Vim plugin for F<ack-grep> which allows you to use
+ C<:Ack> instead of C<:grep>, as well as several other advanced features.
+
+ L<https://github.com/mileszs/ack.vim>
+@@ -1681,13 +1681,13 @@
Pedro Melo is a TextMate user who writes "I spend my day mostly
inside TextMate, and the built-in find-in-project sucks with large
projects. So I hacked a TextMate command that was using find +
@@ -327,7 +358,7 @@ Index: ack-grep/ack-base
shell return or exit code of 0 only if something is found and 1 if
no match is found.
-@@ -702,9 +703,9 @@
+@@ -1700,9 +1700,9 @@
=cut
@@ -339,23 +370,23 @@ Index: ack-grep/ack-base
=head2 Use B<--noenv>
-@@ -715,8 +716,8 @@
- =head2 Use B<-f> to see what files you're scanning
+@@ -1712,8 +1712,8 @@
- The reason I created B<-f> in the first place was as a debugging
--tool. If ack is not finding matches you think it should find, run
--F<ack -f> to see what files are being checked.
-+tool. If ack-grep is not finding matches you think it should find, run
-+F<ack-grep -f> to see what files are being checked.
+ =head2 Use B<-f> to see what files have been selected
- =head1 TIPS
+-Ack's B<-f> was originally added as a debugging tool. If ack is
+-not finding matches you think it should find, run F<ack -f> to see
++Ack's B<-f> was originally added as a debugging tool. If ack-grep is
++not finding matches you think it should find, run F<ack-grep -f> to see
+ what files have been selected. You can also add the C<--show-types>
+ options to show the type of each file selected.
-@@ -729,16 +730,16 @@
+@@ -1734,16 +1734,16 @@
=head2 Use F<-f> for working with big codesets
-Ack does more than search files. C<ack -f --perl> will create a
-+Ack-Grep does more than search files. C<ack-grep -f --perl> will create a
++Ack does more than search files. C<ack-grep -f --perl> will create a
list of all the Perl files in a tree, ideal for sending into F<xargs>.
For example:
@@ -365,12 +396,12 @@ Index: ack-grep/ack-base
or if you prefer:
-- perl -p -i -e's/this/thatg/' $(ack -f --perl)
-+ perl -p -i -e's/this/thatg/' $(ack-grep -f --perl)
+- perl -p -i -e's/this/that/g' $(ack -f --perl)
++ perl -p -i -e's/this/that/g' $(ack-grep -f --perl)
=head2 Use F<-Q> when in doubt about metacharacters
-@@ -747,15 +748,15 @@
+@@ -1752,15 +1752,15 @@
the -Q to avoid false positives without all the backslashing. See
the following example for more...
@@ -390,7 +421,16 @@ Index: ack-grep/ack-base
IP. The second finds the match on my troublesome GIF, and shows
the previous five lines from the log in each case.
-@@ -766,46 +767,46 @@
+@@ -1801,7 +1801,7 @@
+
+ This shows how to pick out particular parts of a match using ( ) within regular expression.
+
+- ack '=head(\d+)\s+(.*)' --output=' $1 : $2'
++ ack-grep '=head(\d+)\s+(.*)' --output=' $1 : $2'
+ input file contains "=head1 NAME"
+ output "1 : NAME"
+
+@@ -1812,56 +1812,56 @@
=head1 FAQ
@@ -453,9 +493,12 @@ Index: ack-grep/ack-base
-=head2 Can you make ack recognize F<.xyz> files?
+=head2 Can you make ack-grep recognize F<.xyz> files?
- That's an enhancement. Please see the section in the manual about
- enhancements.
-@@ -814,7 +815,7 @@
+ Yes! Please see L</"Defining your own types">. If you think
+-that F<ack> should recognize a type by default, please see
++that F<ack-grep> should recognize a type by default, please see
+ L</"ENHANCEMENTS">.
+
+ =head2 There's already a program/package called ack.
Yes, I know.
@@ -464,7 +507,7 @@ Index: ack-grep/ack-base
The name of the program is "ack". Some packagers have called it
"ack-grep" when creating packages because there's already a package
-@@ -835,7 +836,7 @@
+@@ -1890,15 +1890,15 @@
=head2 Can I do multi-line regexes?
@@ -473,7 +516,114 @@ Index: ack-grep/ack-base
so would require reading in the entire file at a time.
If you want to see lines near your match, use the C<--A>, C<--B>
-@@ -855,9 +856,9 @@
+ and C<--C> switches for displaying context.
+
+-=head2 Why is ack telling me I have an invalid option when searching for C<+foo>?
++=head2 Why is ack-grep telling me I have an invalid option when searching for C<+foo>?
+
+-ack treats command line options beginning with C<+> or C<-> as options; if you
++ack-grep treats command line options beginning with C<+> or C<-> as options; if you
+ would like to search for these, you may prefix your search term with C<--> or
+ use the C<--match> option. (However, don't forget that C<+> is a regular
+ expression metacharacter!)
+@@ -1956,7 +1956,7 @@
+
+ =head1 DIFFERENCES BETWEEN ACK 1.X AND ACK 2.X
+
+-A lot of changes were made for ack 2; here is a list of them.
++A lot of changes were made for ack-grep 2; here is a list of them.
+
+ =head2 GENERAL CHANGES
+
+@@ -1964,11 +1964,11 @@
+
+ =item *
+
+-When no selectors are specified, ack 1.x only searches through files that
+-it can map to a file type. ack 2.x, by constrast, will search through
++When no selectors are specified, ack-grep 1.x only searches through files that
++it can map to a file type. ack-grep 2.x, by constrast, will search through
+ every regular, non-binary file that is not explicitly ignored via
+ B<--ignore-file> or B<--ignore-dir>. This is similar to the behavior of the
+-B<-a/--all> option in ack 1.x.
++B<-a/--all> option in ack-grep 1.x.
+
+ =item *
+
+@@ -1978,12 +1978,12 @@
+
+ =item *
+
+-ack now loads multiple ackrc files; see L</"ACKRC LOCATION SEMANTICS"> for
++ack-grep now loads multiple ackrc files; see L</"ACKRC LOCATION SEMANTICS"> for
+ details.
+
+ =item *
+
+-ack's default filter definitions aren't special; you may tell ack to
++ack-grep's default filter definitions aren't special; you may tell ack-grep to
+ completely disregard them if you don't like them.
+
+ =back
+@@ -1996,15 +1996,15 @@
+
+ Because of the change in default search behavior, the B<-a/--all> and
+ B<-u/--unrestricted> options have been removed. In addition, the
+-B<-k/--known-types> option was added to cause ack to behave with
+-the default search behavior of ack 1.x.
++B<-k/--known-types> option was added to cause ack-grep to behave with
++the default search behavior of ack-grep 1.x.
+
+ =item *
+
+ The B<-G> option has been removed. Two regular expressions on the
+ command line was considered too confusing; to simulate B<-G>'s functionality,
+ you may use the new B<-x> option to pipe filenames from one invocation of
+-ack into another.
++ack-grep into another.
+
+ =item *
+
+@@ -2047,12 +2047,12 @@
+
+ =item *
+
+-B<-x> was added to tell ack to accept a list of filenames via standard input;
++B<-x> was added to tell ack-grep to accept a list of filenames via standard input;
+ this list is the list of filenames that will be used for the search.
+
+ =item *
+
+-B<-s> was added to tell ack to suppress error messages about non-existent or
++B<-s> was added to tell ack-grep to suppress error messages about non-existent or
+ unreadable files.
+
+ =item *
+@@ -2073,7 +2073,7 @@
+ =item *
+
+ B<--create-ackrc> was added so that users may create custom ackrc files based
+-on the default settings loaded by ack, and so that users may easily view those
++on the default settings loaded by ack-grep, and so that users may easily view those
+ defaults.
+
+ =item *
+@@ -2082,12 +2082,12 @@
+
+ =item *
+
+-B<--ignore-ack-defaults> was added so that users may ignore ack's default
++B<--ignore-ack-defaults> was added so that users may ignore ack-grep's default
+ options in favor of their own.
+
+ =item *
+
+-B<--bar> was added so ack users may consult Admiral Ackbar.
++B<--bar> was added so ack-grep users may consult Admiral Ackbar.
+
+ =back
+
+@@ -2105,9 +2105,9 @@
All enhancement requests MUST first be posted to the ack-users
mailing list at L<http://groups.google.com/group/ack-users>. I
will not consider a request without it first getting seen by other
@@ -482,10 +632,10 @@ Index: ack-grep/ack-base
-There is a list of enhancements I want to make to F<ack> in the ack
+There is a list of enhancements I want to make to F<ack-grep> in the ack
- issues list at Github: L<http://github.com/petdance/ack/issues>
+ issues list at Github: L<https://github.com/petdance/ack2/issues>
Patches are always welcome, but patches with tests get the most
-@@ -865,7 +866,7 @@
+@@ -2115,7 +2115,7 @@
=head1 SUPPORT
@@ -494,129 +644,152 @@ Index: ack-grep/ack-base
=over 4
-@@ -899,7 +900,7 @@
+@@ -2153,7 +2153,7 @@
How appropriate to have I<ack>nowledgements!
-Thanks to everyone who has contributed to ack in any way, including
+Thanks to everyone who has contributed to ack-grep in any way, including
- Matthew Wild,
- Scott Kyle,
- Nick Hooey,
-Index: ack-grep/Ack.pm
-===================================================================
---- ack-grep.orig/Ack.pm 2012-06-03 22:39:44.000000000 -0700
-+++ ack-grep/Ack.pm 2012-06-03 22:45:21.000000000 -0700
-@@ -19,9 +19,11 @@
-
- our $VERSION;
- our $COPYRIGHT;
-+our $debian_internal_name;
- BEGIN {
- $VERSION = '1.96';
- $COPYRIGHT = 'Copyright 2005-2011 Andy Lester.';
-+ $debian_internal_name = 'ack-grep';
+ Dale Sedivic,
+ Michael McClimon,
+ Andrew Black,
+--- a/Ack.pm
++++ b/Ack.pm
+@@ -55,9 +55,9 @@
+
+ =head1 SYNOPSIS
+
+-If you want to know about the F<ack> program, see the F<ack> file itself.
++If you want to know about the F<ack-grep> program, see the F<ack-grep> file itself.
+
+-No user-serviceable parts inside. F<ack> is all that should use this.
++No user-serviceable parts inside. F<ack-grep> is all that should use this.
+
+ =head1 FUNCTIONS
+
+@@ -79,7 +79,7 @@
+
+ =head2 warn( @_ )
+
+-Put out an ack-specific warning.
++Put out an ack-grep-specific warning.
+
+ =cut
+
+@@ -89,7 +89,7 @@
+
+ =head2 die( @_ )
+
+-Die in an ack-specific way.
++Die in an ack-grep-specific way.
+
+ =cut
+
+@@ -121,7 +121,7 @@
+
+ sub _thpppt {
+ my $y = _get_thpppt();
+- App::Ack::print( "$y ack $_[0]!\n" );
++ App::Ack::print( "$y ack-grep $_[0]!\n" );
+ exit 0;
}
- our $fh;
-@@ -293,7 +295,7 @@
- my $parser = Getopt::Long::Parser->new();
- $parser->configure( 'bundling', 'no_ignore_case', );
- $parser->getoptions( %{$getopt_specs} ) or
-- App::Ack::die( 'See ack --help, ack --help-types or ack --man for options.' );
-+ App::Ack::die( "See $debian_internal_name --help, $debian_internal_name --help-types or $debian_internal_name --man for options." );
-
- my $to_screen = not output_to_pipe();
- my %defaults = (
-@@ -389,7 +391,7 @@
- $parser->getoptions(
- 'type-set=s' => sub { shift; push @typedef, ['c', shift] },
- 'type-add=s' => sub { shift; push @typedef, ['a', shift] },
-- ) or App::Ack::die( 'See ack --help or ack --man for options.' );
-+ ) or App::Ack::die( "See $debian_internal_name --help or $debian_internal_name --man for options." );
-
- for my $td (@typedef) {
- my ($type, $ext) = split /=/, $td->[1];
-@@ -702,18 +704,18 @@
- my $ignore_dirs = _listify( sort { _key($a) cmp _key($b) } keys %ignore_dirs );
+@@ -185,11 +185,11 @@
+ return show_help_types() if $help_arg =~ /^types?/;
App::Ack::print( <<"END_OF_HELP" );
--Usage: ack [OPTION]... PATTERN [FILE]
-+Usage: $debian_internal_name [OPTION]... PATTERN [FILE]
+-Usage: ack [OPTION]... PATTERN [FILES OR DIRECTORIES]
++Usage: ack-grep [OPTION]... PATTERN [FILES OR DIRECTORIES]
- Search for PATTERN in each source file in the tree from cwd on down.
- If [FILES] is specified, then only those files/directories are checked.
--ack may also search STDIN, but only if no FILE are specified, or if
-+$debian_internal_name may also search STDIN, but only if no FILE are specified, or if
- one of FILES is "-".
+ Search for PATTERN in each source file in the tree from the current
+ directory on down. If any files or directories are specified, then
+-only those files and directories are checked. ack may also search
++only those files and directories are checked. ack-grep may also search
+ STDIN, but only if no file or directory arguments are specified,
+ or if one of them is "-".
- Default switches may be specified in ACK_OPTIONS environment variable or
+@@ -197,7 +197,7 @@
an .ackrc file. If you want no dependency on the environment, turn it
off with --noenv.
-Example: ack -i select
-+Example: $debian_internal_name -i select
++Example: ack-grep -i select
Searching:
- -i, --ignore-case Ignore case distinctions in PATTERN
-@@ -756,7 +758,7 @@
- only works with -f, -g, -l, -L or -c.
+ -i, --ignore-case Ignore case distinctions in PATTERN
+@@ -240,7 +240,7 @@
+
File presentation:
-- --pager=COMMAND Pipes all ack output through COMMAND. For example,
-+ --pager=COMMAND Pipes all $debian_internal_name output through COMMAND. For example,
- --pager="less -R". Ignored if output is redirected.
- --nopager Do not send output through a pager. Cancels any
- setting in ~/.ackrc, ACK_PAGER or ACK_PAGER_COLOR.
-@@ -772,7 +774,7 @@
+- --pager=COMMAND Pipes all ack output through COMMAND. For example,
++ --pager=COMMAND Pipes all ack-grep output through COMMAND. For example,
+ --pager="less -R". Ignored if output is redirected.
+ --nopager Do not send output through a pager. Cancels any
+ setting in ~/.ackrc, ACK_PAGER or ACK_PAGER_COLOR.
+@@ -256,7 +256,7 @@
--color-filename=COLOR
--color-match=COLOR
- --color-lineno=COLOR Set the color for filenames, matches, and line numbers.
-- --flush Flush output immediately, even when ack is used
-+ --flush Flush output immediately, even when $debian_internal_name is used
- non-interactively (when output goes to a pipe or
- file).
-
-@@ -789,7 +791,7 @@
- Ignores CVS, .svn and other ignored directories
- -u, --unrestricted All files and directories searched
- --[no]ignore-dir=name Add/Remove directory from the list of ignored dirs
-- -r, -R, --recurse Recurse into subdirectories (ack's default behavior)
-+ -r, -R, --recurse Recurse into subdirectories ($debian_internal_name's default behavior)
- -n, --no-recurse No descending into subdirectories
- -G REGEX Only search files that match REGEX
-
-@@ -797,7 +799,7 @@
- --type=perl Include only Perl files.
- --noperl Exclude Perl files.
- --type=noperl Exclude Perl files.
-- See "ack --help type" for supported filetypes.
-+ See "$debian_internal_name --help type" for supported filetypes.
-
- --type-set TYPE=.EXTENSION[,.EXT2[,...]]
- Files with the given EXTENSION(s) are recognized as
-@@ -828,7 +830,7 @@
+ --color-lineno=COLOR Set the color for filenames, matches, and line numbers.
+- --flush Flush output immediately, even when ack is used
++ --flush Flush output immediately, even when ack-grep is used
+ non-interactively (when output goes to a pipe or
+ file).
+
+@@ -274,14 +274,14 @@
+ --[no]ignore-dir=name Add/Remove directory from the list of ignored dirs
+ --[no]ignore-directory=name Synonym for ignore-dir
+ --ignore-file=filter Add filter for ignoring files
+- -r, -R, --recurse Recurse into subdirectories (ack's default behavior)
++ -r, -R, --recurse Recurse into subdirectories (ack-grep's default behavior)
+ -n, --no-recurse No descending into subdirectories
+ --[no]follow Follow symlinks. Default is off.
+- -k, --known-types Include only files with types that ack recognizes.
++ -k, --known-types Include only files with types that ack-grep recognizes.
+
+ --type=X Include only X files, where X is a recognized filetype.
+ --type=noX Exclude X files.
+- See "ack --help-types" for supported filetypes.
++ See "ack-grep --help-types" for supported filetypes.
+
+ File type specification:
+ --type-set TYPE:FILTER:FILTERARGS
+@@ -297,12 +297,12 @@
+ Miscellaneous:
+ --[no]env Ignore environment variables and global ackrc files. --env is legal but redundant.
+ --ackrc=filename Specify an ackrc file to use
+- --ignore-ack-defaults Ignore the default definitions that ack includes.
++ --ignore-ack-defaults Ignore the default definitions that ack-grep includes.
+ --create-ackrc Outputs a default ackrc for your customization to standard output.
+ --help, -? This help
+ --help-types Display all known types
+ --dump Dump information on which options are loaded from which RC files
+- --[no]filter Force ack to treat standard input as a pipe (--filter) or tty (--nofilter)
++ --[no]filter Force ack-grep to treat standard input as a pipe (--filter) or tty (--nofilter)
+ --man Man page
+ --version Display version & copyright
+ --thpppt Bill the Cat
+@@ -310,7 +310,7 @@
Exit status is 0 if match, 1 if no match.
-This is version $VERSION of ack.
-+This is version $VERSION of $debian_internal_name.
++This is version $VERSION of ack-grep.
END_OF_HELP
return;
-@@ -843,9 +845,9 @@
+@@ -325,9 +325,9 @@
sub show_help_types {
App::Ack::print( <<'END_OF_HELP' );
--Usage: ack [OPTION]... PATTERN [FILES]
-+Usage: ack-grep [OPTION]... PATTERN [FILES]
+-Usage: ack [OPTION]... PATTERN [FILES OR DIRECTORIES]
++Usage: ack-grep [OPTION]... PATTERN [FILES OR DIRECTORIES]
-The following is the list of filetypes supported by ack. You can
+The following is the list of filetypes supported by ack-grep. You can
specify a file type with the --type=TYPE format, or the --TYPE
format. For example, both --type=perl and --perl work.
-@@ -888,7 +890,7 @@
+@@ -368,7 +368,7 @@
=head2 get_version_statement
@@ -625,16 +798,16 @@ Index: ack-grep/Ack.pm
=cut
-@@ -904,7 +906,7 @@
- my $ver = sprintf( '%vd', $^V );
+@@ -386,7 +386,7 @@
+ my $git_revision = $GIT_REVISION ? " (git commit $GIT_REVISION)" : '';
return <<"END_OF_VERSION";
--ack $VERSION
-+$debian_internal_name $VERSION
+-ack ${VERSION}${git_revision}
++ack-grep ${VERSION}${git_revision}
Running under Perl $ver at $this_perl
$copyright
-@@ -916,7 +918,7 @@
+@@ -398,7 +398,7 @@
=head2 print_version_statement
@@ -643,7 +816,7 @@ Index: ack-grep/Ack.pm
=cut
-@@ -928,7 +930,7 @@
+@@ -410,7 +410,7 @@
=head2 get_copyright
@@ -652,16 +825,7 @@ Index: ack-grep/Ack.pm
=cut
-@@ -1587,7 +1589,7 @@
-
- =head2 input_from_pipe()
-
--Returns true if ack's input is coming from a pipe.
-+Returns true if ack-grep's input is coming from a pipe.
-
- =cut
-
-@@ -1598,7 +1600,7 @@
+@@ -479,7 +479,7 @@
=head2 output_to_pipe()
--
Packaging of ack-grep in Debian
More information about the Pkg-perl-cvs-commits
mailing list