[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 239f0b5219cb4909eb90643770cfd335adc343a1
Author: gregor herrmann <gregoa at debian.org>
Date:   Sat May 11 17:57:58 2013 +0200

    The split between ack and ack-base is gone.
    
    Drop patch, update debian/rules.

diff --git a/debian/patches/series b/debian/patches/series
index 9671fd5..66ca27a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-use-ack-base
 app-rename
 remove-incorrect-documentation
diff --git a/debian/patches/use-ack-base b/debian/patches/use-ack-base
deleted file mode 100644
index b2c4aad..0000000
--- a/debian/patches/use-ack-base
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: install ack-base instead of ack, which includes all dependencies embedded
-Forwarded: not-needed
-Author: Ryan Niebur <ryan at debian.org>
-
-Index: ack-grep/Makefile.PL
-===================================================================
---- ack-grep.orig/Makefile.PL	2012-06-03 20:55:06.000000000 -0700
-+++ ack-grep/Makefile.PL	2012-06-03 20:55:22.000000000 -0700
-@@ -19,7 +19,7 @@
-         'Basic.pm'      => '$(INST_LIBDIR)/App/Ack/Plugin/Basic.pm',
-         #'Tar.pm'        => '$(INST_LIBDIR)/App/Ack/Plugin/Tar.pm',
-     },
--    EXE_FILES           => [ 'ack' ],
-+    EXE_FILES           => [ 'ack-base' ],
-     PREREQ_PM => {
-         'Test::Harness'     => 2.50, # Something reasonably newish
-         'Term::ANSIColor'   => 0,
-@@ -56,7 +56,7 @@
- sub MY::top_targets {
-     my $str = shift->SUPER::top_targets(@_);
- 
--    $str =~ s/^pure_all.+/$& ack ack-help.txt ack-help-types.txt ack-help-dirs.txt/m;
-+    $str =~ s/^pure_all.+/$& ack-help.txt ack-help-types.txt ack-help-dirs.txt/m;
- 
-     return $str;
- }
diff --git a/debian/rules b/debian/rules
index 883e4cd..45717c2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,8 @@
 #!/usr/bin/make -f
 
+PACKAGE = $(shell dh_listpackages)
+TMP     = $(CURDIR)/debian/$(PACKAGE)
+
 %:
 	dh $@
 
@@ -17,10 +20,6 @@ override_dh_clean:
 	[ ! -d .git -o ! -x /usr/bin/git ] || git checkout ack ack-help.txt
 
 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
-	rm -f debian/ack-grep/usr/share/man/man1/ack-base.1p.gz
-	dh_fixperms
+	mv $(TMP)/usr/bin/ack $(TMP)/usr/bin/ack-grep
+	mv $(TMP)/usr/share/man/man1/ack.1p $(TMP)/usr/share/man/man1/ack-grep.1p

-- 
Packaging of ack-grep in Debian