[SCM] Packaging of ack-grep in Debian branch, master, updated. debian/1.96-1-3-g0f0eb3e

[Ryan Niebur]

The following commit has been merged in the master branch:
commit 0f0eb3e53786f5ee37035e5debf7e184bb579226
Author: Ryan Niebur <ryan at debian.org>
Date:   Fri Jun 8 19:06:21 2012 -0700

    Fix manpage patch documenting stdin behavior (Closes: #676235)

diff --git a/debian/patches/remove-incorrect-documentation b/debian/patches/remove-incorrect-documentation
index c72ecca..50f6541 100644
--- a/debian/patches/remove-incorrect-documentation
+++ b/debian/patches/remove-incorrect-documentation
@@ -5,30 +5,34 @@ Forwarded: no
 
 Index: ack-grep/Ack.pm
 ===================================================================
---- 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 @@
+--- ack-grep.orig/Ack.pm	2012-06-08 19:00:35.000000000 -0700
++++ ack-grep/Ack.pm	2012-06-08 19:05:36.000000000 -0700
+@@ -708,8 +708,8 @@
  
  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.
 -$debian_internal_name may also search STDIN, but only if no FILE are specified, or if
 -one of FILES is "-".
-+$debian_internal_name may also search STDIN, but only if no FILE are specified.
++$debian_internal_name may also search STDIN, but only if STDIN is a
++pipe instead of a terminal.
  
  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:38:34.000000000 -0700
-+++ ack-grep/ack-base	2012-06-03 22:39:03.000000000 -0700
-@@ -124,8 +124,8 @@
+--- ack-grep.orig/ack-base	2012-06-08 19:00:35.000000000 -0700
++++ ack-grep/ack-base	2012-06-08 19:04:36.000000000 -0700
+@@ -124,9 +124,10 @@
+ 
  Ack-Grep is designed as a replacement for 99% of the uses of F<grep>.
  
- Ack-Grep 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-grep prints the matching lines.
-+named) for lines containing a match to the given PATTERN.  By default,
-+ack-grep prints the matching lines.
++Ack-Grep searches the named input FILEs (or standard input, if it is a
++pipe instead of a terminal) for lines containing a match to the given
++PATTERN. If no files are named, the current directory is searched. By
++default, ack-grep prints the matching lines.
  
  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.

-- 
Packaging of ack-grep in Debian