[Bash-completion-commits] [SCM] debian-package branch, master, updated. upstream/1.0-31-g69d1c0a
David Paleino
d.paleino at gmail.com
Sat Oct 10 15:49:29 UTC 2009
The following commit has been merged in the master branch:
commit ffcb6a4b82b7a87f242900f9aebab65cd8ff707d
Author: David Paleino <d.paleino at gmail.com>
Date: Sat Oct 10 17:25:02 2009 +0200
debian/patches/*.patch removed, merged upstream
diff --git a/debian/changelog b/debian/changelog
index d737e93..403a909 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ bash-completion (1:1.1-1) UNRELEASED; urgency=low
* New upstream release
* debian/extra/bash-completion.pm moved to bash_completion.pm
(Closes: #535105)
+ * debian/patches/*.patch removed, merged upstream
- -- David Paleino <d.paleino at gmail.com> Sat, 10 Oct 2009 17:23:16 +0200
+ -- David Paleino <d.paleino at gmail.com> Sat, 10 Oct 2009 17:24:46 +0200
bash-completion (1:1.0-3) unstable; urgency=low
diff --git a/debian/patches/01-529510.patch b/debian/patches/01-529510.patch
deleted file mode 100644
index 3001573..0000000
--- a/debian/patches/01-529510.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-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/02-514377.patch b/debian/patches/02-514377.patch
deleted file mode 100644
index 89cad09..0000000
--- a/debian/patches/02-514377.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 9f05078e9276cd3e0fcb0a4000c105d6c3558591
-Author: David Paleino <d.paleino at gmail.com>
-Date: Sat Apr 4 21:58:05 2009 +0200
-
- Permit .gz files concatenation (Debian: #514377)
-
----
- bash_completion | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- bash-completion-debian.orig/bash_completion
-+++ bash-completion-debian/bash_completion
-@@ -3474,7 +3474,7 @@ _gzip()
- elif [[ "$prev" == -* ]]; then
- [[ "$prev" == -*[dlt]* ]] && xspec="!"$xspec
- [[ "$prev" == -*f* ]] && xspec=
-- elif [ "$prev" = '>' ]; then
-+ elif [ "$prev" = '>' -o "$prev" = '>>' ]; then
- xspec=
- elif [ "$prev" = '<' ]; then
- xspec=
diff --git a/debian/patches/03-522656.patch b/debian/patches/03-522656.patch
deleted file mode 100644
index 13873cc..0000000
--- a/debian/patches/03-522656.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 204afd77bfebb0d8a70821d1d6ccdd85ef6b54f5
-Author: David Paleino <d.paleino at gmail.com>
-Date: Tue Apr 14 21:40:57 2009 +0200
-
- Add .dvi.{gz,bz2} completion for evince/okular (Debian: #522656)
-
----
- bash_completion | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- bash-completion-debian.orig/bash_completion
-+++ bash-completion-debian/bash_completion
-@@ -111,7 +111,7 @@ complete -f -X '!*.@(dvi|DVI)?(.@(gz|Z|b
- complete -f -X '!*.@(dvi|DVI)' dvips dviselect dvitype dvipdf advi dvipdfm dvipdfmx
- complete -f -X '!*.@(pdf|PDF)' acroread gpdf xpdf
- complete -f -X '!*.@(?(e)ps|?(E)PS|pdf|PDF)' kpdf
--complete -f -X '!*.@(@(?(e)ps|?(E)PS|pdf|PDF)?(.gz|.GZ|.bz2|.BZ2)|cb[rz]|CB[RZ]|djv?(u)|DJV?(U)|dvi|DVI|gif|jp?(e)g|miff|tif?(f)|pn[gm]|p[bgp]m|bmp|xpm|ico|xwd|tga|pcx|GIF|JP?(E)G|MIFF|TIF?(F)|PN[GM]|P[BGP]M|BMP|XPM|ICO|XWD|TGA|PCX)' evince okular
-+complete -f -X '!*.@(@(?(e)ps|?(E)PS|pdf|PDF|dvi|DVI)?(.gz|.GZ|.bz2|.BZ2)|cb[rz]|CB[RZ]|djv?(u)|DJV?(U)|dvi|DVI|gif|jp?(e)g|miff|tif?(f)|pn[gm]|p[bgp]m|bmp|xpm|ico|xwd|tga|pcx|GIF|JP?(E)G|MIFF|TIF?(F)|PN[GM]|P[BGP]M|BMP|XPM|ICO|XWD|TGA|PCX)' evince okular
- complete -f -X '!*.@(?(e)ps|?(E)PS|pdf|PDF)' ps2pdf ps2pdf12 ps2pdf13 ps2pdf14 ps2pdfwr
- complete -f -X '!*.texi*' makeinfo texi2html
- complete -f -X '!*.@(?(la)tex|?(LA)TEX|texi|TEXI|dtx|DTX|ins|INS)' tex latex slitex jadetex pdfjadetex pdftex pdflatex texi2dvi
diff --git a/debian/patches/04-495883.patch b/debian/patches/04-495883.patch
deleted file mode 100644
index 41adfc2..0000000
--- a/debian/patches/04-495883.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit a7237df1a5a673f422de2ec6ba1b910daeb16821
-Author: David Paleino <d.paleino at gmail.com>
-Date: Wed Apr 29 15:20:58 2009 +0200
-
- Really add build-dep to aptitude's completion
-
----
- bash_completion | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- bash-completion-debian.orig/bash_completion
-+++ bash-completion-debian/bash_completion
-@@ -2475,7 +2475,7 @@ _aptitude()
- autoclean install reinstall remove \
- hold unhold purge markauto unmarkauto why why-not \
- dist-upgrade full-upgrade download search show \
-- forbid-version changelog keep-all' -- $cur ) )
-+ forbid-version changelog keep-all build-dep' -- $cur ) )
- fi
-
-
diff --git a/debian/patches/series b/debian/patches/series
index 424adf3..b2a4ba5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
-01-529510.patch
-02-514377.patch
-03-522656.patch
-04-495883.patch
+# nothing here
--
debian-package
More information about the Bash-completion-commits
mailing list