[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 f90b7c6c1f6d7a1d2d3f5caecf61db2d1b1eeeed
Author: gregor herrmann <gregoa at debian.org>
Date:   Sat May 11 17:53:05 2013 +0200

    bash-completion script is removed upstream.
    
    Drop patch, and bash-completion parts in debian/rules and debian/control.
    
    Closes: #696466, #697207

diff --git a/debian/control b/debian/control
index b2e4e07..c0ee3e4 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,7 @@ Build-Depends: debhelper (>= 7.0.50),
                perl,
                libfile-next-perl,
                libtest-differences-perl,
-               libtest-pod-perl,
-               bash-completion
+               libtest-pod-perl
 Standards-Version: 3.9.3
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/ack-grep.git
 Vcs-Git: git://anonscm.debian.org/git/pkg-perl/packages/ack-grep.git
@@ -19,7 +18,6 @@ Architecture: all
 Depends: libfile-next-perl,
          ${perl:Depends},
          ${misc:Depends}
-Suggests: bash-completion
 Description: grep-like program specifically for large source trees
  Ack is designed as a replacement for 99% of the uses of grep. ack is
  intelligent about the files it searches. It knows about certain file
diff --git a/debian/patches/fix-bash-completion b/debian/patches/fix-bash-completion
deleted file mode 100644
index e068539..0000000
--- a/debian/patches/fix-bash-completion
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: fix syntax of bash completion since have doesn't seem to work
-Forwarded: no
-Author: Ryan Niebur <ryan at debian.org>
-
-Index: ack-grep/etc/ack.bash_completion.sh
-===================================================================
---- ack-grep.orig/etc/ack.bash_completion.sh	2012-05-01 09:41:22.000000000 -0700
-+++ ack-grep/etc/ack.bash_completion.sh	2012-06-03 21:22:01.000000000 -0700
-@@ -12,7 +12,7 @@
- # Thanks to John Purnell for pointing out some missed options.
- 
- # ack-grep on Debian distros
--have ack || have ack-grep && {
-+type ack &>/dev/null || type ack-grep &>/dev/null && {
- 
- # please accept my apologies for polluting the environment!
- __ack_types=$(ack-grep --help=types 2>/dev/null || ack --help=types 2>/dev/null | \
diff --git a/debian/patches/series b/debian/patches/series
index 60e2549..9671fd5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 use-ack-base
 app-rename
-fix-bash-completion
 remove-incorrect-documentation
diff --git a/debian/rules b/debian/rules
index f429249..883e4cd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,4 @@ override_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
-	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
 	dh_fixperms

-- 
Packaging of ack-grep in Debian