[Bash-completion-commits] [SCM] debian-package branch, master, updated. upstream/1.1-45-gdafe866

[David Paleino]

The following commit has been merged in the master branch:
commit dafe866dedfc118bb1635f9470a6690996f71e90
Author: David Paleino <dapal at debian.org>
Date:   Sat Nov 14 23:43:26 2009 +0100

    debian/patches/03-fix_552631.patch fixed (Closes: #556251)

diff --git a/debian/changelog b/debian/changelog
index acf8524..6597837 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+bash-completion (1:1.1-3) unstable; urgency=low
+
+  * debian/patches/03-fix_552631.patch fixed (Closes: #556251)
+
+ -- David Paleino <dapal at debian.org>  Sat, 14 Nov 2009 23:42:55 +0100
+
 bash-completion (1:1.1-2) unstable; urgency=low
 
   * debian/control, debian/rules: added quilt infrastructure
diff --git a/debian/patches/03-fix_552631.patch b/debian/patches/03-fix_552631.patch
index 98d57f6..25a1bdb 100644
--- a/debian/patches/03-fix_552631.patch
+++ b/debian/patches/03-fix_552631.patch
@@ -15,11 +15,11 @@ Date:   Thu Oct 29 19:15:53 2009 +0200
     Fix sed error in qdbus completions containing slashes (Debian: 552631).
 
 ---
- bash_completion   |   54 ++++++++++++++++++++++++++++--------------------------
- contrib/configure |   14 ++++++++------
- contrib/getent    |    8 ++++----
- contrib/qdbus     |   10 +++-------
- 4 files changed, 43 insertions(+), 43 deletions(-)
+ bash_completion   |   55 +++++++++++++++++++++++++++---------------------------
+ contrib/configure |   14 +++++++------
+ contrib/getent    |    8 +++----
+ contrib/qdbus     |   10 ++-------
+ 4 files changed, 43 insertions(+), 44 deletions(-)
 
 --- bash-completion-debian.orig/bash_completion
 +++ bash-completion-debian/bash_completion
@@ -129,17 +129,18 @@ Date:   Thu Oct 29 19:15:53 2009 +0200
              fi
          elif [ -r /etc/vfstab ]; then
              # Solaris
-@@ -960,8 +962,8 @@ deinstall clean clean-depends kernel bui
+@@ -960,9 +962,8 @@ deinstall clean clean-depends kernel bui
          if [ $COMP_CWORD -gt 1 ] &&
              [[ "${COMP_WORDS[COMP_CWORD-1]}" != -* ]]; then
              # do module parameter completion
 -            COMPREPLY=( $( /sbin/modinfo -p ${COMP_WORDS[1]} 2>/dev/null | \
 -            awk '{if ($1 ~ /^parm:/ && $2 ~ /^'"$cur"'/) { print $2 } \
+-        else if ($1 !~ /:/ && $1 ~ /^'"$cur"'/) { print $1 }}' ) )
 +            COMPREPLY=( $( compgen -W "$( /sbin/modinfo -p ${COMP_WORDS[1]} | \
 +                cut -d: -f1 )" -- "$cur" ) )
-         else if ($1 !~ /:/ && $1 ~ /^'"$cur"'/) { print $1 }}' ) )
          else
              _modules $(uname -r)
+         fi
 --- bash-completion-debian.orig/contrib/configure
 +++ bash-completion-debian/contrib/configure
 @@ -12,13 +12,15 @@ _configure()

-- 
debian-package