[ack-grep] 01/01: New upstream release
Axel Beckert
abe at deuxchevaux.org
Wed Sep 25 22:21:34 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 d50b176a1892c9ac07d97d54c4f0a3f0c780d235
Author: Axel Beckert <abe at deuxchevaux.org>
Date: Thu Sep 26 00:21:26 2013 +0200
New upstream release
Refresh patch
---
debian/changelog | 6 ++-
debian/patches/app-rename | 98 ++++++++++++++++++++++-----------------------
2 files changed, 53 insertions(+), 51 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 74b5381..d4dbc29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-ack-grep (2.08-2) UNRELEASED; urgency=low
+ack-grep (2.10-1) unstable; urgency=low
+ * New upstream release
+ + Refresh patch
* Change homepage header again, this time to http://beyondgrep.com/
- -- Axel Beckert <abe at debian.org> Sat, 31 Aug 2013 18:09:04 +0200
+ -- Axel Beckert <abe at debian.org> Thu, 26 Sep 2013 00:01:56 +0200
ack-grep (2.08-1) unstable; urgency=low
diff --git a/debian/patches/app-rename b/debian/patches/app-rename
index 72480a5..87b5e92 100644
--- a/debian/patches/app-rename
+++ b/debian/patches/app-rename
@@ -6,9 +6,9 @@ Last-Update: 2013-05-11
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 @@
+--- ack-grep.orig/ack 2013-09-26 00:08:06.000000000 +0200
++++ ack-grep/ack 2013-09-26 00:08:06.000000000 +0200
+@@ -1030,12 +1030,12 @@
=head1 NAME
@@ -24,7 +24,7 @@ Index: ack-grep/ack
=head1 DESCRIPTION
-@@ -1044,7 +1044,7 @@
+@@ -1043,7 +1043,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
@@ -33,7 +33,7 @@ Index: ack-grep/ack
PATTERN is a Perl regular expression. Perl regular expressions
are commonly found in other programming languages, but for the particulars
-@@ -1052,25 +1052,25 @@
+@@ -1051,25 +1051,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
@@ -64,7 +64,7 @@ Index: ack-grep/ack
are not explicitly excluded by B<--ignore-dir> and B<--ignore-file>
options, either present in F<ackrc> files or on the command line.
-@@ -1087,15 +1087,15 @@
+@@ -1086,15 +1086,15 @@
=back
@@ -84,7 +84,7 @@ Index: ack-grep/ack
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
-@@ -1104,11 +1104,11 @@
+@@ -1103,11 +1103,11 @@
to add/remove multiple directories from the ignore list.
For a complete list of directories that do not get searched, run
@@ -98,7 +98,7 @@ Index: ack-grep/ack
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
-@@ -1149,7 +1149,7 @@
+@@ -1148,7 +1148,7 @@
number of lines for each file that has lines matching. Without
B<-l>, some line counts may be zeroes.
@@ -107,7 +107,7 @@ Index: ack-grep/ack
count.
=item B<--[no]color>, B<--[no]colour>
-@@ -1180,7 +1180,7 @@
+@@ -1179,7 +1179,7 @@
=item B<--create-ackrc>
@@ -116,7 +116,7 @@ Index: ack-grep/ack
when you want to customize the defaults.
=item B<--dump>
-@@ -1191,13 +1191,13 @@
+@@ -1190,13 +1190,13 @@
=item B<--[no]env>
B<--noenv> disables all environment processing. No F<.ackrc> is
@@ -132,7 +132,7 @@ Index: ack-grep/ack
file).
=item B<-f>
-@@ -1214,7 +1214,7 @@
+@@ -1213,7 +1213,7 @@
=item B<--[no]filter>
@@ -141,7 +141,7 @@ Index: ack-grep/ack
=item B<--[no]follow>
-@@ -1264,9 +1264,9 @@
+@@ -1263,9 +1263,9 @@
=item B<--ignore-ack-defaults>
@@ -153,7 +153,7 @@ Index: ack-grep/ack
=item B<--[no]ignore-dir=I<DIRNAME>>, B<--[no]ignore-directory=I<DIRNAME>>
-@@ -1279,7 +1279,7 @@
+@@ -1278,7 +1278,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
@@ -162,7 +162,7 @@ Index: ack-grep/ack
line.
=item B<--ignore-file=I<FILTERTYPE:FILTERARGS>>
-@@ -1289,8 +1289,8 @@
+@@ -1288,8 +1288,8 @@
=item B<-k>, B<--known-types>
@@ -173,7 +173,7 @@ Index: ack-grep/ack
=item B<--lines=I<NUM>>
-@@ -1314,8 +1314,8 @@
+@@ -1313,8 +1313,8 @@
same set of files.
# search for foo and bar in given files
@@ -184,7 +184,7 @@ Index: ack-grep/ack
=item B<-m=I<NUM>>, B<--max-count=I<NUM>>
-@@ -1343,7 +1343,7 @@
+@@ -1342,7 +1342,7 @@
=item B<--pager=I<program>>, B<--nopager>
@@ -193,7 +193,7 @@ Index: ack-grep/ack
via the C<ACK_PAGER> and C<ACK_PAGER_COLOR> environment variables.
Using --pager does not suppress grouping and coloring like piping
-@@ -1359,7 +1359,7 @@
+@@ -1358,7 +1358,7 @@
still seeing the entire file, as in:
# Watch a log file, and highlight a certain IP address
@@ -202,7 +202,7 @@ Index: ack-grep/ack
=item B<--print0>
-@@ -1368,7 +1368,7 @@
+@@ -1367,7 +1367,7 @@
helpful when dealing with filenames that contain whitespace, e.g.
# remove all files of type html
@@ -211,7 +211,7 @@ Index: ack-grep/ack
=item B<-Q>, B<--literal>
-@@ -1395,11 +1395,11 @@
+@@ -1394,11 +1394,11 @@
=item B<--sort-files>
Sorts the found files lexicographically. Use this if you want your file
@@ -225,7 +225,7 @@ Index: ack-grep/ack
Works with B<-f> and B<-g> options.
-@@ -1416,7 +1416,7 @@
+@@ -1415,7 +1415,7 @@
Type specifications can be repeated and are ORed together.
@@ -234,7 +234,7 @@ Index: ack-grep/ack
=item B<--type-add I<TYPE>:I<FILTER>:I<FILTERARGS>>
-@@ -1497,33 +1497,33 @@
+@@ -1496,33 +1496,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>.
@@ -275,7 +275,7 @@ Index: ack-grep/ack
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
-@@ -1542,9 +1542,9 @@
+@@ -1541,9 +1541,9 @@
In order to see all currently defined types, use I<--help-types>, e.g.
@@ -287,7 +287,7 @@ Index: ack-grep/ack
offers additional filter types. The generic syntax is
I<--type-set TYPE:FILTER:FILTERARGS>; I<FILTERARGS> depends on the value
of I<FILTER>.
-@@ -1594,7 +1594,7 @@
+@@ -1593,7 +1593,7 @@
=head1 ENVIRONMENT VARIABLES
@@ -296,7 +296,7 @@ Index: ack-grep/ack
much easier. These variables are ignored if B<--noenv> is specified
on the command line.
-@@ -1603,7 +1603,7 @@
+@@ -1602,7 +1602,7 @@
=item ACKRC
Specifies the location of the user's F<.ackrc> file. If this file doesn't
@@ -305,7 +305,7 @@ Index: ack-grep/ack
=item ACK_OPTIONS
-@@ -1646,11 +1646,11 @@
+@@ -1645,11 +1645,11 @@
=item ACK_PAGER
Specifies a pager program, such as C<more>, C<less> or C<most>, to which
@@ -319,7 +319,7 @@ Index: ack-grep/ack
C<ACK_PAGER_COLOR> overrides C<ACK_PAGER> if both are specified.
-@@ -1668,18 +1668,18 @@
+@@ -1667,18 +1667,18 @@
=head2 Vim integration
@@ -344,7 +344,7 @@ Index: ack-grep/ack
C<:Ack> instead of C<:grep>, as well as several other advanced features.
L<https://github.com/mileszs/ack.vim>
-@@ -1697,13 +1697,13 @@
+@@ -1696,13 +1696,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 +
@@ -360,7 +360,7 @@ Index: ack-grep/ack
shell return or exit code of 0 only if something is found and 1 if
no match is found.
-@@ -1716,9 +1716,9 @@
+@@ -1715,9 +1715,9 @@
=cut
@@ -372,7 +372,7 @@ Index: ack-grep/ack
=head2 Use B<--noenv>
-@@ -1728,8 +1728,8 @@
+@@ -1727,8 +1727,8 @@
=head2 Use B<-f> to see what files have been selected
@@ -383,7 +383,7 @@ Index: ack-grep/ack
what files have been selected. You can also add the C<--show-types>
options to show the type of each file selected.
-@@ -1750,16 +1750,16 @@
+@@ -1749,16 +1749,16 @@
=head2 Use F<-f> for working with big codesets
@@ -403,7 +403,7 @@ Index: ack-grep/ack
=head2 Use F<-Q> when in doubt about metacharacters
-@@ -1768,15 +1768,15 @@
+@@ -1767,15 +1767,15 @@
the -Q to avoid false positives without all the backslashing. See
the following example for more...
@@ -423,7 +423,7 @@ Index: ack-grep/ack
IP. The second finds the match on my troublesome GIF, and shows
the previous five lines from the log in each case.
-@@ -1817,7 +1817,7 @@
+@@ -1816,7 +1816,7 @@
This shows how to pick out particular parts of a match using ( ) within regular expression.
@@ -432,7 +432,7 @@ Index: ack-grep/ack
input file contains "=head1 NAME"
output "1 : NAME"
-@@ -1828,39 +1828,39 @@
+@@ -1827,39 +1827,39 @@
=head1 FAQ
@@ -485,7 +485,7 @@ Index: ack-grep/ack
The name of the program is "ack". Some packagers have called it
"ack-grep" when creating packages because there's already a package
-@@ -1889,15 +1889,15 @@
+@@ -1888,15 +1888,15 @@
=head2 Can I do multi-line regexes?
@@ -504,7 +504,7 @@ Index: ack-grep/ack
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!)
-@@ -1966,7 +1966,7 @@
+@@ -1965,7 +1965,7 @@
=head1 DIFFERENCES BETWEEN ACK 1.X AND ACK 2.X
@@ -513,7 +513,7 @@ Index: ack-grep/ack
=head2 GENERAL CHANGES
-@@ -1974,11 +1974,11 @@
+@@ -1973,11 +1973,11 @@
=item *
@@ -528,7 +528,7 @@ Index: ack-grep/ack
=item *
-@@ -1988,12 +1988,12 @@
+@@ -1987,12 +1987,12 @@
=item *
@@ -543,7 +543,7 @@ Index: ack-grep/ack
completely disregard them if you don't like them.
=back
-@@ -2006,15 +2006,15 @@
+@@ -2005,15 +2005,15 @@
Because of the change in default search behavior, the B<-a/--all> and
B<-u/--unrestricted> options have been removed. In addition, the
@@ -562,7 +562,7 @@ Index: ack-grep/ack
=item *
-@@ -2057,12 +2057,12 @@
+@@ -2056,12 +2056,12 @@
=item *
@@ -577,7 +577,7 @@ Index: ack-grep/ack
unreadable files.
=item *
-@@ -2083,7 +2083,7 @@
+@@ -2082,7 +2082,7 @@
=item *
B<--create-ackrc> was added so that users may create custom ackrc files based
@@ -586,7 +586,7 @@ Index: ack-grep/ack
defaults.
=item *
-@@ -2092,12 +2092,12 @@
+@@ -2091,12 +2091,12 @@
=item *
@@ -601,7 +601,7 @@ Index: ack-grep/ack
=back
-@@ -2115,9 +2115,9 @@
+@@ -2114,9 +2114,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
@@ -613,7 +613,7 @@ Index: ack-grep/ack
issues list at Github: L<https://github.com/petdance/ack2/issues>
Patches are always welcome, but patches with tests get the most
-@@ -2125,7 +2125,7 @@
+@@ -2124,7 +2124,7 @@
=head1 SUPPORT
@@ -622,19 +622,19 @@ Index: ack-grep/ack
=over 4
-@@ -2163,7 +2163,7 @@
+@@ -2162,7 +2162,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
- Charles Lee,
- Joe McMahon,
- John Warwick,
+ Michael Beijen,
+ Alexandr Ciornii,
+ Christian Walde,
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
+--- ack-grep.orig/Ack.pm 2013-09-26 00:08:06.000000000 +0200
++++ ack-grep/Ack.pm 2013-09-26 00:08:06.000000000 +0200
@@ -55,9 +55,9 @@
=head1 SYNOPSIS
--
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