Date: Thursday, March 12, 2015 @ 19:58:08 Author: spupykin Revision: 129134
upgpkg: schroot 1.6.10-5 upd Modified: schroot/trunk/PKGBUILD Deleted: schroot/trunk/colon-completion.patch ------------------------+ PKGBUILD | 11 ++++++----- colon-completion.patch | 20 -------------------- 2 files changed, 6 insertions(+), 25 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-03-12 17:53:52 UTC (rev 129133) +++ PKGBUILD 2015-03-12 18:58:08 UTC (rev 129134) @@ -4,7 +4,7 @@ pkgname=schroot pkgver=1.6.10 -pkgrel=4 +pkgrel=5 pkgdesc="Allows users to execute shell commands under different root filesystems. (Successor to dchroot)." url="http://packages.qa.debian.org/s/schroot.html"; license=('GPL3') @@ -27,7 +27,6 @@ 'arch32-mount' 'arch32-nssdatabases' 'pam.d.schroot.patch' - 'colon-completion.patch' 'fix-bash-completion.patch') md5sums=('f8ec667831487f4b12e094bc0dc9bbe3' '54239847f89b9a4772910415bde6276a' @@ -36,13 +35,15 @@ 'f0d5d5b5e34a860f6f90b5628c680f46' 'af1da6edd8c8c0dafeeb2c2c4e0c840b' 'a8d77cac806a0a9adef3f93cdbeb280a' - 'f0d03bf6c60ed119781b27b98234299c' '5ba775d4f401e2c167414caa548b71e5') +prepare() { + cd ${pkgname}-${pkgver} + patch -p1 -i ${srcdir}/fix-bash-completion.patch +} + build() { cd ${pkgname}-${pkgver} -# patch -p1 -i ${srcdir}/fix-bash-completion.patch -# patch -p1 -i ${srcdir}/colon-completion.patch export LDFLAGS="${LDFLAGS//-Wl,--as-needed}" ./configure \ --prefix=/usr \ Deleted: colon-completion.patch =================================================================== --- colon-completion.patch 2015-03-12 17:53:52 UTC (rev 129133) +++ colon-completion.patch 2015-03-12 18:58:08 UTC (rev 129134) @@ -1,20 +0,0 @@ -diff -wbBur schroot-1.6.5.org/etc/bash_completion/schroot schroot-1.6.5/etc/bash_completion/schroot ---- schroot-1.6.5.org/etc/bash_completion/schroot 2013-01-28 15:28:04.000000000 +0400 -+++ schroot-1.6.5/etc/bash_completion/schroot 2013-01-28 15:30:22.297213632 +0400 -@@ -21,14 +21,14 @@ - local cur prev options - - COMPREPLY=() -- cur=${COMP_WORDS[COMP_CWORD]} -- prev=${COMP_WORDS[COMP_CWORD-1]} -+ _get_comp_words_by_ref -n : cur prev - - # Select precisely the tokens from schroot --help that begin with a dash - options=$(schroot --help | sed 's/\(^\|[[:space:]]\)[^[:space:]-][^[:space:]]*//g') - - if [ "$prev" = "-c" ] || [ "$prev" = "--chroot" ]; then - COMPREPLY=( $(compgen -W "$(schroot -a -l)" -- $cur) ) -+ __ltrim_colon_completions "$cur" - else - COMPREPLY=( $(compgen -W "$options" -- $cur) ) - fi
