[Bash-completion-commits] [SCM] debian-package branch, master, updated. debian/1.1-3-16-g07ac173
David Paleino
dapal at debian.org
Wed Jun 16 17:09:27 UTC 2010
The following commit has been merged in the master branch:
commit 1b86d0364ef0811df103e5c10749dd7ef334e6a9
Author: David Paleino <dapal at debian.org>
Date: Wed Jun 16 18:23:07 2010 +0200
debian/patches/* removed, merged upstream
diff --git a/debian/changelog b/debian/changelog
index c2b1702..adc1ca8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,7 @@
bash-completion (1:1.2-1) UNRELEASED; urgency=low
* New upstream release
- * debian/patches/04-fix_557436.patch added, added missing
- completions for -?, --help, --license, --usage, --version
- and (-p) --to-stdout to contrib/cpio (Closes: #557436)
+ * debian/patches/* removed, merged upstream
* debian/control:
- add Conflicts/Replaces on xen-tools (<= 4.1-1) (Closes: #550590)
* debian/links: remove dangling symlink in /usr/share/doc/bash
@@ -11,7 +9,7 @@ bash-completion (1:1.2-1) UNRELEASED; urgency=low
* debian/watch: fix regex to avoid old timestamp-based releases
* debian/preinst: definitely remove anything in /usr/share/doc/bash/
- -- David Paleino <dapal at debian.org> Wed, 16 Jun 2010 18:20:55 +0200
+ -- David Paleino <dapal at debian.org> Wed, 16 Jun 2010 18:22:50 +0200
bash-completion (1:1.1-3) unstable; urgency=low
diff --git a/debian/patches/01-fix_550943.patch b/debian/patches/01-fix_550943.patch
deleted file mode 100644
index cd31668..0000000
--- a/debian/patches/01-fix_550943.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Patch already applied upstream
----
- contrib/munin-node | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
---- bash-completion-debian.orig/contrib/munin-node
-+++ bash-completion-debian/contrib/munin-node
-@@ -1,7 +1,7 @@
- # bash completion for munin node
-
- have munin-run &&
--_munin-run()
-+_munin_run()
- {
- local cur prev
-
-@@ -28,10 +28,10 @@ _munin-run()
- -- "$cur" ) )
- fi
- } &&
--complete -F _munin-run munin-run
-+complete -F _munin_run munin-run
-
- have munin-update &&
--_munin-update()
-+_munin_update()
- {
- local cur prev
-
-@@ -56,10 +56,10 @@ _munin-update()
- --fork --nofork --stdout --nostdout --timeout' -- "$cur" ) )
- fi
- } &&
--complete -F _munin-update munin-update
-+complete -F _munin_update munin-update
-
- have munin-node-configure &&
--_munin-node-configure()
-+_munin_node_configure()
- {
- local cur prev
-
-@@ -92,7 +92,7 @@ _munin-node-configure()
- --remove-also --snmp --snmpversion --snmpcommunity' -- "$cur" ) )
- fi
- } &&
--complete -F _munin-node-configure munin-node-configure
-+complete -F _munin_node_configure munin-node-configure
-
- # Local variables:
- # mode: shell-script
diff --git a/debian/patches/02-fix_552109.patch b/debian/patches/02-fix_552109.patch
deleted file mode 100644
index 742ec3f..0000000
--- a/debian/patches/02-fix_552109.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Upstream's 4b289de
----
- contrib/dpkg | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- bash-completion-debian.orig/contrib/dpkg
-+++ bash-completion-debian/contrib/dpkg
-@@ -40,7 +40,7 @@ _dpkg()
- fi
-
- case "$prev" in
-- -@(c|i|A|I|f|e|x|X|-@(install|unpack|record-avail|contents|info|fsys-tarfile|field|control|extract)))
-+ -@(c|i|A|I|f|e|x|X|W|-@(install|unpack|record-avail|contents|info|fsys-tarfile|field|control|extract|show)))
- _filedir '?(u)deb'
- return 0
- ;;
diff --git a/debian/patches/03-fix_552631.patch b/debian/patches/03-fix_552631.patch
deleted file mode 100644
index 25a1bdb..0000000
--- a/debian/patches/03-fix_552631.patch
+++ /dev/null
@@ -1,206 +0,0 @@
-From: David Paleino <d.paleino at gmail.com>
-Description: backports for #552631
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=552631
-
-commit ac644578e07720281452d5ed8c22181365a27d87
-Author: Ville Skyttä <ville.skytta at iki.fi>
-Date: Sun Nov 1 21:01:18 2009 +0200
-
- More compgen -W instead of embedding user input in sed/awk/grep fixes.
-
-commit 1d74adc296c7f5d744c29481536cbd8948768ae5
-Author: Ville Skyttä <ville.skytta at iki.fi>
-Date: Thu Oct 29 19:15:53 2009 +0200
-
- Fix sed error in qdbus completions containing slashes (Debian: 552631).
-
----
- 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
-@@ -470,23 +470,23 @@ _configured_interfaces()
- {
- if [ -f /etc/debian_version ]; then
- # Debian system
-- COMPREPLY=( $( sed -ne 's|^iface \([^ ]\+\).*$|\1|p' \
-- /etc/network/interfaces ) )
-+ COMPREPLY=( $( compgen -W "$( sed -ne 's|^iface \([^ ]\+\).*$|\1|p' \
-+ /etc/network/interfaces )" -- "$cur" ) )
- elif [ -f /etc/SuSE-release ]; then
- # SuSE system
-- COMPREPLY=( $( command ls \
-- /etc/sysconfig/network/ifcfg-* | \
-- sed -ne 's|.*ifcfg-\('"$cur"'.*\)|\1|p' ) )
-+ COMPREPLY=( $( compgen -W "$( command ls \
-+ /etc/sysconfig/network/ifcfg-* | \
-+ sed -ne 's|.*ifcfg-\(.*\)|\1|p' )" -- "$cur" ) )
- elif [ -f /etc/pld-release ]; then
- # PLD Linux
-- COMPREPLY=( $( command ls -B \
-- /etc/sysconfig/interfaces | \
-- sed -ne 's|.*ifcfg-\('"$cur"'.*\)|\1|p' ) )
-+ COMPREPLY=( $( compgen -W "$( command ls -B \
-+ /etc/sysconfig/interfaces | \
-+ sed -ne 's|.*ifcfg-\(.*\)|\1|p' )" -- "$cur" ) )
- else
- # Assume Red Hat
-- COMPREPLY=( $( command ls \
-- /etc/sysconfig/network-scripts/ifcfg-* | \
-- sed -ne 's|.*ifcfg-\('"$cur"'.*\)|\1|p' ) )
-+ COMPREPLY=( $( compgen -W "$( command ls \
-+ /etc/sysconfig/network-scripts/ifcfg-* | \
-+ sed -ne 's|.*ifcfg-\(.*\)|\1|p' )" -- "$cur" ) )
- fi
- }
-
-@@ -514,7 +514,8 @@ _available_interfaces()
- fi
-
- COMPREPLY=( $( eval $cmd 2>/dev/null | \
-- sed -ne 's|^\('"$cur"'[^[:space:][:punct:]]\{1,\}\).*$|\1|p') )
-+ awk '/^[^[:space:]]/ { print $1 }' ) )
-+ COMPREPLY=( $( compgen -W '${COMPREPLY[@]/%[[:punct:]]/}' -- "$cur" ) )
- }
-
- # This function expands tildes in pathnames
-@@ -608,14 +609,13 @@ _uids()
- _gids()
- {
- if type getent &>/dev/null; then
-- COMPREPLY=( $( getent group | \
-- awk -F: '{if ($3 ~ /^'"$cur"'/) print $3}' ) )
-+ COMPREPLY=( $( compgen -W '$( getent group | cut -d: -f3 )' \
-+ -- "$cur" ) )
- elif type perl &>/dev/null; then
- COMPREPLY=( $( compgen -W '$( perl -e '"'"'while (($gid) = (getgrent)[2]) { print $gid . "\n" }'"'"' )' -- "$cur" ) )
- else
- # make do with /etc/group
-- COMPREPLY=( $( awk 'BEGIN {FS=":"} {if ($3 ~ /^'"$cur"'/) print $3}'\
-- /etc/group ) )
-+ COMPREPLY=( $( compgen -W '$( cut -d: -f3 /etc/group )' -- "$cur" ) )
- fi
- }
-
-@@ -641,8 +641,8 @@ _modules()
- {
- local modpath
- modpath=/lib/modules/$1
-- COMPREPLY=( $( command ls -R $modpath | \
-- sed -ne 's/^\('"$cur"'.*\)\.k\?o\(\|.gz\)$/\1/p') )
-+ COMPREPLY=( $( compgen -W "$( command ls -R $modpath | \
-+ sed -ne 's/^\(.*\)\.k\?o\(\|.gz\)$/\1/p' )" -- "$cur" ) )
- }
-
- # This function completes on installed modules
-@@ -650,7 +650,7 @@ _modules()
- _installed_modules()
- {
- COMPREPLY=( $( compgen -W "$( PATH="$PATH:/sbin" lsmod | \
-- awk '{if (NR != 1) print $1}' )" -- $1 ) )
-+ awk '{if (NR != 1) print $1}' )" -- "$1" ) )
- }
-
- # This function completes on user:group format
-@@ -885,15 +885,17 @@ deinstall clean clean-depends kernel bui
- for i in {,/usr}/{,s}bin/showmount; do [ -x $i ] && sm=$i && break; done
-
- if [ -n "$sm" ] && [[ "$cur" == *:* ]]; then
-- COMPREPLY=( $( $sm -e ${cur%%:*} | sed 1d | \
-- grep ^${cur#*:} | awk '{print $1}' ) )
-+ COMPREPLY=( $( compgen -W "$( $sm -e ${cur%%:*} | sed 1d | \
-+ awk '{print $1}' )" -- "$cur" ) )
- elif [[ "$cur" == //* ]]; then
- host=${cur#//}
- host=${host%%/*}
- if [ -n "$host" ]; then
-- COMPREPLY=( $( compgen -W "$( echo $( smbclient -d 0 -NL $host 2>/dev/null|
-- sed -ne '/^['"$'\t '"']*Sharename/,/^$/p' |
-- sed -ne '3,$s|^[^A-Za-z]*\([^'"$'\t '"']*\).*$|//'$host'/\1|p' ) )" -- "$cur" ) )
-+ COMPREPLY=( $( compgen -P "//$host" -W \
-+ "$( smbclient -d 0 -NL $host 2>/dev/null |
-+ sed -ne '/^['"$'\t '"']*Sharename/,/^$/p' |
-+ sed -ne '3,$s|^[^A-Za-z]*\([^'"$'\t '"']*\).*$|/\1|p' )" \
-+ -- "${cur#//$host}" ) )
- fi
- elif [ -r /etc/vfstab ]; then
- # Solaris
-@@ -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
- _modules $(uname -r)
- fi
---- bash-completion-debian.orig/contrib/configure
-+++ bash-completion-debian/contrib/configure
-@@ -12,13 +12,15 @@ _configure()
- [[ "$cur" != -* ]] && return 0
-
- if [ -n "$COMP_CONFIGURE_HINTS" ]; then
-- COMPREPLY=( $( $1 --help 2>&1 | awk '/^ --[A-Za-z]/ { print $1; \
-- if ($2 ~ /--[A-Za-z]/) print $2 }' | sed -e 's/[[,].*//g' | \
-- grep ^$cur ) )
-+ COMPREPLY=( $( compgen -W "$( $1 --help 2>&1 | \
-+ awk '/^ --[A-Za-z]/ { print $1; \
-+ if ($2 ~ /--[A-Za-z]/) print $2 }' | sed -e 's/[[,].*//g' )" \
-+ -- "$cur" ) )
- else
-- COMPREPLY=( $( $1 --help 2>&1 | awk '/^ --[A-Za-z]/ { print $1; \
-- if ($2 ~ /--[A-Za-z]/) print $2 }' | sed -e 's/[[,=].*//g' | \
-- grep ^$cur ) )
-+ COMPREPLY=( $( compgen -W "$( $1 --help 2>&1 | \
-+ awk '/^ --[A-Za-z]/ { print $1; \
-+ if ($2 ~ /--[A-Za-z]/) print $2 }' | sed -e 's/[[,=].*//g' )" \
-+ -- "$cur" ) )
- fi
- }
- complete -F _configure $default configure
---- bash-completion-debian.orig/contrib/getent
-+++ bash-completion-debian/contrib/getent
-@@ -27,13 +27,13 @@ _getent()
- return 0
- ;;
- protocols|networks|ahosts|ahostsv4|ahostsv6|rpc)
-- COMPREPLY=( $( getent "$prev" | \
-- sed -ne 's|^\('"$cur"'[^[:space:]]*\).*|\1|p' ) )
-+ COMPREPLY=( $( compgen -W "$( getent "$prev" | \
-+ awk '{ print $1 }' )" -- "$cur" ) )
- return 0
- ;;
- aliases|shadow)
-- COMPREPLY=( $( getent "$prev" | \
-- sed -ne 's|^\('"$cur"'[^:]*\).*|\1|p' ) )
-+ COMPREPLY=( $( compgen -W "$( getent "$prev" | cut -d: -f1 )" \
-+ -- "$cur" ) )
- return 0
- ;;
- esac
---- bash-completion-debian.orig/contrib/qdbus
-+++ bash-completion-debian/contrib/qdbus
-@@ -7,13 +7,9 @@ _qdbus()
-
- COMPREPLY=()
- cur=`_get_cword`
-- if [ -z "$cur" ]; then
-- compstr=${COMP_WORDS[*]}
-- else
-- compstr=$( command echo ${COMP_WORDS[*]} | sed "s/ ${cur/\//\\/}$//" )
-- fi
-- COMPREPLY=( $( compgen -W '$( command $compstr | sed s/\(.*\)// )' \
-- -- "$cur" ) )
-+ [ -n "$cur" ] && unset COMP_WORDS[${#COMP_WORDS[@]}-1]
-+ COMPREPLY=( $( compgen -W '$( command ${COMP_WORDS[@]} | sed s/\(.*\)// )' \
-+ -- "$cur" ) )
- } &&
- complete -F _qdbus qdbus
-
diff --git a/debian/patches/04-fix_557436.patch b/debian/patches/04-fix_557436.patch
deleted file mode 100644
index c96db79..0000000
--- a/debian/patches/04-fix_557436.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit 9a8fb49fe4f2e624ad7892439708836496318d6f
-Author: David Paleino <dapal at debian.org>
-Date: Sun Nov 22 08:22:58 2009 +0100
-
- contrib/cpio: added missing completions for -?, --help, --license, --usage, --version and (-p) --to-stdout (Debian: #557436)
-
-diff --git a/contrib/cpio b/contrib/cpio
-index f28b1b2..08e44ca 100644
---- a/contrib/cpio
-+++ b/contrib/cpio
-@@ -39,7 +39,8 @@ _cpio()
- $split && return 0
-
- if [ $COMP_CWORD -eq 1 ]; then
-- COMPREPLY=( $( compgen -W '-o --create -i --extract -p --pass-through' -- "$cur" ) )
-+ COMPREPLY=( $( compgen -W '-o --create -i --extract -p --pass-through \
-+ -? --help --license --usage --version' -- "$cur" ) )
- else
- case ${COMP_WORDS[1]} in
- -@(o|-create))
-@@ -69,6 +70,7 @@ _cpio()
- --force-local --no-absolute-filenames\
- --sparse --only-verify-crc --quiet\
- --rsh-command --help\
-+ --to-stdout \
- --version' -- "$cur" ) )
- fi
- ;;
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 5c4b107..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-01-fix_550943.patch
-02-fix_552109.patch
-03-fix_552631.patch
-04-fix_557436.patch
--
debian-package
More information about the Bash-completion-commits
mailing list