[Bash-completion-commits] [SCM] debian-package branch, master, updated. upstream/1.0-16-gdb5f45a

[David Paleino]

The following commit has been merged in the master branch:
commit db5f45a0a818edc5fbb34ef29b026413a605bb89
Author: David Paleino <d.paleino at gmail.com>
Date:   Sat May 30 19:15:45 2009 +0200

    debian/patches/01-529510.patch added, checks for GNUish userland fail on GNU/kFreeBSD, GNU/kOpenSolaris, etc (Closes: #529510)

diff --git a/debian/changelog b/debian/changelog
index 0eca344..56ec9d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,11 @@ bash-completion (1:1.0-3) UNRELEASED; urgency=low
     (Closes: #530598)
   * debian/rules: added quilt support
   * debian/control: added quilt Build-Depends
+  * debian/patches/:
+    - 01-529510.patch added, checks for GNUish userland fail on
+      GNU/kFreeBSD, GNU/kOpenSolaris, etc (Closes: #529510)
 
- -- David Paleino <d.paleino at gmail.com>  Sat, 30 May 2009 19:08:13 +0200
+ -- David Paleino <d.paleino at gmail.com>  Sat, 30 May 2009 19:14:48 +0200
 
 bash-completion (1:1.0-2) unstable; urgency=low
 
diff --git a/debian/patches/01-529510.patch b/debian/patches/01-529510.patch
new file mode 100644
index 0000000..3001573
--- /dev/null
+++ b/debian/patches/01-529510.patch
@@ -0,0 +1,104 @@
+commit 4fadb6887aa48cb4b835209a2733010f5f94c3cb
+Author: David Paleino <d.paleino at gmail.com>
+Date:   Wed May 20 22:08:53 2009 +0200
+
+    Fix checks for GNUish userland, thanks to Robert Millan (Debian: #529510)
+
+commit 65d9348f3e5a31adf38ace19a3c1d4e6a302fe9e
+Author: Ville Skyttä <ville.skytta at iki.fi>
+Date:   Sat May 23 11:45:39 2009 +0300
+
+    Fix man completion (was broken by recent $UNAME/$USERLAND changes).
+
+---
+ bash_completion |   26 ++++++++++++++------------
+ 1 file changed, 14 insertions(+), 12 deletions(-)
+
+--- bash-completion-debian.orig/bash_completion
++++ bash-completion-debian/bash_completion
+@@ -53,6 +53,11 @@ UNAME=$( uname -s )
+ UNAME=${UNAME/CYGWIN_*/Cygwin}
+ RELEASE=$( uname -r )
+ 
++case ${UNAME} in
++	Linux|GNU|GNU/*) USERLAND=GNU ;;
++	*) USERLAND=${UNAME} ;;
++esac
++
+ # features supported by bash 2.05 and higher
+ if [ ${BASH_VERSINFO[0]} -eq 2 ] && [[ ${BASH_VERSINFO[1]} > 04 ]] ||
+    [ ${BASH_VERSINFO[0]} -gt 2 ]; then
+@@ -188,7 +193,7 @@ have()
+ 
+ # use GNU sed if we have it, since its extensions are still used in our code
+ #
+-[ $UNAME != Linux ] && have gsed && alias sed=gsed
++[ $USERLAND != GNU ] && have gsed && alias sed=gsed
+ 
+ # This function checks whether a given readline variable
+ # is `on'.
+@@ -939,12 +944,12 @@ complete -F _insmod $filenames insmod mo
+ 
+ # man(1) completion
+ #
+-[ $UNAME = GNU -o $UNAME = Linux -o $UNAME = Darwin \
++[ $USERLAND = GNU -o $UNAME = Darwin \
+   -o $UNAME = FreeBSD -o $UNAME = SunOS -o $UNAME = Cygwin \
+   -o $UNAME = OpenBSD ] &&
+ _man()
+ {
+-	local cur prev sect manpath manext mansect UNAME
++	local cur prev sect manpath manext mansect uname
+ 
+ 	manext="@([0-9lnp]|[0-9][px]|man)?(.@(gz|bz2|lzma))"
+ 	mansect="@([0-9lnp]|[0-9][px])"
+@@ -966,11 +971,8 @@ _man()
+ 		return 0
+ 	fi
+ 
+-	UNAME=$( uname -s )
+-	# strip OS type and version under Cygwin
+-	UNAME=${UNAME/CYGWIN_*/Cygwin}
+-	if [ $UNAME = GNU -o $UNAME = Linux -o $UNAME = FreeBSD \
+-	     -o $UNAME = Cygwin ]; then
++	uname=$( uname -s )
++	if [[ $uname == @(Linux|GNU|GNU/*|FreeBSD|Cygwin|CYGWIN_*) ]]; then
+ 		manpath=$( manpath 2>/dev/null || command man --path )
+ 	else
+ 		manpath=$MANPATH
+@@ -1011,7 +1013,7 @@ _man()
+ 
+ 	return 0
+ }
+-[ $UNAME = GNU -o $UNAME = Linux -o $UNAME = Darwin \
++[ $USERLAND = GNU -o $UNAME = Darwin \
+   -o $UNAME = FreeBSD -o $UNAME = SunOS -o $UNAME = Cygwin \
+   -o $UNAME = OpenBSD ] && \
+ complete -F _man $filenames man apropos whatis
+@@ -1408,7 +1410,7 @@ complete -F _iwpriv iwpriv
+ 
+ # Red Hat & Debian GNU/Linux if{up,down} completion
+ #
+-[ $UNAME = Linux ] && { have ifup || have ifdown; } &&
++[ $USERLAND = GNU ] && { have ifup || have ifdown; } &&
+ _ifupdown()
+ {
+ 	local cur
+@@ -1424,7 +1426,7 @@ _ifupdown()
+        return 0
+ } &&
+ complete -F _ifupdown ifup ifdown
+-[ $UNAME = Linux ] && have ifstatus && complete -F _ifupdown ifstatus
++[ $USERLAND = GNU ] && have ifstatus && complete -F _ifupdown ifstatus
+ 
+ # Linux ipsec(8) completion (for FreeS/WAN)
+ #
+@@ -4362,7 +4364,7 @@ _gcc()
+ 	fi
+ } &&
+ complete $filenames -F _gcc gcc g++ c++ g77 gcj gpc
+-[ $UNAME = GNU -o $UNAME = Linux -o $UNAME = Cygwin ] && \
++[ $USERLAND = GNU -o $UNAME = Cygwin ] && \
+ [ -n "${have:-}" ] && complete $filenames -F _gcc cc
+ 
+ # Linux cardctl(8) completion
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..fea85ef
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-529510.patch

-- 
debian-package