[ack-grep] 01/01: Refresh debian/patches/app-rename
Axel Beckert
abe at deuxchevaux.org
Wed Aug 28 20:40:49 UTC 2013
This is an automated email from the git hooks/post-receive script.
abe pushed a commit to branch master
in repository ack-grep.
commit 2bda8dda7d3e0ab9abbd7e27973dc30cfe42d29d
Author: Axel Beckert <abe at deuxchevaux.org>
Date: Wed Aug 28 22:40:32 2013 +0200
Refresh debian/patches/app-rename
Builds again
---
debian/changelog | 3 +-
debian/patches/app-rename | 217 ++++++++++++++++++++-------------------------
2 files changed, 99 insertions(+), 121 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2cdc3d1..cb6e856 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,9 @@
ack-grep (2.08-1) UNRELEASED; urgency=low
- TODO: Refresh debian/patches/app-rename
-
* New upstream release
+ ACK_PAGER + ACK_PAGER_COLOR now work as advertised (Closes: #709367)
+ Removed debian/patches/spelling.patch, fixed upstream.
+ + Refresh debian/patches/app-rename
-- Axel Beckert <abe at debian.org> Wed, 28 Aug 2013 21:44:15 +0200
diff --git a/debian/patches/app-rename b/debian/patches/app-rename
index 982a3b4..72480a5 100644
--- a/debian/patches/app-rename
+++ b/debian/patches/app-rename
@@ -4,9 +4,11 @@ Author: Ryan Niebur <ryan at debian.org>
Reviewed-by: gregor herrmann <gregoa at debian.org>
Last-Update: 2013-05-11
---- a/ack
-+++ b/ack
-@@ -1023,12 +1023,12 @@
+Index: ack-grep/ack
+===================================================================
+--- ack-grep.orig/ack 2013-08-28 22:33:28.000000000 +0200
++++ ack-grep/ack 2013-08-28 22:33:28.000000000 +0200
+@@ -1031,12 +1031,12 @@
=head1 NAME
@@ -22,7 +24,7 @@ Last-Update: 2013-05-11
=head1 DESCRIPTION
-@@ -1036,7 +1036,7 @@
+@@ -1044,7 +1044,7 @@
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
@@ -31,7 +33,7 @@ Last-Update: 2013-05-11
PATTERN is a Perl regular expression. Perl regular expressions
are commonly found in other programming languages, but for the particulars
-@@ -1044,25 +1044,25 @@
+@@ -1052,25 +1052,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
@@ -62,7 +64,7 @@ Last-Update: 2013-05-11
are not explicitly excluded by B<--ignore-dir> and B<--ignore-file>
options, either present in F<ackrc> files or on the command line.
-@@ -1079,15 +1079,15 @@
+@@ -1087,15 +1087,15 @@
=back
@@ -82,7 +84,7 @@ Last-Update: 2013-05-11
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
-@@ -1096,11 +1096,11 @@
+@@ -1104,11 +1104,11 @@
to add/remove multiple directories from the ignore list.
For a complete list of directories that do not get searched, run
@@ -96,7 +98,7 @@ Last-Update: 2013-05-11
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
-@@ -1137,7 +1137,7 @@
+@@ -1149,7 +1149,7 @@
number of lines for each file that has lines matching. Without
B<-l>, some line counts may be zeroes.
@@ -105,7 +107,7 @@ Last-Update: 2013-05-11
count.
=item B<--[no]color>, B<--[no]colour>
-@@ -1168,7 +1168,7 @@
+@@ -1180,7 +1180,7 @@
=item B<--create-ackrc>
@@ -114,7 +116,7 @@ Last-Update: 2013-05-11
when you want to customize the defaults.
=item B<--dump>
-@@ -1179,13 +1179,13 @@
+@@ -1191,13 +1191,13 @@
=item B<--[no]env>
B<--noenv> disables all environment processing. No F<.ackrc> is
@@ -130,16 +132,16 @@ Last-Update: 2013-05-11
file).
=item B<-f>
-@@ -1202,7 +1202,7 @@
+@@ -1214,7 +1214,7 @@
=item B<--[no]filter>
--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.
+-Forces ack to act as if it were receiving input via a pipe.
++Forces ack-grep to act as if it were receiving input via a pipe.
=item B<--[no]follow>
-@@ -1252,9 +1252,9 @@
+@@ -1264,9 +1264,9 @@
=item B<--ignore-ack-defaults>
@@ -151,7 +153,7 @@ Last-Update: 2013-05-11
=item B<--[no]ignore-dir=I<DIRNAME>>, B<--[no]ignore-directory=I<DIRNAME>>
-@@ -1267,7 +1267,7 @@
+@@ -1279,7 +1279,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
@@ -160,7 +162,7 @@ Last-Update: 2013-05-11
line.
=item B<--ignore-file=I<FILTERTYPE:FILTERARGS>>
-@@ -1277,8 +1277,8 @@
+@@ -1289,8 +1289,8 @@
=item B<-k>, B<--known-types>
@@ -171,7 +173,7 @@ Last-Update: 2013-05-11
=item B<--lines=I<NUM>>
-@@ -1302,8 +1302,8 @@
+@@ -1314,8 +1314,8 @@
same set of files.
# search for foo and bar in given files
@@ -182,7 +184,7 @@ Last-Update: 2013-05-11
=item B<-m=I<NUM>>, B<--max-count=I<NUM>>
-@@ -1331,7 +1331,7 @@
+@@ -1343,7 +1343,7 @@
=item B<--pager=I<program>>, B<--nopager>
@@ -191,7 +193,7 @@ Last-Update: 2013-05-11
via the C<ACK_PAGER> and C<ACK_PAGER_COLOR> environment variables.
Using --pager does not suppress grouping and coloring like piping
-@@ -1347,7 +1347,7 @@
+@@ -1359,7 +1359,7 @@
still seeing the entire file, as in:
# Watch a log file, and highlight a certain IP address
@@ -200,7 +202,7 @@ Last-Update: 2013-05-11
=item B<--print0>
-@@ -1356,7 +1356,7 @@
+@@ -1368,7 +1368,7 @@
helpful when dealing with filenames that contain whitespace, e.g.
# remove all files of type html
@@ -209,7 +211,7 @@ Last-Update: 2013-05-11
=item B<-Q>, B<--literal>
-@@ -1383,11 +1383,11 @@
+@@ -1395,11 +1395,11 @@
=item B<--sort-files>
Sorts the found files lexicographically. Use this if you want your file
@@ -223,7 +225,7 @@ Last-Update: 2013-05-11
Works with B<-f> and B<-g> options.
-@@ -1404,7 +1404,7 @@
+@@ -1416,7 +1416,7 @@
Type specifications can be repeated and are ORed together.
@@ -232,7 +234,7 @@ Last-Update: 2013-05-11
=item B<--type-add I<TYPE>:I<FILTER>:I<FILTERARGS>>
-@@ -1481,33 +1481,33 @@
+@@ -1497,33 +1497,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>.
@@ -273,7 +275,7 @@ Last-Update: 2013-05-11
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
-@@ -1526,9 +1526,9 @@
+@@ -1542,9 +1542,9 @@
In order to see all currently defined types, use I<--help-types>, e.g.
@@ -285,7 +287,7 @@ Last-Update: 2013-05-11
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 @@
+@@ -1594,7 +1594,7 @@
=head1 ENVIRONMENT VARIABLES
@@ -294,7 +296,7 @@ Last-Update: 2013-05-11
much easier. These variables are ignored if B<--noenv> is specified
on the command line.
-@@ -1587,7 +1587,7 @@
+@@ -1603,7 +1603,7 @@
=item ACKRC
Specifies the location of the user's F<.ackrc> file. If this file doesn't
@@ -303,7 +305,7 @@ Last-Update: 2013-05-11
=item ACK_OPTIONS
-@@ -1630,11 +1630,11 @@
+@@ -1646,11 +1646,11 @@
=item ACK_PAGER
Specifies a pager program, such as C<more>, C<less> or C<most>, to which
@@ -317,7 +319,7 @@ Last-Update: 2013-05-11
C<ACK_PAGER_COLOR> overrides C<ACK_PAGER> if both are specified.
-@@ -1652,18 +1652,18 @@
+@@ -1668,18 +1668,18 @@
=head2 Vim integration
@@ -342,7 +344,7 @@ Last-Update: 2013-05-11
C<:Ack> instead of C<:grep>, as well as several other advanced features.
L<https://github.com/mileszs/ack.vim>
-@@ -1681,13 +1681,13 @@
+@@ -1697,13 +1697,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 +
@@ -358,7 +360,7 @@ Last-Update: 2013-05-11
shell return or exit code of 0 only if something is found and 1 if
no match is found.
-@@ -1700,9 +1700,9 @@
+@@ -1716,9 +1716,9 @@
=cut
@@ -370,7 +372,7 @@ Last-Update: 2013-05-11
=head2 Use B<--noenv>
-@@ -1712,8 +1712,8 @@
+@@ -1728,8 +1728,8 @@
=head2 Use B<-f> to see what files have been selected
@@ -381,7 +383,7 @@ Last-Update: 2013-05-11
what files have been selected. You can also add the C<--show-types>
options to show the type of each file selected.
-@@ -1734,16 +1734,16 @@
+@@ -1750,16 +1750,16 @@
=head2 Use F<-f> for working with big codesets
@@ -401,7 +403,7 @@ Last-Update: 2013-05-11
=head2 Use F<-Q> when in doubt about metacharacters
-@@ -1752,15 +1752,15 @@
+@@ -1768,15 +1768,15 @@
the -Q to avoid false positives without all the backslashing. See
the following example for more...
@@ -421,7 +423,7 @@ Last-Update: 2013-05-11
IP. The second finds the match on my troublesome GIF, and shows
the previous five lines from the log in each case.
-@@ -1801,7 +1801,7 @@
+@@ -1817,7 +1817,7 @@
This shows how to pick out particular parts of a match using ( ) within regular expression.
@@ -430,7 +432,7 @@ Last-Update: 2013-05-11
input file contains "=head1 NAME"
output "1 : NAME"
-@@ -1812,56 +1812,56 @@
+@@ -1828,39 +1828,39 @@
=head1 FAQ
@@ -446,33 +448,9 @@ Last-Update: 2013-05-11
-Use the C<-f> switch to see a list of files that ack will search
+Use the C<-f> switch to see a list of files that ack-grep will search
- for you.
-
--If you want ack to search files that it doesn't recognize, use the
--C<-a> switch.
-+If you want ack-grep to search files that it doesn't recognize, use
-+the C<-a> switch.
-
--If you want ack to search every file, even ones that it always
-+If you want ack-grep to search every file, even ones that it always
- ignores like coredumps and backup files, use the C<-u> switch.
-
--=head2 Why does ack ignore unknown files by default?
-+=head2 Why does ack-grep ignore unknown files by default?
-
--ack is designed by a programmer, for programmers, for searching
-+ack-grep is designed by a programmer, for programmers, for searching
- large trees of code. Most codebases have a lot files in them which
- aren't source files (like compiled object files, source control
- metadata, etc), and grep wastes a lot of time searching through all
- of those as well and returning matches from those files.
-
--That's why ack's behavior of not searching things it doesn't recognize
--is one of its greatest strengths: the speed you get from only
--searching the things that you want to be looking at.
-+That's why ack-grep's behavior of not searching things it doesn't
-+recognize is one of its greatest strengths: the speed you get from
-+only searching the things that you want to be looking at.
+ for you. You can use the C<--show-types> switch to show which type
+-ack thinks each file is.
++ack-grep thinks each file is.
-=head2 Wouldn't it be great if F<ack> did search & replace?
+=head2 Wouldn't it be great if F<ack-grep> did search & replace?
@@ -490,8 +468,8 @@ Last-Update: 2013-05-11
- $ perl -i -p -e's/foo/bar/g' $(ack -f --php)
+ $ perl -i -p -e's/foo/bar/g' $(ack-grep -f --php)
--=head2 Can you make ack recognize F<.xyz> files?
-+=head2 Can you make ack-grep recognize F<.xyz> files?
+-=head2 Can I make ack recognize F<.xyz> files?
++=head2 Can I make ack-grep recognize F<.xyz> files?
Yes! Please see L</"Defining your own types">. If you think
-that F<ack> should recognize a type by default, please see
@@ -507,7 +485,7 @@ Last-Update: 2013-05-11
The name of the program is "ack". Some packagers have called it
"ack-grep" when creating packages because there's already a package
-@@ -1890,15 +1890,15 @@
+@@ -1889,15 +1889,15 @@
=head2 Can I do multi-line regexes?
@@ -526,7 +504,7 @@ Last-Update: 2013-05-11
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 @@
+@@ -1966,7 +1966,7 @@
=head1 DIFFERENCES BETWEEN ACK 1.X AND ACK 2.X
@@ -535,14 +513,14 @@ Last-Update: 2013-05-11
=head2 GENERAL CHANGES
-@@ -1964,11 +1964,11 @@
+@@ -1974,11 +1974,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
+-it can map to a file type. ack 2.x, by contrast, 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
++it can map to a file type. ack-grep 2.x, by contrast, 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.
@@ -550,7 +528,7 @@ Last-Update: 2013-05-11
=item *
-@@ -1978,12 +1978,12 @@
+@@ -1988,12 +1988,12 @@
=item *
@@ -565,7 +543,7 @@ Last-Update: 2013-05-11
completely disregard them if you don't like them.
=back
-@@ -1996,15 +1996,15 @@
+@@ -2006,15 +2006,15 @@
Because of the change in default search behavior, the B<-a/--all> and
B<-u/--unrestricted> options have been removed. In addition, the
@@ -584,7 +562,7 @@ Last-Update: 2013-05-11
=item *
-@@ -2047,12 +2047,12 @@
+@@ -2057,12 +2057,12 @@
=item *
@@ -599,7 +577,7 @@ Last-Update: 2013-05-11
unreadable files.
=item *
-@@ -2073,7 +2073,7 @@
+@@ -2083,7 +2083,7 @@
=item *
B<--create-ackrc> was added so that users may create custom ackrc files based
@@ -608,7 +586,7 @@ Last-Update: 2013-05-11
defaults.
=item *
-@@ -2082,12 +2082,12 @@
+@@ -2092,12 +2092,12 @@
=item *
@@ -623,7 +601,7 @@ Last-Update: 2013-05-11
=back
-@@ -2105,9 +2105,9 @@
+@@ -2115,9 +2115,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
@@ -635,7 +613,7 @@ Last-Update: 2013-05-11
issues list at Github: L<https://github.com/petdance/ack2/issues>
Patches are always welcome, but patches with tests get the most
-@@ -2115,7 +2115,7 @@
+@@ -2125,7 +2125,7 @@
=head1 SUPPORT
@@ -644,17 +622,19 @@ Last-Update: 2013-05-11
=over 4
-@@ -2153,7 +2153,7 @@
+@@ -2163,7 +2163,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
- Dale Sedivic,
- Michael McClimon,
- Andrew Black,
---- a/Ack.pm
-+++ b/Ack.pm
+ Charles Lee,
+ Joe McMahon,
+ John Warwick,
+Index: ack-grep/Ack.pm
+===================================================================
+--- ack-grep.orig/Ack.pm 2013-08-28 22:33:28.000000000 +0200
++++ ack-grep/Ack.pm 2013-08-28 22:33:28.000000000 +0200
@@ -55,9 +55,9 @@
=head1 SYNOPSIS
@@ -694,7 +674,7 @@ Last-Update: 2013-05-11
exit 0;
}
-@@ -185,11 +185,11 @@
+@@ -246,11 +246,11 @@
return show_help_types() if $help_arg =~ /^types?/;
App::Ack::print( <<"END_OF_HELP" );
@@ -708,7 +688,7 @@ Last-Update: 2013-05-11
STDIN, but only if no file or directory arguments are specified,
or if one of them is "-".
-@@ -197,7 +197,7 @@
+@@ -258,7 +258,7 @@
an .ackrc file. If you want no dependency on the environment, turn it
off with --noenv.
@@ -717,58 +697,57 @@ Last-Update: 2013-05-11
Searching:
-i, --ignore-case Ignore case distinctions in PATTERN
-@@ -240,7 +240,7 @@
+@@ -301,7 +301,7 @@
File presentation:
-- --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
+- --pager=COMMAND Pipes all ack output through COMMAND. For
++ --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
+@@ -320,7 +320,7 @@
--color-match=COLOR
- --color-lineno=COLOR Set the color for filenames, matches, and line numbers.
+ --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)
+@@ -342,12 +342,12 @@
+ -r, -R, --recurse Recurse into subdirectories (default: on)
-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.
+- -k, --known-types Include only files of types that ack recognizes.
++ -k, --known-types Include only files of types that ack-grep recognizes.
- --type=X Include only X files, where X is a recognized filetype.
+ --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.
+@@ -365,14 +365,14 @@
+ --[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.
+- --ignore-ack-defaults Ignore default definitions included with ack.
++ --ignore-ack-defaults Ignore default definitions included with ack-grep.
+ --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)
+ --dump Dump information on which options are loaded
+ from which RC files
+- --[no]filter Force ack to treat standard input as a pipe
++ --[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 @@
+@@ -382,7 +382,7 @@
Exit status is 0 if match, 1 if no match.
@@ -777,7 +756,7 @@ Last-Update: 2013-05-11
END_OF_HELP
return;
-@@ -325,9 +325,9 @@
+@@ -397,9 +397,9 @@
sub show_help_types {
App::Ack::print( <<'END_OF_HELP' );
@@ -789,7 +768,7 @@ Last-Update: 2013-05-11
specify a file type with the --type=TYPE format, or the --TYPE
format. For example, both --type=perl and --perl work.
-@@ -368,7 +368,7 @@
+@@ -440,7 +440,7 @@
=head2 get_version_statement
@@ -798,7 +777,7 @@ Last-Update: 2013-05-11
=cut
-@@ -386,7 +386,7 @@
+@@ -458,7 +458,7 @@
my $git_revision = $GIT_REVISION ? " (git commit $GIT_REVISION)" : '';
return <<"END_OF_VERSION";
@@ -807,7 +786,7 @@ Last-Update: 2013-05-11
Running under Perl $ver at $this_perl
$copyright
-@@ -398,7 +398,7 @@
+@@ -470,7 +470,7 @@
=head2 print_version_statement
@@ -816,7 +795,7 @@ Last-Update: 2013-05-11
=cut
-@@ -410,7 +410,7 @@
+@@ -482,7 +482,7 @@
=head2 get_copyright
@@ -825,7 +804,7 @@ Last-Update: 2013-05-11
=cut
-@@ -479,7 +479,7 @@
+@@ -551,7 +551,7 @@
=head2 output_to_pipe()
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/ack-grep.git
More information about the Pkg-perl-cvs-commits
mailing list