--- ack-grep-1.90.orig/debian/control +++ ack-grep-1.90/debian/control @@ -0,0 +1,24 @@ +Source: ack-grep +Section: perl +Priority: optional +Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46-7), perl (>= 5.8.8-7), libfile-next-perl, quilt, libtest-differences-perl, libtest-pod-perl, bash-completion +Maintainer: Ryan Niebur +DM-Upload-Allowed: yes +Vcs-Git: git://git.ryan52.info/git/ack-grep +Vcs-Browser: http://git.ryan52.info/?p=ack-grep;a=summary +Homepage: http://search.cpan.org/dist/ack/ +Standards-Version: 3.8.3 + +Package: ack-grep +Architecture: all +Depends: libfile-next-perl, ${perl:Depends}, ${misc:Depends} +Suggests: bash-completion +Description: grep-like program specifically for large source trees + Ack is designed as a replacement for 99% of the uses of grep. ack 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. + . + Ack ignores backup files and files under CVS and .svn directories. It + also highlights matches to help you see where the match was. Ack uses + perl regular expressions. --- ack-grep-1.90.orig/debian/clean +++ ack-grep-1.90/debian/clean @@ -0,0 +1,2 @@ +ack +stderr.log --- ack-grep-1.90.orig/debian/copyright +++ ack-grep-1.90/debian/copyright @@ -0,0 +1,66 @@ +Format-Specification: + http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196 +Upstream-Maintainer: Andy Lester +Upstream-Source: http://search.cpan.org/dist/ack/ +Upstream-Name: ack + +Files: * +Copyright: 2005-2009, Andy Lester +License-Alias: Perl +License: Artistic | GPL-1+ + +Files: debian/* +Copyright: 2007-2008, Peter Makholm + 2009, Ryan Niebur +License: Artistic | GPL-1+ + +Files: t/swamp/parrot.pir, t/swamp/blib/ignore.pir +Copyright: Copyright (C) 2004, The Perl Foundation. +License Artistic + +Files: t/swamp/c-header.h +Copyright: Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, by Larry Wall and others +License: Artistic | GPL-1+ + +Files: t/swamp/c-source.c +Copyright: Copyright (C) 2000, 2001 Free Software Foundation, Inc. +License: GPL-2+ + +Files: t/swamp/Rakefile +Copyright: 2005 by Michael Neumann + 2006-2009 by Aaron Patterson + 2006-2009 by Mike Dalessio +License: GPL-2 + +Files: etc/ack.bash_completion.sh +Copyright: 2008-2009 Adam James +License: Artistic | GPL-1+ + +License: Artistic + This program is free software; you can redistribute it and/or modify + it under the terms of the Artistic License, which comes with Perl. + On Debian GNU/Linux systems, the complete text of the Artistic License + can be found in `/usr/share/common-licenses/Artistic' + +License: GPL-1+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 1, or (at your option) + any later version. + On Debian GNU/Linux systems, the complete text of the GNU General + Public License can be found in `/usr/share/common-licenses/GPL' + +License: GPL-2+ + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + On Debian GNU/Linux systems, the complete text of the GNU General Public + License version 2 can be found in `/usr/share/common-licenses/GPL-2'. + +License: GPL-2 + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; version 2 + On Debian GNU/Linux systems, the complete text of the GNU General Public + License version 2 can be found in `/usr/share/common-licenses/GPL-2'. --- ack-grep-1.90.orig/debian/watch +++ ack-grep-1.90/debian/watch @@ -0,0 +1,3 @@ +# format version number, currently 3; this line is compulsory! +version=3 +http://search.cpan.org/dist/ack/ .*/ack-([0-9.]*).tar.gz --- ack-grep-1.90.orig/debian/compat +++ ack-grep-1.90/debian/compat @@ -0,0 +1 @@ +7 --- ack-grep-1.90.orig/debian/README.source +++ ack-grep-1.90/debian/README.source @@ -0,0 +1,5 @@ +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +See /usr/share/doc/quilt/README.source for a detailed explanation. --- ack-grep-1.90.orig/debian/changelog +++ ack-grep-1.90/debian/changelog @@ -0,0 +1,89 @@ +ack-grep (1.90-1) unstable; urgency=low + + * add missing full stop in long description, thanks to Enrico Zini for + spotting + * don't show dev versions in watch file + * add DMUA field + * New Upstream Version + * refresh patches, removing the bash completion ones (fixed upstream) + * cleanup d/rules + * set Standards-Version to 3.8.3 + * don't test with ack-base, that's broken + + -- Ryan Niebur Mon, 07 Sep 2009 23:29:56 -0700 + +ack-grep (1.88-1) unstable; urgency=low + + * New Upstream Version (Closes: #504071) + * s/.cvs/CVS/ in the long description (Closes: #512137) + * adopt package (Closes: #516778) + * add my Vcs-* headers + * debhelper 7 + * quilt, redo patches from scratch + * run the test (if possible), improved testing + * bump standards version to 3.8.1 + * machine readable copyright format + * add newer version of etc/ack.bash_completion.sh that supports + Debian's name for ack + * install the bash completion + * add README.source + * remove cdbs and patchutils from build deps + * make short Description pass the is a test + * add about highlighting to long description, as that is another very + useful default feature + + -- Ryan Niebur Tue, 17 Mar 2009 17:19:44 -0700 + +ack-grep (1.80-1) unstable; urgency=low + + * New upstream (Closes: #469956) + + -- Peter Makholm Sat, 05 Apr 2008 10:08:27 +0000 + +ack-grep (1.76-1) unstable; urgency=low + + * New upstream + - Don't depend on filesystem order for tests (Closes: #451403) + * Add dependency on perl-doc (Closes: #462320) + - I believe this to be the least intrusive of the suggested + fixes. If anybody is interested in having ack-grep installed + without perl-doc installed please reopen this bug or report a + whishlist bug. + * Bump standards-version (no changes) + * Exclude some test files from being cleaned by dh_clean + + -- Peter Makholm Fri, 25 Jan 2008 16:13:25 +0000 + +ack-grep (1.72-1) unstable; urgency=low + + * New upstream release + - Now recognizes .cc as C++ file extension (Closes: 447853) + + -- Peter Makholm Mon, 12 Nov 2007 07:34:40 +0000 + +ack-grep (1.70-1) unstable; urgency=low + + * New upstream release + + -- Peter Makholm Mon, 05 Nov 2007 17:10:21 +0000 + +ack-grep (1.68-2) unstable; urgency=low + + * Add build dependency on libfile-next-perl (Closes: #447456) + + -- Peter Makholm Tue, 23 Oct 2007 04:17:38 +0000 + +ack-grep (1.68-1) unstable; urgency=low + + * New upstream + * Do not build ack-standalone (cleans the diff) + * Now maintained with Subversion on collab-maint.alioth.debian.org + * Added Vcs-* and Homepage fields to control file + + -- Peter Makholm Wed, 17 Oct 2007 15:51:21 +0000 + +ack-grep (1.66-1) unstable; urgency=low + + * Initial Release (closes: #436101). + + -- Peter Makholm Sun, 07 Oct 2007 13:44:43 +0000 --- ack-grep-1.90.orig/debian/rules +++ ack-grep-1.90/debian/rules @@ -0,0 +1,25 @@ +#!/usr/bin/make -f + +%: + dh --with quilt $@ + +override_dh_auto_test: + # ack behaves differently, causing the tests to fail + [ ! -t 0 ] || dh_auto_test + +override_dh_auto_clean: + [ ! -f Makefile ] || touch Makefile + dh_auto_clean + +override_dh_clean: + dh_clean --exclude=t/swamp/ + # make things partly sane for me :) + [ ! -d .git -o ! -x /usr/bin/git ] || git checkout ack ack-help.txt + +override_dh_fixperms: + mv debian/ack-grep/usr/bin/ack-base debian/ack-grep/usr/bin/ack-grep + mv debian/ack-grep/usr/share/man/man1/ack-base.1p.gz debian/ack-grep/usr/share/man/man1/ack-grep.1p.gz + mv etc/ack.bash_completion.sh debian/ack-grep.bash-completion + dh_bash-completion + mv debian/ack-grep.bash-completion etc/ack.bash_completion.sh + dh_fixperms --- ack-grep-1.90.orig/debian/patches/whatis-entries-for-the-pod +++ ack-grep-1.90/debian/patches/whatis-entries-for-the-pod @@ -0,0 +1,54 @@ +add whatis entries to the generated man pages + +--- a/Basic.pm ++++ b/Basic.pm +@@ -1,8 +1,8 @@ + package App::Ack::Plugin::Basic; + +-=head1 SYNOPSIS ++=head1 NAME + +-Container for the Repository and Resources necessary. ++App::Ack::Plugin::Basic - Container for the Repository and Resources necessary. + + =cut + +--- a/Plugin.pm ++++ b/Plugin.pm +@@ -1,5 +1,9 @@ + package App::Ack::Plugin; + ++=head1 NAME ++ ++App::Ack::Plugin - basic Ack plugins ++ + =head1 OVERVIEW + + The premise is that each file is a repository of zero or more +--- a/Repository.pm ++++ b/Repository.pm +@@ -1,5 +1,11 @@ + package App::Ack::Repository; + ++=head1 NAME ++ ++App::Ack::Repository - base class to represent some data repository (with resources) for ack to search ++ ++=cut ++ + use App::Ack::Resource; + + use warnings; +--- a/Resource.pm ++++ b/Resource.pm +@@ -10,6 +10,10 @@ + Carp::confess( 'Must be overloaded' ); + } + ++=head1 NAME ++ ++App::Ack::Resource - base class to represent a resource for ack to search ++ + =head1 SYNOPSIS + + This is the base class for App::Ack::Resource and any resources --- ack-grep-1.90.orig/debian/patches/use-ack-base +++ ack-grep-1.90/debian/patches/use-ack-base @@ -0,0 +1,24 @@ +install ack-base instead of ack (which includes all dependencies embedded) + +Index: b/Makefile.PL +=================================================================== +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -19,7 +19,7 @@ + 'Basic.pm' => '$(INST_LIBDIR)/App/Ack/Plugin/Basic.pm', + #'Tar.pm' => '$(INST_LIBDIR)/App/Ack/Plugin/Tar.pm', + }, +- EXE_FILES => [ 'ack' ], ++ EXE_FILES => [ 'ack-base' ], + PREREQ_PM => { + 'Test::Harness' => 2.50, # Something reasonably newish + 'Term::ANSIColor' => 0, +@@ -56,7 +56,7 @@ + sub MY::top_targets { + my $str = shift->SUPER::top_targets(@_); + +- $str =~ s/^pure_all.+/$& ack ack-help.txt ack-help-types.txt/m; ++ $str =~ s/^pure_all.+/$& ack-help.txt ack-help-types.txt/m; + + return $str; + } --- ack-grep-1.90.orig/debian/patches/app-rename +++ ack-grep-1.90/debian/patches/app-rename @@ -0,0 +1,462 @@ +rename it (in the POD) to ack-grep + +Index: b/ack-base +=================================================================== +--- a/ack-base ++++ b/ack-base +@@ -98,39 +98,39 @@ + + =head1 NAME + +-ack - grep-like text finder ++ack-grep - grep-like text finder + + =head1 SYNOPSIS + +- ack [options] PATTERN [FILE...] +- ack -f [options] [DIRECTORY...] ++ ack-grep [options] PATTERN [FILE...] ++ ack-grep -f [options] [DIRECTORY...] + + =head1 DESCRIPTION + +-Ack is designed as a replacement for 99% of the uses of F. ++Ack-Grep is designed as a replacement for 99% of the uses of F. + +-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 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. + + =head1 FILE SELECTION + +-I is intelligent about the files it searches. It knows about ++I 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 only searches files of types that +-it recognizes. If you have a file called F, and I +-doesn't know what a .wango file is, I won't search it. ++With no file selections, I only searches files of types that ++it recognizes. If you have a file called F, and I ++doesn't know what a .wango file is, I won't search it. + +-The B<-a> option tells I to select all files, regardless of ++The B<-a> option tells I to select all files, regardless of + type. + +-Some files will never be selected by I, even with B<-a>, ++Some files will never be selected by I, even with B<-a>, + including: + + =over 4 +@@ -141,13 +141,13 @@ + + =back + +-However, I always searches the files given on the command line, ++However, I 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. + + =head1 DIRECTORY SELECTION + +-I descends through the directory tree of the starting directories ++I descends through the directory tree of the starting directories + 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 +@@ -155,11 +155,11 @@ + to add/remove multiple directories from the ignore list. + + For a complete list of directories that do not get searched, run +-F. ++F. + + =head1 WHEN TO USE GREP + +-I trumps I as an everyday tool 99% of the time, but don't ++I trumps I as an everyday tool 99% of the time, but don't + throw I away, because there are times you'll still need it. + + E.g., searching through huge files looking for regexes that can be +@@ -221,13 +221,13 @@ + =item B<--env>, B<--noenv> + + B<--noenv> disables all environment processing. No F<.ackrc> is read +-and all environment variables are ignored. By default, F considers ++and all environment variables are ignored. By default, F 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). + + =item B<-f> +@@ -317,8 +317,8 @@ + same set of files. + + # search for foo and bar in given files +- ack file1 t/file* --match foo +- ack file1 t/file* --match bar ++ ack-grep file1 t/file* --match foo ++ ack-grep file1 t/file* --match bar + + =item B<-m=I>, B<--max-count=I> + +@@ -344,7 +344,7 @@ + + =item B<--pager=I> + +-Direct ack's output through I. This can also be specified ++Direct ack-grep's output through I. This can also be specified + via the C and C environment variables. + + Using --pager does not suppress grouping and coloring like piping +@@ -357,7 +357,7 @@ + still seeing the entire file, as in: + + # Watch a log file, and highlight a certain IP address +- $ tail -f ~/access.log | ack --passthru 123.45.67.89 ++ $ tail -f ~/access.log | ack-grep --passthru 123.45.67.89 + + =item B<--print0> + +@@ -366,7 +366,7 @@ + helpful when dealing with filenames that contain whitespace, e.g. + + # remove all files of type html +- ack -f --html --print0 | xargs -0 rm -f ++ ack-grep -f --html --print0 | xargs -0 rm -f + + =item B<-Q>, B<--literal> + +@@ -389,7 +389,7 @@ + =item B<--sort-files> + + Sorts the found files lexically. Use this if you want your file +-listings to be deterministic between runs of I. ++listings to be deterministic between runs of I. + + =item B<--thpppt> + +@@ -410,7 +410,7 @@ + + Type specifications can be repeated and are ORed together. + +-See I for a list of valid types. ++See I for a list of valid types. + + =item B<--type-add I=I<.EXTENSION>[,I<.EXT2>[,...]]> + +@@ -478,7 +478,7 @@ + as they are not interpreted by the shell. Basically, each I + in the F<.ackrc> file is interpreted as one element of C<@ARGV>. + +-F looks in your home directory for the F<.ackrc>. You can ++F looks in your home directory for the F<.ackrc>. You can + specify another location with the F variable, below. + + If B<--noenv> is specified on the command line, the F<.ackrc> file +@@ -486,27 +486,27 @@ + + =head1 Defining your own types + +-ack allows you to define your own types in addition to the predefined ++ack-grep allows you to define your own types in addition to the predefined + types. This is done with command line options that are best put into + an F<.ackrc> file - then you do not have to define your types over and + over again. In the following examples the options will always be shown + on one command line so that they can be easily copy & pasted. + +-I searches for foo in all perl files. I ++I searches for foo in all perl files. I + 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 ++files as well when searching for --perl files? I + 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. I defines the type I to include files with + the extensions .e or .eiffel. So to search for all eiffel files +-containing the word Bertrand use I. ++containing the word Bertrand use I. + 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 ++all eiffel files from a search. Redefining also works: I + and I<.xs> files no longer belong to the type I. + + When defining your own types in the F<.ackrc> file you have to use +@@ -525,7 +525,7 @@ + + + In order to see all currently defined types, use I<--help types>, e.g. +-I ++I + + Restrictions: + +@@ -542,7 +542,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 and ++I and + only find your shiny new I<.perl> files (and all files with unrecognized extension + and perl on the shebang line). + +@@ -550,7 +550,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. + + =over 4 +@@ -558,7 +558,7 @@ + =item ACKRC + + Specifies the location of the F<.ackrc> file. If this file doesn't +-exist, F looks in the default location. ++exist, F looks in the default location. + + =item ACK_OPTIONS + +@@ -592,11 +592,11 @@ + =item ACK_PAGER + + Specifies a pager program, such as C, C or C, to which +-ack will send its output. ++ack-grep will send its output. + + Using C does not suppress grouping and coloring like + piping output on the command-line does, except that on Windows +-ack will assume that C does not support color. ++ack-grep will assume that C does not support color. + + C overrides C if both are specified. + +@@ -614,13 +614,13 @@ + + =head2 Vim integration + +-F integrates easily with the Vim text editor. Set this in your +-F<.vimrc> to use F instead of F: ++F integrates easily with the Vim text editor. Set this in your ++F<.vimrc> to use F instead of F: + +- set grepprg=ack\ -a ++ set grepprg=ack-grep\ -a + + That examples uses C<-a> to search through all files, but you may +-use other default flags. Now you can search with F and easily ++use other default flags. Now you can search with F and easily + step through the results in Vim: + + :grep Dumper perllib +@@ -638,13 +638,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 + +-grep to use ack. The result is the Search in Project with ack, and ++grep to use ack-grep. The result is the Search in Project with ack-grep, and + you can find it here: + L" + + =head2 Shell and Return Code + +-For greater compatibility with I, I in normal use returns ++For greater compatibility with I, I in normal use returns + shell return or exit code of 0 only if something is found and 1 if + no match is found. + +@@ -657,9 +657,9 @@ + + =cut + +-=head1 DEBUGGING ACK PROBLEMS ++=head1 DEBUGGING ACK-GREP PROBLEMS + +-If ack gives you output you're not expecting, start with a few simple steps. ++If ack-grep gives you output you're not expecting, start with a few simple steps. + + =head2 Use B<--noenv> + +@@ -670,8 +670,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 +-tool. If ack is not finding matches you think it should find, run +-F to see what files are being checked. ++tool. If ack-grep is not finding matches you think it should find, run ++F to see what files are being checked. + + =head1 TIPS + +@@ -684,16 +684,16 @@ + + =head2 Use F<-f> for working with big codesets + +-Ack does more than search files. C will create a ++Ack-Grep does more than search files. C will create a + list of all the Perl files in a tree, ideal for sending into F. + For example: + + # Change all "this" to "that" in all Perl files in a tree. +- ack -f --perl | xargs perl -p -i -e's/this/that/g' ++ ack-grep -f --perl | xargs perl -p -i -e's/this/that/g' + + 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) + + =head2 Use F<-Q> when in doubt about metacharacters + +@@ -702,15 +702,15 @@ + the -Q to avoid false positives without all the backslashing. See + the following example for more... + +-=head2 Use ack to watch log files ++=head2 Use ack-grep to watch log files + + Here's one I used the other day to find trouble spots for a website + visitor. The user had a problem loading F, so I +-took the access log and scanned it with ack twice. ++took the access log and scanned it with ack-grep twice. + +- ack -Q aa.bb.cc.dd /path/to/access.log | ack -Q -B5 troublesome.gif ++ ack-grep -Q aa.bb.cc.dd /path/to/access.log | ack-grep -Q -B5 troublesome.gif + +-The first ack finds only the lines in the Apache log for the given ++The first ack-grep finds only the lines in the Apache log for the given + IP. The second finds the match on my troublesome GIF, and shows + the previous five lines from the log in each case. + +@@ -721,17 +721,17 @@ + + =head1 FAQ + +-=head2 Wouldn't it be great if F did search & replace? ++=head2 Wouldn't it be great if F did search & replace? + +-No, ack will always be read-only. Perl has a perfectly good way ++No, ack-grep will always be read-only. Perl has a perfectly good way + to do search & replace in files, using the C<-i>, C<-p> and C<-n> + switches. + +-You can certainly use ack to select your files to update. For ++You can certainly use ack-grep to select your files to update. For + example, to change all "foo" to "bar" in all PHP files, you can do + this form the Unix shell: + +- $ perl -i -p -e's/foo/bar/g' $(ack -f --php) ++ $ perl -i -p -e's/foo/bar/g' $(ack-grep -f --php) + + =head1 AUTHOR + +@@ -747,9 +747,9 @@ + All enhancement requests MUST first be posted to the ack-users + mailing list at L. I + will not consider a request without it first getting seen by other +-ack users. ++ack-grep users. + +-There is a list of enhancements I want to make to F in the ack ++There is a list of enhancements I want to make to F in the ack + issues list at Google Code: L + + Patches are always welcome, but patches with tests get the most +@@ -757,7 +757,7 @@ + + =head1 SUPPORT + +-Support for and information about F can be found at: ++Support for and information about F can be found at: + + =over 4 + +@@ -791,7 +791,7 @@ + + How appropriate to have Inowledgements! + +-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 + Ryan Niebur, + Kent Fredric, + Mike Morearty, +Index: b/Ack.pm +=================================================================== +--- a/Ack.pm ++++ b/Ack.pm +@@ -721,7 +721,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 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. +@@ -736,7 +736,7 @@ + --[no]colour Same as --[no]color + --color-filename=COLOR + --color-match=COLOR Set the color for matches and filenames. +- --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). + +@@ -751,7 +751,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 (ack-grep's default behavior) + -n, --no-recurse No descending into subdirectories + -G REGEX Only search files that match REGEX + +@@ -849,7 +849,7 @@ + + =head2 get_version_statement + +-Returns the version information for ack. ++Returns the version information for ack-grep. + + =cut + +@@ -1486,7 +1486,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 + +@@ -1497,7 +1497,7 @@ + + =head2 output_to_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 + --- ack-grep-1.90.orig/debian/patches/series +++ ack-grep-1.90/debian/patches/series @@ -0,0 +1,4 @@ +whatis-entries-for-the-pod +#test-with-ack-base +use-ack-base +app-rename --- ack-grep-1.90.orig/debian/patches/test-with-ack-base +++ ack-grep-1.90/debian/patches/test-with-ack-base @@ -0,0 +1,50 @@ +make the tests use ack-base, so we're testing the version that's actually installed :) + +Index: b/t/Util.pm +=================================================================== +--- a/t/Util.pm ++++ b/t/Util.pm +@@ -37,7 +37,7 @@ + sub build_ack_command_line { + my @args = @_; + +- return build_command_line( './ack', @args ); ++ return build_command_line( './ack-base', @args ); + } + + sub slurp { +Index: b/t/ack-type.t +=================================================================== +--- a/t/ack-type.t ++++ b/t/ack-type.t +@@ -115,14 +115,14 @@ + + for my $builtin ( @builtins ) { + check_stderr( "--type-set $builtin=.foo", +- qq{ack: --type-set: Builtin type "$builtin" cannot be changed.} ); ++ qq{ack-base: --type-set: Builtin type "$builtin" cannot be changed.} ); + check_stderr( "--type-add $builtin=.foo", +- qq{ack: --type-add: Builtin type "$builtin" cannot be changed.} ); ++ qq{ack-base: --type-add: Builtin type "$builtin" cannot be changed.} ); + } + + # check that there is a warning for creating new types with --append_type + check_stderr( '--type-add foo=.foo --foo', +- q{ack: --type-add: Type "foo" does not exist, creating with ".foo" ...} ); ++ q{ack-base: --type-add: Type "foo" does not exist, creating with ".foo" ...} ); + } + + +Index: b/t/command-line-files.t +=================================================================== +--- a/t/command-line-files.t ++++ b/t/command-line-files.t +@@ -46,7 +46,7 @@ + my $file = File::Next::reslash( 't/swamp/perl.pod' ); + + my @expected_stderr = split( /\n/, <<'EOF' ); +-ack: non-existent-file.txt: No such file or directory ++ack-base: non-existent-file.txt: No such file or directory + EOF + + my @expected_stdout = split( /\n/, <<"EOF" );