[arch-commits] Commit in schroot/trunk (PKGBUILD colon-completion.patch)

[Sergej Pupykin]

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
===
--- PKGBUILD2015-03-12 17:53:52 UTC (rev 129133)
+++ PKGBUILD2015-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.0 +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

[arch-commits] Commit in schroot/trunk (PKGBUILD colon-completion.patch)

[Sergej Pupykin]

Date: Monday, January 28, 2013 @ 12:38:03
  Author: spupykin
Revision: 83210

upgpkg: schroot 1.6.5-1

upd

Modified:
  schroot/trunk/PKGBUILD
  schroot/trunk/colon-completion.patch

+
 PKGBUILD   |8 
 colon-completion.patch |   32 +++-
 2 files changed, 11 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-01-28 10:10:55 UTC (rev 83209)
+++ PKGBUILD2013-01-28 11:38:03 UTC (rev 83210)
@@ -3,8 +3,8 @@
 # Contributor: Andreas Wagner Andreas dot Wagner at em dot uni-frankfurt dot 
de
 
 pkgname=schroot
-pkgver=1.6.3
-pkgrel=5
+pkgver=1.6.5
+pkgrel=1
 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')
@@ -29,14 +29,14 @@
'pam.d.schroot.patch'
'colon-completion.patch'
'fix-bash-completion.patch')
-md5sums=('f6b1badef213ce8e9ef37bb3fc213390'
+md5sums=('99f679d68f180a56289b3ec40d214ae4'
  '54239847f89b9a4772910415bde6276a'
  '5a3f7b839c7e0b8933748da7c5b6385b'
  'ddb2f09c02b24dab777110f9808472e1'
  'f0d5d5b5e34a860f6f90b5628c680f46'
  'af1da6edd8c8c0dafeeb2c2c4e0c840b'
  'a8d77cac806a0a9adef3f93cdbeb280a'
- '8502fcc9112c2971bcae35373d2ff42f'
+ 'f0d03bf6c60ed119781b27b98234299c'
  '5ba775d4f401e2c167414caa548b71e5')
 
 build() {

Modified: colon-completion.patch
===
--- colon-completion.patch  2013-01-28 10:10:55 UTC (rev 83209)
+++ colon-completion.patch  2013-01-28 11:38:03 UTC (rev 83210)
@@ -1,22 +1,7 @@
-From 1563e1ba9bc2b317390ef305ae9af56a4b976940 Mon Sep 17 00:00:00 2001
-From: Peter Wu lekenst...@gmail.com
-Date: Sat, 22 Dec 2012 16:37:00 +0100
-Subject: [PATCH] etc: make bash completion work for colon values
-
---chroot (and -c) accept values like chroot:foo and session:foo-abc. Standard
-bash completion treats colons as whitespace, hence we need a way to force that
-off.
-
-Fix based on http://stackoverflow.com/q/10528695/427545 (thanks Radu Gasler!)

- etc/bash_completion/schroot | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/etc/bash_completion/schroot b/etc/bash_completion/schroot
-index 035f0b3..7cda29b 100644
 a/etc/bash_completion/schroot
-+++ b/etc/bash_completion/schroot
-@@ -21,14 +21,14 @@ _schroot()
+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.0 +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=()
@@ -28,11 +13,8 @@
  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
+ COMPREPLY=( $(compgen -W $(schroot -a -l) -- $cur) )
++__ltrim_colon_completions $cur
  else
-   COMPREPLY=( $(compgen -W $options -- $cur) )
+ COMPREPLY=( $(compgen -W $options -- $cur) )
  fi
--- 
-1.8.0.2
-