[Bash-completion-commits] [SCM] debian-package branch, master, updated. debian/1.2-3-10-g21afafc

[David Paleino]

The following commit has been merged in the master branch:
commit b19af516753b2d07ea83a1d2003e22a60131cac1
Author: David Paleino <dapal at debian.org>
Date:   Sun Feb 6 21:57:41 2011 +0100

    Remove patch merged upstream

diff --git a/debian/patches/00-fix_586210.patch b/debian/patches/00-fix_586210.patch
deleted file mode 100644
index 38cd0e5..0000000
--- a/debian/patches/00-fix_586210.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit 1f8b55a92aba6d03bb4c43dade1f8b2e2b847b61
-Author: David Paleino <dapal at debian.org>
-Date:   Thu Jun 17 17:43:18 2010 +0200
-Subject: fixed "service" completion, thanks to John Hedges (Debian: #586210)
- The patch makes it safe even when every file in /etc/init.d/*
- has a proper completion (unlikely, but seems like it happened).
- .
- Thanks to John Hedges <john at drystone.co.uk> for the patch, slightly
- modified to make it more compact.
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=586210
-
----
- contrib/service |    7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
---- bash-completion.orig/contrib/service
-+++ bash-completion/contrib/service
-@@ -32,9 +32,10 @@ _service()
-     return 0
- } &&
- complete -F _service service
--[ -d /etc/init.d/ ] && complete -F _service -o default \
--    $(for i in /etc/init.d/*; do
--    complete -p ${i##*/} &>/dev/null || printf '%s\n' ${i##*/}; done)
-+[ -d /etc/init.d/ ] && (
-+    services=$(for i in /etc/init.d/*; do
-+        complete -p ${i##*/} &>/dev/null || printf '%s\n' ${i##*/}; done)
-+    [ -n "$services" ] && complete -F _service -o default $services;)
- 
- # Local variables:
- # mode: shell-script
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 1f15f63..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-00-fix_586210.patch

-- 
debian-package