[SCM] Packaging of ack-grep in Debian branch, master, updated. debian/1.96-2-23-gc94836c

[gregor herrmann]

The following commit has been merged in the master branch:
commit 9dda08d04178aed2ea816d468f6f5abac0576068
Author: gregor herrmann <gregoa at debian.org>
Date:   Sat May 11 18:34:10 2013 +0200

    Drop patch remove-incorrect-documentation
    
    (hopefully not needed anymore).

diff --git a/debian/patches/remove-incorrect-documentation b/debian/patches/remove-incorrect-documentation
deleted file mode 100644
index 50f6541..0000000
--- a/debian/patches/remove-incorrect-documentation
+++ /dev/null
@@ -1,38 +0,0 @@
-Description: Remove incorrect documentation about passing - to read from stdin, which doesn't work at all.
-Bug-Debian: http://bugs.debian.org/593904
-Author: Ryan Niebur <ryan at debian.org>
-Forwarded: no
-
-Index: ack-grep/Ack.pm
-===================================================================
---- 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 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-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
--named, or the file name - is given) 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.
diff --git a/debian/patches/series b/debian/patches/series
index 66ca27a..e163da3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 app-rename
-remove-incorrect-documentation

-- 
Packaging of ack-grep in Debian