[Bash-completion-commits] [debian] 08/19: fix_gcc_detection.patch, correctly parses Debian's GCC version number, thanks to Tomas Janousek (Closes: #665651)

[David Paleino]

This is an automated email from the git hooks/post-receive script.

dapal pushed a commit to branch master
in repository debian.

commit e1c7b890b48196b39900219826c0bc20b1bb08ef
Author: David Paleino <dapal at debian.org>
Date:   Wed Mar 19 11:01:55 2014 +0100

    fix_gcc_detection.patch, correctly parses Debian's GCC version number, thanks to Tomas Janousek (Closes: #665651)
---
 debian/changelog                          |  5 ++++-
 debian/patches/05-fix_gcc_detection.patch | 23 +++++++++++++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 54dc52e..bde763e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,8 +19,11 @@ bash-completion (1:2.1-3) UNRELEASED; urgency=medium
     - clean etc conffiles on upgrade since completion files are in /usr
       with 2.0, thanks to Sebastien Bacher
   * debian/control: marked Multi-Arch: foreign
+  * debian/patches/:
+    - fix_gcc_detection.patch, correctly parses Debian's GCC version
+      number, thanks to Tomas Janousek (Closes: #665651)
 
- -- David Paleino <dapal at debian.org>  Wed, 19 Mar 2014 10:54:05 +0100
+ -- David Paleino <dapal at debian.org>  Wed, 19 Mar 2014 10:58:27 +0100
 
 bash-completion (1:2.1-2) unstable; urgency=low
 
diff --git a/debian/patches/05-fix_gcc_detection.patch b/debian/patches/05-fix_gcc_detection.patch
new file mode 100644
index 0000000..a77de4a
--- /dev/null
+++ b/debian/patches/05-fix_gcc_detection.patch
@@ -0,0 +1,23 @@
+From: Tomas Janousek <tomi at 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 416bf03..0faecdf 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/bash-completion/debian.git