diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-03-28 23:55:37 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-03-28 23:55:37 -0300 |
| commit | 2d0e587bd1c7ac060a95a0e20cfe00ab19db7e14 (patch) | |
| tree | 66a82d2834fe42b3411c09ad9fdcc4bd6af079ac /extra/git | |
| parent | 6aa1c22fe01ff4df6c5f75fd04d551b53f7df389 (diff) | |
| parent | 44ded298ebb49500d321ac79b7d0d8bb4d5058ec (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
core/gnupg/PKGBUILD
core/openldap/PKGBUILD
gnome-unstable/evince/PKGBUILD
gnome-unstable/evolution-data-server/PKGBUILD
gnome-unstable/evolution/PKGBUILD
gnome-unstable/farstream/PKGBUILD
gnome-unstable/gnome-desktop/PKGBUILD
gnome-unstable/gnome-menus/PKGBUILD
gnome-unstable/gnome-panel/PKGBUILD
gnome-unstable/gtkhtml4/PKGBUILD
gnome-unstable/libgnomekbd/PKGBUILD
gnome-unstable/libwacom/PKGBUILD
gnome-unstable/libwnck3/PKGBUILD
gnome-unstable/network-manager-applet/PKGBUILD
gnome-unstable/networkmanager-openconnect/PKGBUILD
gnome-unstable/networkmanager-openvpn/PKGBUILD
gnome-unstable/networkmanager-pptp/PKGBUILD
gnome-unstable/networkmanager-vpnc/PKGBUILD
gnome-unstable/networkmanager/PKGBUILD
gnome-unstable/pidgin/PKGBUILD
testing/gnupg/PKGBUILD
Diffstat (limited to 'extra/git')
| -rw-r--r-- | extra/git/PKGBUILD | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index 9a99d37db..b90c55b5e 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 153414 2012-03-13 02:15:42Z dan $ +# $Id: PKGBUILD 154397 2012-03-27 14:31:30Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.7.9.4 +pkgver=1.7.9.5 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64 'mips64el') @@ -64,8 +64,8 @@ package() { INSTALLDIRS=vendor DESTDIR="$pkgdir" install # bash completion - mkdir -p "$pkgdir"/etc/bash_completion.d/ - install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/etc/bash_completion.d/git + mkdir -p "$pkgdir"/usr/share/bash-completion/completions/ + install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/usr/share/bash-completion/completions/git # more contrib stuff cp -a ./contrib $pkgdir/usr/share/git/ # scripts are for python 2.x @@ -92,7 +92,7 @@ package() { install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf } -sha1sums=('05d2ff75ffd3356516d096f992b4fb3b8b6c0079' - '833dc143d2d296754d681c57b41a008ff433b225' +sha1sums=('33f5a5b0b6c8f8addbbec0b042731c44fd79f90c' + '37a162c22127adc82ce9fb75aacddb6428c565da' 'f2b41828bd912b72e2cb3e14677739c4f370de66' '149e2da1ecb48872ddb31c0945afeaad1f9653d7') |