[SCM] Packaging of ack-grep in Debian branch, master, updated. debian/1.92-1-23-g4864c94

[Ryan Niebur]

The following commit has been merged in the master branch:
commit 912a33d82002d65e0368751eadb3a75d67bc51d8
Author: Ryan Niebur <ryan at debian.org>
Date:   Sun Jun 3 22:20:22 2012 -0700

    Remove incorrect information about using - for stdin (Closes: #593904)
    
    Also fix the ACK-BASE title in the manpage to say ACK-GREP

diff --git a/debian/changelog b/debian/changelog
index 1db045e..04c1566 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,8 +15,10 @@ ack-grep (1.96-1) UNRELEASED; urgency=low
   * Fix rename patch to allow displaying the original program name in --
     help and --version output when the user has created an ack symlink
     (Closes: #631208)
+  * Remove incorrect information about using - for stdin (Closes: #593904)
+    - Fix the ACK-BASE title in the manpage to say ACK-GREP
 
- -- Ryan Niebur <ryan at debian.org>  Sun, 03 Jun 2012 22:09:52 -0700
+ -- Ryan Niebur <ryan at debian.org>  Sun, 03 Jun 2012 22:20:07 -0700
 
 ack-grep (1.92-1) unstable; urgency=low
 
diff --git a/debian/patches/remove-incorrect-documentation b/debian/patches/remove-incorrect-documentation
new file mode 100644
index 0000000..5c77da9
--- /dev/null
+++ b/debian/patches/remove-incorrect-documentation
@@ -0,0 +1,34 @@
+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-03 22:09:03.000000000 -0700
++++ ack-grep/Ack.pm	2012-06-03 22:11:42.000000000 -0700
+@@ -706,8 +706,7 @@
+ 
+ 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.
+-$0 may also search STDIN, but only if no FILE are specified, or if
+-one of FILES is "-".
++$0 may also search STDIN, but only if no FILE are specified.
+ 
+ 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:05:55.000000000 -0700
++++ ack-grep/ack-base	2012-06-03 22:12:00.000000000 -0700
+@@ -124,8 +124,8 @@
+ 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.
++named) for lines containing a match to the given PATTERN.  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 7e03683..60e2549 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 use-ack-base
 app-rename
 fix-bash-completion
+remove-incorrect-documentation
diff --git a/debian/rules b/debian/rules
index 4e2de3c..3ad6bc4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,10 @@ override_dh_clean:
 	# make things partly sane for me :)
 	[ ! -d .git -o ! -x /usr/bin/git ] || git checkout ack ack-help.txt
 
+override_dh_auto_build:
+	dh_auto_build
+	sed -i 's/ACK-BASE/ACK-GREP/g' blib/man1/ack-base.1p
+
 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

-- 
Packaging of ack-grep in Debian