diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-03-22 12:02:54 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-03-22 12:02:54 -0300 |
commit | aa49e201b1464851bcebcd821592a2fceeaddcbc (patch) | |
tree | 40708e916d04d7929b2bc2a8c17c796fb91dec8e /core/bash | |
parent | e555324330bef021c747085c7499fd843ed20f47 (diff) | |
parent | 39e662ccfbe62ae77d458159d192816171a22f43 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/agave/PKGBUILD
community/raul/PKGBUILD
gnome-unstable/at-spi2-atk/PKGBUILD
gnome-unstable/at-spi2-core/PKGBUILD
gnome-unstable/atk/PKGBUILD
gnome-unstable/cheese/PKGBUILD
gnome-unstable/cogl/PKGBUILD
gnome-unstable/empathy/PKGBUILD
gnome-unstable/eog/PKGBUILD
gnome-unstable/gdk-pixbuf2/PKGBUILD
gnome-unstable/gedit/PKGBUILD
gnome-unstable/glib-networking/PKGBUILD
gnome-unstable/gnome-bluetooth/PKGBUILD
gnome-unstable/gnome-documents/PKGBUILD
gnome-unstable/gnome-documents/gnome-documents.install
gnome-unstable/gnome-shell/PKGBUILD
gnome-unstable/gnome-system-monitor/PKGBUILD
gnome-unstable/gnome-system-monitor/gnome-system-monitor.install
gnome-unstable/gnome-themes-standard/PKGBUILD
gnome-unstable/gtk3/PKGBUILD
gnome-unstable/gtksourceview3/PKGBUILD
gnome-unstable/libsoup/PKGBUILD
gnome-unstable/libwebkit/PKGBUILD
gnome-unstable/metacity/PKGBUILD
gnome-unstable/mutter/PKGBUILD
gnome-unstable/nautilus/PKGBUILD
gnome-unstable/sushi/PKGBUILD
gnome-unstable/telepathy-farstream/PKGBUILD
multilib/lib32-libdrm/PKGBUILD
multilib/lib32-libdrm/no-pthread-stubs.patch
testing/iproute2/PKGBUILD
testing/openssh/PKGBUILD
Diffstat (limited to 'core/bash')
-rw-r--r-- | core/bash/PKGBUILD | 6 | ||||
-rw-r--r-- | core/bash/system.bashrc | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/bash/PKGBUILD b/core/bash/PKGBUILD index 0ff620ff9..ef39b7277 100644 --- a/core/bash/PKGBUILD +++ b/core/bash/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 153500 2012-03-15 08:12:48Z allan $ +# $Id: PKGBUILD 153952 2012-03-21 02:16:32Z eric $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> @@ -6,7 +6,7 @@ pkgname=bash _basever=4.2 _patchlevel=024 #prepare for some patches pkgver=$_basever.$_patchlevel -pkgrel=1 +pkgrel=2 pkgdesc="The GNU Bourne Again shell" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -77,7 +77,7 @@ md5sums=('3fb927c7c33022f1c327f14a81c0d4b0' '027d6bd8f5f6a06b75bb7698cb478089' '2902e0fee7a9168f3a4fd2ccd60ff047' '42f4400ed2314bd7519c020d0187edc5' - 'fe5d3a367f7d5f754214dc05e3d958ab' + '3546099a1b2f667adc9794f52e78e35b' '472f536d7c9e8250dc4568ec4cfaf294' '1100bc1dda2cdc06ac44d7e5d17864a3' 'a7184b76eb4a079f10174a0a8f574819' diff --git a/core/bash/system.bashrc b/core/bash/system.bashrc index 84de2898c..a2231e861 100644 --- a/core/bash/system.bashrc +++ b/core/bash/system.bashrc @@ -20,4 +20,4 @@ case ${TERM} in ;; esac -[ -r /etc/bash_completion ] && . /etc/bash_completion +[ -r /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion |