[ack-grep] 01/02: Drop patch app-rename, no more needed (c.f. #662114)
Axel Beckert
abe at deuxchevaux.org
Sat Feb 22 16:55:59 UTC 2014
This is an automated email from the git hooks/post-receive script.
abe pushed a commit to branch master
in repository ack-grep.
commit c0755e7d38ac93c1fbd325715ea078449d899f4f
Author: Axel Beckert <abe at deuxchevaux.org>
Date: Sat Feb 22 17:54:17 2014 +0100
Drop patch app-rename, no more needed (c.f. #662114)
* Add Conflicts against ack.
* Remove dh_auto_install override from debian/rules
* Add backward compatibility links and a debian/NEWS entry
---
debian/NEWS | 10 +
debian/changelog | 4 +
debian/control | 1 +
debian/links | 2 +
debian/patches/app-rename | 815 ----------------------------------------------
debian/patches/series | 1 -
debian/rules | 5 -
7 files changed, 17 insertions(+), 821 deletions(-)
diff --git a/debian/NEWS b/debian/NEWS
index ac79205..ab1fcb0 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,13 @@
+ack-grep (2.12-2) unstable; urgency=low
+
+ The program "ack" is no more renamed to "ack-grep" since the conflicting
+ "ack", a Kanji code converter, has been removed from Debian (see #662114).
+
+ For a transitional phase of one Debian release, the package will though
+ contain symlinks from ack-grep to ack for backwards compatibility.
+
+ -- Axel Beckert <abe at debian.org> Mon, 17 Feb 2014 18:03:56 +0100
+
ack-grep (2.04-1) unstable; urgency=low
From upstream Changes:
diff --git a/debian/changelog b/debian/changelog
index a415577..2559ba4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ ack-grep (2.12-2) UNRELEASED; urgency=low
* Add CVE-ID to previous changelog entry.
* debian/rules: More verbose explanation about handling dh_auto_test
+ * Drop patch app-rename, no more needed (c.f. #662114)
+ + Add Conflicts against ack.
+ + Remove dh_auto_install override from debian/rules
+ + Add backward compatibility links and a debian/NEWS entry
-- Axel Beckert <abe at debian.org> Thu, 12 Dec 2013 10:28:08 +0100
diff --git a/debian/control b/debian/control
index fbde0d9..e19b6cf 100644
--- a/debian/control
+++ b/debian/control
@@ -20,6 +20,7 @@ Architecture: all
Depends: libfile-next-perl (>= 1.10),
${perl:Depends},
${misc:Depends}
+Conflicts: ack
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
diff --git a/debian/links b/debian/links
new file mode 100644
index 0000000..681205e
--- /dev/null
+++ b/debian/links
@@ -0,0 +1,2 @@
+usr/bin/ack usr/bin/ack-grep
+usr/share/man/man1/ack.1p usr/share/man/man1/ack-grep.1p
diff --git a/debian/patches/app-rename b/debian/patches/app-rename
deleted file mode 100644
index b7a1142..0000000
--- a/debian/patches/app-rename
+++ /dev/null
@@ -1,815 +0,0 @@
-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
-===================================================================
---- ack-grep.orig/ack 2013-12-10 13:16:34.000000000 +0100
-+++ ack-grep/ack 2013-12-10 13:16:34.000000000 +0100
-@@ -1037,12 +1037,12 @@
-
- =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
-
-@@ -1050,7 +1050,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
--to the given PATTERN. By default, ack prints the matching lines.
-+to the given PATTERN. By default, ack-grep prints the matching lines.
-
- PATTERN is a Perl regular expression. Perl regular expressions
- are commonly found in other programming languages, but for the particulars
-@@ -1058,25 +1058,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 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.
-
-@@ -1093,15 +1093,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. 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. 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
-@@ -1110,11 +1110,11 @@
- to add/remove multiple directories from the ignore list.
-
- For a complete list of directories that do not get searched, run
--C<ack --dump>.
-+C<ack-grep --dump>.
-
- =head1 WHEN TO USE GREP
-
--I<ack> trumps I<grep> as an everyday tool 99% of the time, but don't
-+I<ack-grep> trumps I<grep> as an everyday tool 99% of the time, but don't
- 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
-@@ -1155,7 +1155,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
-+If combined with B<-h> (B<--no-filename>) ack-grep outputs only one total
- count.
-
- =item B<--[no]color>, B<--[no]colour>
-@@ -1186,7 +1186,7 @@
-
- =item B<--create-ackrc>
-
--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>
-@@ -1197,13 +1197,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 or
-+unless ack-grep is running interactively (when output goes to a pipe or
- file).
-
- =item B<-f>
-@@ -1220,7 +1220,7 @@
-
- =item B<--[no]filter>
-
--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>
-
-@@ -1272,9 +1272,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>>
-
-@@ -1287,7 +1287,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>>
-@@ -1297,8 +1297,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>>
-
-@@ -1322,8 +1322,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<NUM>>, B<--max-count=I<NUM>>
-
-@@ -1351,7 +1351,7 @@
-
- =item B<--pager=I<program>>, B<--nopager>
-
--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
-@@ -1367,7 +1367,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>
-
-@@ -1376,7 +1376,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>
-
-@@ -1403,11 +1403,11 @@
- =item B<--sort-files>
-
- 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>.
-
- =item B<--show-types>
-
--Outputs the filetypes that ack associates with each file.
-+Outputs the filetypes that ack-grep associates with each file.
-
- Works with B<-f> and B<-g> options.
-
-@@ -1424,7 +1424,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<FILTER>:I<FILTERARGS>>
-
-@@ -1505,33 +1505,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 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
-
--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<ack --perl foo> searches for foo in all perl files. I<ack --help=types>
-+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: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 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: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: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
-@@ -1550,9 +1550,9 @@
-
-
- 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>
-
--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>.
-@@ -1602,7 +1602,7 @@
-
- =head1 ENVIRONMENT VARIABLES
-
--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.
-
-@@ -1611,7 +1611,7 @@
- =item ACKRC
-
- 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
-
-@@ -1654,11 +1654,11 @@
- =item ACK_PAGER
-
- Specifies a pager program, such as C<more>, C<less> or C<most>, to which
--ack will send its output.
-+ack-grep will send its output.
-
- Using C<ACK_PAGER> does not suppress grouping and coloring like
- piping output on the command-line does, except that on Windows
--ack will assume that C<ACK_PAGER> does not support color.
-+ack-grep will assume that C<ACK_PAGER> does not support color.
-
- C<ACK_PAGER_COLOR> overrides C<ACK_PAGER> if both are specified.
-
-@@ -1676,18 +1676,18 @@
-
- =head2 Vim integration
-
--F<ack> integrates easily with the Vim text editor. Set this in your
--F<.vimrc> to use F<ack> instead of F<grep>:
-+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\ -k
-+ set grepprg=ack-grep\ -k
-
--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
-
--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>
-@@ -1705,13 +1705,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<http://www.simplicidade.org/notes/archives/2008/03/search_in_proje.html>"
-
- =head2 Shell and Return Code
-
--For greater compatibility with I<grep>, I<ack> in normal use returns
-+For greater compatibility with I<grep>, I<ack-grep> in normal use returns
- shell return or exit code of 0 only if something is found and 1 if
- no match is found.
-
-@@ -1724,9 +1724,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>
-
-@@ -1736,8 +1736,8 @@
-
- =head2 Use B<-f> to see what files have been selected
-
--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.
-
-@@ -1758,16 +1758,16 @@
-
- =head2 Use F<-f> for working with big codesets
-
--Ack does more than search files. C<ack -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:
-
- # 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/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
-
-@@ -1776,15 +1776,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<troublesome.gif>, 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.
-
-@@ -1825,7 +1825,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"
-
-@@ -1836,39 +1836,39 @@
-
- =head1 FAQ
-
--=head2 Why isn't ack finding a match in (some file)?
-+=head2 Why isn't ack-grep finding a match in (some file)?
-
--Probably because it's of a type that ack doesn't recognize. ack's
--searching behavior is driven by filetype. B<If ack doesn't know
--what kind of file it is, ack ignores the file.>
-+Probably because it's of a type that ack-grep doesn't recognize.
-+ack-grep's searching behavior is driven by filetype. B<If ack-grep
-+doesn't know what kind of file it is, ack-grep ignores the file.>
-
--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. 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?
-
--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 from 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)
-
--=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
-+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.
-
--=head2 Why is it called ack if it's called ack-grep?
-+=head2 Why is it called ack-grep if it's called ack?
-
- The name of the program is "ack". Some packagers have called it
- "ack-grep" when creating packages because there's already a package
-@@ -1897,15 +1897,15 @@
-
- =head2 Can I do multi-line regexes?
-
--No, ack does not support regexes that match multiple lines. Doing
-+No, ack-grep does not support regexes that match multiple lines. Doing
- 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>
- 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!)
-@@ -1974,7 +1974,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
-
-@@ -1982,11 +1982,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 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 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.
-+B<-a/--all> option in ack-grep 1.x.
-
- =item *
-
-@@ -1996,12 +1996,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
-@@ -2014,15 +2014,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 *
-
-@@ -2065,12 +2065,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 *
-@@ -2091,7 +2091,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 *
-@@ -2100,12 +2100,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
-
-@@ -2123,9 +2123,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
--ack users. This includes requests for new filetypes.
-+ack-grep users. This includes requests for new filetypes.
-
--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<https://github.com/petdance/ack2/issues>
-
- Patches are always welcome, but patches with tests get the most
-@@ -2133,7 +2133,7 @@
-
- =head1 SUPPORT
-
--Support for and information about F<ack> can be found at:
-+Support for and information about F<ack-grep> can be found at:
-
- =over 4
-
-@@ -2171,7 +2171,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
- Fraser Tweedale,
- RaE<aacute>l GundE<aacute>n,
- Steffen Jaeckel,
-Index: ack-grep/Ack.pm
-===================================================================
---- ack-grep.orig/Ack.pm 2013-12-10 13:16:34.000000000 +0100
-+++ ack-grep/Ack.pm 2013-12-10 13:16:34.000000000 +0100
-@@ -53,9 +53,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
-
-@@ -77,7 +77,7 @@
-
- =head2 warn( @_ )
-
--Put out an ack-specific warning.
-+Put out an ack-grep-specific warning.
-
- =cut
-
-@@ -87,7 +87,7 @@
-
- =head2 die( @_ )
-
--Die in an ack-specific way.
-+Die in an ack-grep-specific way.
-
- =cut
-
-@@ -119,7 +119,7 @@
-
- sub _thpppt {
- my $y = _get_thpppt();
-- App::Ack::print( "$y ack $_[0]!\n" );
-+ App::Ack::print( "$y ack-grep $_[0]!\n" );
- exit 0;
- }
-
-@@ -244,11 +244,11 @@
- return show_help_types() if $help_arg =~ /^types?/;
-
- App::Ack::print( <<"END_OF_HELP" );
--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 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 "-".
-
-@@ -256,7 +256,7 @@
- an .ackrc file. If you want no dependency on the environment, turn it
- off with --noenv.
-
--Example: ack -i select
-+Example: ack-grep -i select
-
- Searching:
- -i, --ignore-case Ignore case distinctions in PATTERN
-@@ -299,7 +299,7 @@
-
-
- File presentation:
-- --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
-@@ -318,7 +318,7 @@
- --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
- non-interactively (when output goes to a pipe or
- file).
-
-@@ -340,12 +340,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 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=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
-@@ -363,14 +363,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 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
-+ --[no]filter Force ack-grep to treat standard input as a pipe
- (--filter) or tty (--nofilter)
- --man Man page
- --version Display version & copyright
-@@ -380,7 +380,7 @@
-
- Exit status is 0 if match, 1 if no match.
-
--This is version $VERSION of ack.
-+This is version $VERSION of ack-grep.
- END_OF_HELP
-
- return;
-@@ -395,9 +395,9 @@
-
- sub show_help_types {
- App::Ack::print( <<'END_OF_HELP' );
--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.
-
-@@ -438,7 +438,7 @@
-
- =head2 get_version_statement
-
--Returns the version information for ack.
-+Returns the version information for ack-grep.
-
- =cut
-
-@@ -454,7 +454,7 @@
- my $ver = sprintf( '%vd', $^V );
-
- return <<"END_OF_VERSION";
--ack ${VERSION}
-+ack-grep ${VERSION}
- Running under Perl $ver at $this_perl
-
- $copyright
-@@ -466,7 +466,7 @@
-
- =head2 print_version_statement
-
--Prints the version information for ack.
-+Prints the version information for ack-grep.
-
- =cut
-
-@@ -478,7 +478,7 @@
-
- =head2 get_copyright
-
--Return the copyright for ack.
-+Return the copyright for ack-grep.
-
- =cut
-
-@@ -547,7 +547,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
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e163da3..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-app-rename
diff --git a/debian/rules b/debian/rules
index b5e70de..64223b3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,8 +13,3 @@ override_dh_auto_test:
override_dh_clean:
dh_clean --exclude=t/swamp/
-
-override_dh_auto_install:
- dh_auto_install
- mv -v $(TMP)/usr/bin/ack $(TMP)/usr/bin/ack-grep
- mv -v $(TMP)/usr/share/man/man1/ack.1p $(TMP)/usr/share/man/man1/ack-grep.1p
--
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