[SCM] Packaging of ack-grep in Debian branch, master, updated. debian/1.92-1-23-g4864c94
Ryan Niebur
ryan at debian.org
Mon Jun 4 05:50:12 UTC 2012
The following commit has been merged in the master branch:
commit a4219113a9de4c9bdcc9604682ace96fdbb3734e
Author: Ryan Niebur <ryan at debian.org>
Date: Sun Jun 3 22:48:42 2012 -0700
improve patch to not output full path to binary
diff --git a/debian/patches/app-rename b/debian/patches/app-rename
index e6b5b00..360dced 100644
--- a/debian/patches/app-rename
+++ b/debian/patches/app-rename
@@ -4,9 +4,22 @@ Author: Ryan Niebur <ryan at debian.org>
Index: ack-grep/ack-base
===================================================================
---- ack-grep.orig/ack-base 2012-06-03 21:23:44.000000000 -0700
-+++ ack-grep/ack-base 2012-06-03 22:05:55.000000000 -0700
-@@ -112,39 +112,39 @@
+--- 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 @@
=head1 NAME
@@ -60,7 +73,7 @@ Index: ack-grep/ack-base
including:
=over 4
-@@ -155,13 +155,13 @@
+@@ -155,13 +156,13 @@
=back
@@ -76,7 +89,7 @@ Index: ack-grep/ack-base
specified. 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 +169,11 @@
+@@ -169,11 +170,11 @@
to add/remove multiple directories from the ignore list.
For a complete list of directories that do not get searched, run
@@ -90,7 +103,7 @@ 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 +210,7 @@
+@@ -210,7 +211,7 @@
number of lines for each file that has lines matching. Without
B<-l>, some line counts may be zeroes.
@@ -99,7 +112,7 @@ Index: ack-grep/ack-base
=item B<--color>, B<--nocolor>
-@@ -241,13 +241,13 @@
+@@ -241,13 +242,13 @@
=item B<--env>, B<--noenv>
B<--noenv> disables all environment processing. No F<.ackrc> is read
@@ -115,7 +128,7 @@ Index: ack-grep/ack-base
or file).
=item B<-f>
-@@ -316,8 +316,8 @@
+@@ -316,8 +317,8 @@
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
@@ -126,7 +139,7 @@ Index: ack-grep/ack-base
=item B<--line=I<NUM>>
-@@ -342,8 +342,8 @@
+@@ -342,8 +343,8 @@
same set of files.
# search for foo and bar in given files
@@ -137,7 +150,7 @@ Index: ack-grep/ack-base
=item B<-m=I<NUM>>, B<--max-count=I<NUM>>
-@@ -369,7 +369,7 @@
+@@ -369,7 +370,7 @@
=item B<--pager=I<program>>
@@ -146,7 +159,7 @@ Index: ack-grep/ack-base
via the C<ACK_PAGER> and C<ACK_PAGER_COLOR> environment variables.
Using --pager does not suppress grouping and coloring like piping
-@@ -382,7 +382,7 @@
+@@ -382,7 +383,7 @@
still seeing the entire file, as in:
# Watch a log file, and highlight a certain IP address
@@ -155,7 +168,7 @@ Index: ack-grep/ack-base
=item B<--print0>
-@@ -391,7 +391,7 @@
+@@ -391,7 +392,7 @@
helpful when dealing with filenames that contain whitespace, e.g.
# remove all files of type html
@@ -164,7 +177,7 @@ Index: ack-grep/ack-base
=item B<-Q>, B<--literal>
-@@ -419,11 +419,11 @@
+@@ -419,11 +420,11 @@
=item B<--sort-files>
Sorts the found files lexically. Use this if you want your file
@@ -178,7 +191,7 @@ Index: ack-grep/ack-base
Works with B<-f> and B<-g> options.
-@@ -446,7 +446,7 @@
+@@ -446,7 +447,7 @@
Type specifications can be repeated and are ORed together.
@@ -187,7 +200,7 @@ Index: ack-grep/ack-base
=item B<--type-add I<TYPE>=I<.EXTENSION>[,I<.EXT2>[,...]]>
-@@ -514,7 +514,7 @@
+@@ -514,7 +515,7 @@
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>.
@@ -196,7 +209,7 @@ Index: ack-grep/ack-base
specify another location with the F<ACKRC> variable, below.
If B<--noenv> is specified on the command line, the F<.ackrc> file
-@@ -522,27 +522,27 @@
+@@ -522,27 +523,27 @@
=head1 Defining your own types
@@ -230,7 +243,7 @@ Index: ack-grep/ack-base
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 +561,7 @@
+@@ -561,7 +562,7 @@
In order to see all currently defined types, use I<--help types>, e.g.
@@ -239,7 +252,7 @@ Index: ack-grep/ack-base
Restrictions:
-@@ -578,7 +578,7 @@
+@@ -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
@@ -248,7 +261,7 @@ Index: ack-grep/ack-base
only find your shiny new I<.perl> files (and all files with unrecognized extension
and perl on the shebang line).
-@@ -586,7 +586,7 @@
+@@ -586,7 +587,7 @@
=head1 ENVIRONMENT VARIABLES
@@ -257,7 +270,7 @@ Index: ack-grep/ack-base
These variables are ignored if B<--noenv> is specified on the command line.
=over 4
-@@ -594,7 +594,7 @@
+@@ -594,7 +595,7 @@
=item ACKRC
Specifies the location of the F<.ackrc> file. If this file doesn't
@@ -266,7 +279,7 @@ Index: ack-grep/ack-base
=item ACK_OPTIONS
-@@ -637,11 +637,11 @@
+@@ -637,11 +638,11 @@
=item ACK_PAGER
Specifies a pager program, such as C<more>, C<less> or C<most>, to which
@@ -280,7 +293,7 @@ Index: ack-grep/ack-base
C<ACK_PAGER_COLOR> overrides C<ACK_PAGER> if both are specified.
-@@ -659,13 +659,13 @@
+@@ -659,13 +660,13 @@
=head2 Vim integration
@@ -298,7 +311,7 @@ Index: ack-grep/ack-base
step through the results in Vim:
:grep Dumper perllib
-@@ -683,13 +683,13 @@
+@@ -683,13 +684,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 +
@@ -314,7 +327,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 +702,9 @@
+@@ -702,9 +703,9 @@
=cut
@@ -326,7 +339,7 @@ Index: ack-grep/ack-base
=head2 Use B<--noenv>
-@@ -715,8 +715,8 @@
+@@ -715,8 +716,8 @@
=head2 Use B<-f> to see what files you're scanning
The reason I created B<-f> in the first place was as a debugging
@@ -337,7 +350,7 @@ Index: ack-grep/ack-base
=head1 TIPS
-@@ -729,16 +729,16 @@
+@@ -729,16 +730,16 @@
=head2 Use F<-f> for working with big codesets
@@ -357,7 +370,7 @@ Index: ack-grep/ack-base
=head2 Use F<-Q> when in doubt about metacharacters
-@@ -747,15 +747,15 @@
+@@ -747,15 +748,15 @@
the -Q to avoid false positives without all the backslashing. See
the following example for more...
@@ -377,7 +390,7 @@ 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 +766,46 @@
+@@ -766,46 +767,46 @@
=head1 FAQ
@@ -442,7 +455,7 @@ Index: ack-grep/ack-base
That's an enhancement. Please see the section in the manual about
enhancements.
-@@ -814,7 +814,7 @@
+@@ -814,7 +815,7 @@
Yes, I know.
@@ -451,7 +464,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 +835,7 @@
+@@ -835,7 +836,7 @@
=head2 Can I do multi-line regexes?
@@ -460,7 +473,7 @@ 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 +855,9 @@
+@@ -855,9 +856,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
@@ -472,7 +485,7 @@ Index: ack-grep/ack-base
issues list at Github: L<http://github.com/petdance/ack/issues>
Patches are always welcome, but patches with tests get the most
-@@ -865,7 +865,7 @@
+@@ -865,7 +866,7 @@
=head1 SUPPORT
@@ -481,7 +494,7 @@ Index: ack-grep/ack-base
=over 4
-@@ -899,7 +899,7 @@
+@@ -899,7 +900,7 @@
How appropriate to have I<ack>nowledgements!
@@ -492,37 +505,49 @@ Index: ack-grep/ack-base
Nick Hooey,
Index: ack-grep/Ack.pm
===================================================================
---- ack-grep.orig/Ack.pm 2012-06-03 21:23:44.000000000 -0700
-+++ ack-grep/Ack.pm 2012-06-03 22:09:03.000000000 -0700
-@@ -293,7 +293,7 @@
+--- 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';
+ }
+
+ 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 $0 --help, $0 --help-types or $0 --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 +389,7 @@
+@@ -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 $0 --help or $0 --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 +702,18 @@
+@@ -702,18 +704,18 @@
my $ignore_dirs = _listify( sort { _key($a) cmp _key($b) } keys %ignore_dirs );
App::Ack::print( <<"END_OF_HELP" );
-Usage: ack [OPTION]... PATTERN [FILE]
-+Usage: $0 [OPTION]... PATTERN [FILE]
++Usage: $debian_internal_name [OPTION]... PATTERN [FILE]
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
-+$0 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 "-".
Default switches may be specified in ACK_OPTIONS environment variable or
@@ -530,56 +555,56 @@ Index: ack-grep/Ack.pm
off with --noenv.
-Example: ack -i select
-+Example: $0 -i select
++Example: $debian_internal_name -i select
Searching:
-i, --ignore-case Ignore case distinctions in PATTERN
-@@ -756,7 +756,7 @@
+@@ -756,7 +758,7 @@
only works with -f, -g, -l, -L or -c.
File presentation:
- --pager=COMMAND Pipes all ack output through COMMAND. For example,
-+ --pager=COMMAND Pipes all $0 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 +772,7 @@
+@@ -772,7 +774,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 $0 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 +789,7 @@
+@@ -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 ($0'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 +797,7 @@
+@@ -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 "$0 --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 +828,7 @@
+@@ -828,7 +830,7 @@
Exit status is 0 if match, 1 if no match.
-This is version $VERSION of ack.
-+This is version $VERSION of $0.
++This is version $VERSION of $debian_internal_name.
END_OF_HELP
return;
-@@ -843,9 +843,9 @@
+@@ -843,9 +845,9 @@
sub show_help_types {
App::Ack::print( <<'END_OF_HELP' );
@@ -591,7 +616,7 @@ Index: ack-grep/Ack.pm
specify a file type with the --type=TYPE format, or the --TYPE
format. For example, both --type=perl and --perl work.
-@@ -888,7 +888,7 @@
+@@ -888,7 +890,7 @@
=head2 get_version_statement
@@ -600,16 +625,16 @@ Index: ack-grep/Ack.pm
=cut
-@@ -904,7 +904,7 @@
+@@ -904,7 +906,7 @@
my $ver = sprintf( '%vd', $^V );
return <<"END_OF_VERSION";
-ack $VERSION
-+$0 $VERSION
++$debian_internal_name $VERSION
Running under Perl $ver at $this_perl
$copyright
-@@ -916,7 +916,7 @@
+@@ -916,7 +918,7 @@
=head2 print_version_statement
@@ -618,7 +643,7 @@ Index: ack-grep/Ack.pm
=cut
-@@ -928,7 +928,7 @@
+@@ -928,7 +930,7 @@
=head2 get_copyright
@@ -627,7 +652,7 @@ Index: ack-grep/Ack.pm
=cut
-@@ -1587,7 +1587,7 @@
+@@ -1587,7 +1589,7 @@
=head2 input_from_pipe()
@@ -636,7 +661,7 @@ Index: ack-grep/Ack.pm
=cut
-@@ -1598,7 +1598,7 @@
+@@ -1598,7 +1600,7 @@
=head2 output_to_pipe()
diff --git a/debian/patches/remove-incorrect-documentation b/debian/patches/remove-incorrect-documentation
index 5c77da9..c72ecca 100644
--- a/debian/patches/remove-incorrect-documentation
+++ b/debian/patches/remove-incorrect-documentation
@@ -5,22 +5,22 @@ Forwarded: no
Index: ack-grep/Ack.pm
===================================================================
---- ack-grep.orig/Ack.pm 2012-06-03 22:09:03.000000000 -0700
-+++ ack-grep/Ack.pm 2012-06-03 22:11:42.000000000 -0700
-@@ -706,8 +706,7 @@
+--- ack-grep.orig/Ack.pm 2012-06-03 22:38:34.000000000 -0700
++++ ack-grep/Ack.pm 2012-06-03 22:39:03.000000000 -0700
+@@ -708,8 +708,7 @@
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.
--$0 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 "-".
-+$0 may also search STDIN, but only if no FILE are specified.
++$debian_internal_name may also search STDIN, but only if no FILE are specified.
Default switches may be specified in ACK_OPTIONS environment variable or
an .ackrc file. If you want no dependency on the environment, turn it
Index: ack-grep/ack-base
===================================================================
---- ack-grep.orig/ack-base 2012-06-03 22:05:55.000000000 -0700
-+++ ack-grep/ack-base 2012-06-03 22:12:00.000000000 -0700
+--- ack-grep.orig/ack-base 2012-06-03 22:38:34.000000000 -0700
++++ ack-grep/ack-base 2012-06-03 22:39:03.000000000 -0700
@@ -124,8 +124,8 @@
Ack-Grep is designed as a replacement for 99% of the uses of F<grep>.
--
Packaging of ack-grep in Debian
More information about the Pkg-perl-cvs-commits
mailing list