summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorDavid Paleino <dapal@debian.org>2014-03-19 11:01:55 +0100
committerDavid Paleino <dapal@debian.org>2014-03-19 11:01:55 +0100
commite1c7b890b48196b39900219826c0bc20b1bb08ef (patch)
treeea379328a0fff9346669baa60bdda02ec4dc4ce4 /debian/patches
parenta495c9aa3dff59c8fda86aee1bda7767fd92fbb7 (diff)
downloadbash-completion-e1c7b890b48196b39900219826c0bc20b1bb08ef.tar.gz
fix_gcc_detection.patch, correctly parses Debian's GCC version number, thanks to Tomas Janousek (Closes: #665651)
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/05-fix_gcc_detection.patch23
-rw-r--r--debian/patches/series1
2 files changed, 24 insertions, 0 deletions
diff --git a/debian/patches/05-fix_gcc_detection.patch b/debian/patches/05-fix_gcc_detection.patch
new file mode 100644
index 00000000..a77de4a7
--- /dev/null
+++ b/debian/patches/05-fix_gcc_detection.patch
@@ -0,0 +1,23 @@
+From: Tomas Janousek <tomi@nomi.cz>
+Subject: fix version detection for Debian's GCC
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=665651
+Origin: vendor, https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=665651
+Forwarded: no
+
+---
+ completions/gcc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- bash-completion.orig/completions/gcc
++++ bash-completion/completions/gcc
+@@ -47,8 +47,8 @@ _gcc()
+ } &&
+ complete -F _gcc gcc g++ g77 gcj gpc &&
+ {
+- cc --version 2>/dev/null | grep -q GCC && complete -F _gcc cc || :
+- c++ --version 2>/dev/null | grep -q GCC && complete -F _gcc c++ || :
++ cc --version 2>/dev/null | grep -q 'GCC\|Debian' && complete -F _gcc cc || :
++ c++ --version 2>/dev/null | grep -q 'GCC\|Debian' && complete -F _gcc c++ || :
+ }
+
+ # ex: ts=4 sw=4 et filetype=sh
diff --git a/debian/patches/series b/debian/patches/series
index 416bf03d..0faecdfd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
02-dpkg_ddeb.patch
03-disable_avahi_browse.patch
04-xine_add_more_formats.patch
+05-fix_gcc_detection.patch