[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 dd3d14c392ae0041ff9bdd3e6516b41b3be43117
Author: Ryan Niebur <ryan at debian.org>
Date:   Fri Jun 8 18:46:50 2012 -0700

      - Move the ack-base manpage substitution to dh_auto_install
        to ensure it will happen

diff --git a/debian/changelog b/debian/changelog
index aaf4a6f..8d9b2c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 ack-grep (1.96-2) UNRELEASED; urgency=low
 
   * Remove unnecessary README.source
+  * Fix manpage patch documenting stdin behavior (Closes: #676235)
+    - Move the ack-base manpage substitution to dh_auto_install
+      to ensure it will happen
 
- -- Ryan Niebur <ryan at debian.org>  Thu, 07 Jun 2012 09:52:04 -0700
+ -- Ryan Niebur <ryan at debian.org>  Fri, 08 Jun 2012 18:41:25 -0700
 
 ack-grep (1.96-1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 3ad6bc4..f429249 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,13 +16,13 @@ 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_auto_install:
+	if [ -f blib/man1/ack-base.1p ]; then sed 's/ACK-BASE/ACK-GREP/g' blib/man1/ack-base.1p > blib/man1/ack-grep.1p; rm blib/man1/ack-base.1p; fi
+	dh_auto_install
 
 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
+	rm -f debian/ack-grep/usr/share/man/man1/ack-base.1p.gz
 	mv etc/ack.bash_completion.sh debian/ack-grep.bash-completion
 	dh_bash-completion
 	mv debian/ack-grep.bash-completion etc/ack.bash_completion.sh

-- 
Packaging of ack-grep in Debian