Remove patches applied upstream

The patches removed by this commit are no longer required downstream,
because they have been integrated upstream.

7 files changed, 0 insertions, 158 deletions

diff --git a/debian/patches/01-words_bad_array_subscript.patch b/debian/patches/01-words_bad_array_subscript.patch
deleted file mode 100644
index 797fe62a..00000000
--- a/debian/patches/01-words_bad_array_subscript.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Barry Warsaw <barry@python.org>
-Subject: Fix bash: words: bad array subscript
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/bash-completion/+bug/1289597
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=741479
-Origin: vendor, https://bugs.launchpad.net/ubuntu/+source/bash-completion/+bug/1289597
-Forwarded: yes, <20140312212729.17788.38099.reportbug@samba4.Chuck.local>
-
----
- bash_completion |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- bash-completion.orig/bash_completion
-+++ bash-completion/bash_completion
-@@ -718,7 +718,7 @@ _init_completion()
-         fi
-     done
- 
--    [[ $cword -eq 0 ]] && return 1
-+    [[ $cword -le 0 ]] && return 1
-     prev=${words[cword-1]}
- 
-     [[ ${split-} ]] && _split_longopt && split=true
diff --git a/debian/patches/02-dpkg_ddeb.patch b/debian/patches/02-dpkg_ddeb.patch
deleted file mode 100644
index beaee837..00000000
--- a/debian/patches/02-dpkg_ddeb.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Sebastien Bacher <seb128@ubuntu.com>
-Subject: dpkg also supports *.ddeb
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/bash-completion/+bug/568404
-Origin: vendor
-Forwarded: no
-
----
- completions/dpkg |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- bash-completion.orig/completions/dpkg
-+++ bash-completion/completions/dpkg
-@@ -55,7 +55,7 @@ _dpkg()
-         -c|-i|-A|-I|-f|-e|-x|-X|-W|--install|--unpack|--record-avail| \
-         --contents|--info|--fsys-tarfile|--field|--control|--extract| \
-         --show)
--            _filedir '?(u)deb'
-+            _filedir '?(u|d)deb'
-             return 0
-             ;;
-         -b|--build)
diff --git a/debian/patches/09-aptitude_safe-upgrade.patch b/debian/patches/09-aptitude_safe-upgrade.patch
deleted file mode 100644
index 04b27341..00000000
--- a/debian/patches/09-aptitude_safe-upgrade.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Nicolas Le Cam <niko.lecam@gmail.com>
-Subject: aptitude safe-upgrade accepts package names
-Forwarded: no
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=673235
-Origin: vendor, https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=673235
-
----
- completions/aptitude |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- bash-completion.orig/completions/aptitude
-+++ bash-completion/completions/aptitude
-@@ -26,7 +26,7 @@ _aptitude()
- 
-     local special i
-     for (( i=0; i < ${#words[@]}-1; i++ )); do
--        if [[ ${words[i]} == @(@(|re)install|@(|un)hold|@(|un)markauto|@(dist|full)-upgrade|download|show|forbid-version|purge|remove|changelog|why@(|-not)|keep@(|-all)|build-dep|@(add|remove)-user-tag|versions) ]]; then
-+        if [[ ${words[i]} == @(@(|re)install|@(|un)hold|@(|un)markauto|@(dist|full|safe)-upgrade|download|show|forbid-version|purge|remove|changelog|why@(|-not)|keep@(|-all)|build-dep|@(add|remove)-user-tag|versions) ]]; then
-             special=${words[i]}
-         fi
-         #exclude some mutually exclusive options
-@@ -38,7 +38,7 @@ _aptitude()
-        case $special in
-            install|hold|markauto|unmarkauto|dist-upgrade|full-upgrade| \
-            download|show|changelog|why|why-not|build-dep|add-user-tag| \
--           remove-user-tag|versions)
-+           remove-user-tag|versions|safe-upgrade)
-                COMPREPLY=( $( apt-cache pkgnames $cur 2> /dev/null ) )
-                return 0
-                ;;
-@@ -56,7 +56,7 @@ _aptitude()
- 
-     case $prev in
-         # don't complete anything if these options are found
--        autoclean|clean|forget-new|search|safe-upgrade|upgrade|update|keep-all)
-+        autoclean|clean|forget-new|search|upgrade|update|keep-all)
-             return 0
-             ;;
-         -S)
diff --git a/debian/patches/10-ifconfig_locale.patch b/debian/patches/10-ifconfig_locale.patch
deleted file mode 100644
index a18ec268..00000000
--- a/debian/patches/10-ifconfig_locale.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Thilo Six <T.Six@gmx.de>
-Subject: use explicit C locale for ifconfig
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=704832
-Origin: upstream, http://anonscm.debian.org/gitweb/?p=bash-completion/bash-completion.git;a=commitdiff;h=a9db458
-Forwarded: not-needed
-
----
- bash_completion |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- bash-completion.orig/bash_completion
-+++ bash-completion/bash_completion
-@@ -836,7 +836,8 @@ _mac_addresses()
-     # - ifconfig on Linux: HWaddr or ether
-     # - ifconfig on FreeBSD: ether
-     # - ip link: link/ether
--    COMPREPLY+=( $( { ifconfig -a || ip link show; } 2>/dev/null | sed -ne \
-+    COMPREPLY+=( $( \
-+        { LC_ALL=C ifconfig -a || ip link show; } 2>/dev/null | sed -ne \
-         "s/.*[[:space:]]HWaddr[[:space:]]\{1,\}\($re\)[[:space:]].*/\1/p" -ne \
-         "s/.*[[:space:]]HWaddr[[:space:]]\{1,\}\($re\)[[:space:]]*$/\1/p" -ne \
-         "s|.*[[:space:]]\(link/\)\{0,1\}ether[[:space:]]\{1,\}\($re\)[[:space:]].*|\2|p" -ne \
diff --git a/debian/patches/11-dont_return_from_sourced_script.patch b/debian/patches/11-dont_return_from_sourced_script.patch
deleted file mode 100644
index c023ed8c..00000000
--- a/debian/patches/11-dont_return_from_sourced_script.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Ville Skyttä <ville.skytta@iki.fi>
-Subject: don't return from sourced script
-Origin: upstream, http://anonscm.debian.org/gitweb/?p=bash-completion/bash-completion.git;a=commitdiff;h=867282a
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=741657
-Forwarded: not-needed
-
----
- bash_completion.sh.in |    4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- bash-completion.orig/bash_completion.sh.in
-+++ bash-completion/bash_completion.sh.in
-@@ -1,5 +1,5 @@
- # Check for interactive bash and that we haven't already been sourced.
--[ -z "$BASH_VERSION" -o -z "$PS1" -o -n "$BASH_COMPLETION_COMPAT_DIR" ] && return
-+if [ -n "$BASH_VERSION" -a -n "$PS1" -a -z "$BASH_COMPLETION_COMPAT_DIR" ]; then
- 
- # Check for recent enough version of bash.
- bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.}
-@@ -12,3 +12,5 @@ if [ $bmajor -gt 4 ] || [ $bmajor -eq 4
-     fi
- fi
- unset bash bmajor bminor
-+
-+fi
diff --git a/debian/patches/12-look_for_pod.patch b/debian/patches/12-look_for_pod.patch
deleted file mode 100644
index c1bc6621..00000000
--- a/debian/patches/12-look_for_pod.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Carl Hayter <zengargoyle@gmail.com>
-Subject: perldoc: look for .pod in addition to .pm files
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=708173
-Origin: vendor, https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=708173
-Forwarded: no
-
----
- helpers/perl |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- bash-completion.orig/helpers/perl
-+++ bash-completion/helpers/perl
-@@ -23,8 +23,8 @@ sub print_modules_real {
-     chdir($dir) or return;
- 
-     # print each file
--    foreach my $file (glob('*.pm')) {
--        $file =~ s/\.pm$//;
-+    foreach my $file (glob('*.{pm,pod}')) {
-+        $file =~ s/\.(?:pm|pod)$//;
-         my $module = $base . $file;
-         next if $module !~ /^\Q$word/;
-         next if $seen{$module}++;
diff --git a/debian/patches/series b/debian/patches/series
index 2b1eaec7..194f7a4b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,13 +1,7 @@
 00-fix_quote_readline_by_ref.patch
-01-words_bad_array_subscript.patch
-02-dpkg_ddeb.patch
 03-disable_avahi_browse.patch
 04-xine_add_more_formats.patch
 05-fix_gcc_detection.patch
 06-xpdf_support_compressed_pdf.patch
 07-dpkg_support_raw-extract_vextract.patch
 08-dpkg_fix_-W_option.patch
-09-aptitude_safe-upgrade.patch
-10-ifconfig_locale.patch
-11-dont_return_from_sourced_script.patch
-12-look_for_pod.patch