[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:10 UTC 2012
The following commit has been merged in the master branch:
commit ebf9b26c54337ab90b54c2c6a16b1cdf9ee7d921
Author: Ryan Niebur <ryan at debian.org>
Date: Sun Jun 3 22:09:54 2012 -0700
Fix rename patch to allow displaying the original program name in -- help and --version output when the user has created an ack symlink (Closes: #631208)
diff --git a/debian/changelog b/debian/changelog
index 704b253..1db045e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,11 @@ ack-grep (1.96-1) UNRELEASED; urgency=low
* Transfer maintenance into Debian Perl Group and update Maintainer /
Vcs-* fields to reflect that
* Remove quilt from build deps and use source format 3.0 quilt
+ * Fix rename patch to allow displaying the original program name in --
+ help and --version output when the user has created an ack symlink
+ (Closes: #631208)
- -- Ryan Niebur <ryan at debian.org> Sun, 03 Jun 2012 21:57:46 -0700
+ -- Ryan Niebur <ryan at debian.org> Sun, 03 Jun 2012 22:09:52 -0700
ack-grep (1.92-1) unstable; urgency=low
diff --git a/debian/patches/app-rename b/debian/patches/app-rename
index ac03041..e6b5b00 100644
--- a/debian/patches/app-rename
+++ b/debian/patches/app-rename
@@ -4,8 +4,8 @@ Author: Ryan Niebur <ryan at debian.org>
Index: ack-grep/ack-base
===================================================================
---- ack-grep.orig/ack-base 2012-05-01 09:41:22.000000000 -0700
-+++ ack-grep/ack-base 2012-06-03 21:04:19.000000000 -0700
+--- 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 @@
=head1 NAME
@@ -492,14 +492,14 @@ Index: ack-grep/ack-base
Nick Hooey,
Index: ack-grep/Ack.pm
===================================================================
---- ack-grep.orig/Ack.pm 2012-05-01 09:41:22.000000000 -0700
-+++ ack-grep/Ack.pm 2012-06-03 21:03:50.000000000 -0700
+--- 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 @@
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 ack-grep --help, ack-grep --help-types or ack-grep --man for options.' );
++ App::Ack::die( "See $0 --help, $0 --help-types or $0 --man for options." );
my $to_screen = not output_to_pipe();
my %defaults = (
@@ -508,7 +508,7 @@ Index: ack-grep/Ack.pm
'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 ack-grep --help or ack-grep --man for options.' );
++ ) or App::Ack::die( "See $0 --help or $0 --man for options." );
for my $td (@typedef) {
my ($type, $ext) = split /=/, $td->[1];
@@ -517,12 +517,12 @@ Index: ack-grep/Ack.pm
App::Ack::print( <<"END_OF_HELP" );
-Usage: ack [OPTION]... PATTERN [FILE]
-+Usage: ack-grep [OPTION]... PATTERN [FILE]
++Usage: $0 [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
-+ack-grep 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
one of FILES is "-".
Default switches may be specified in ACK_OPTIONS environment variable or
@@ -530,7 +530,7 @@ Index: ack-grep/Ack.pm
off with --noenv.
-Example: ack -i select
-+Example: ack-grep -i select
++Example: $0 -i select
Searching:
-i, --ignore-case Ignore case distinctions in PATTERN
@@ -539,7 +539,7 @@ Index: ack-grep/Ack.pm
File presentation:
- --pager=COMMAND Pipes all ack output through COMMAND. For example,
-+ --pager=COMMAND Pipes all ack-grep output through COMMAND. For example,
++ --pager=COMMAND Pipes all $0 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.
@@ -548,7 +548,7 @@ Index: ack-grep/Ack.pm
--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 ack-grep is used
++ --flush Flush output immediately, even when $0 is used
non-interactively (when output goes to a pipe or
file).
@@ -557,7 +557,7 @@ Index: ack-grep/Ack.pm
-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 (ack-grep's default behavior)
++ -r, -R, --recurse Recurse into subdirectories ($0's default behavior)
-n, --no-recurse No descending into subdirectories
-G REGEX Only search files that match REGEX
@@ -566,7 +566,7 @@ Index: ack-grep/Ack.pm
--noperl Exclude Perl files.
--type=noperl Exclude Perl files.
- See "ack --help type" for supported filetypes.
-+ See "ack-grep --help type" for supported filetypes.
++ See "$0 --help type" for supported filetypes.
--type-set TYPE=.EXTENSION[,.EXT2[,...]]
Files with the given EXTENSION(s) are recognized as
@@ -575,7 +575,7 @@ Index: ack-grep/Ack.pm
Exit status is 0 if match, 1 if no match.
-This is version $VERSION of ack.
-+This is version $VERSION of ack-grep.
++This is version $VERSION of $0.
END_OF_HELP
return;
@@ -605,7 +605,7 @@ Index: ack-grep/Ack.pm
return <<"END_OF_VERSION";
-ack $VERSION
-+ack-grep $VERSION
++$0 $VERSION
Running under Perl $ver at $this_perl
$copyright
--
Packaging of ack-grep in Debian
More information about the Pkg-perl-cvs-commits
mailing list