diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-03-23 12:18:02 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-03-23 12:18:02 -0300 |
| commit | bf1c001b59869cf10e5921b4f38d1f69db2db76c (patch) | |
| tree | a472ad2701076586f54fbd0859fe2e5c8311184b /extra/mercurial | |
| parent | aebba8cfcb8c0ef8befa351c73fbd228e07475e2 (diff) | |
| parent | 1512c792951d7fbd2c9c336f9bf35654bbb85cc6 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/cdemu-daemon/60-vhba.rules
community-testing/cdemu-daemon/PKGBUILD
community-testing/cdemu-daemon/cdemud.install
community/guake/PKGBUILD
core/openssl/PKGBUILD
extra/mesa/PKGBUILD
gnome-unstable/epiphany/PKGBUILD
gnome-unstable/folks/PKGBUILD
gnome-unstable/gjs/PKGBUILD
gnome-unstable/gnome-online-accounts/PKGBUILD
gnome-unstable/gobject-introspection/PKGBUILD
multilib/lib32-mesa/PKGBUILD
multilib/lib32-openssl/PKGBUILD
testing/dhcpcd/PKGBUILD
Diffstat (limited to 'extra/mercurial')
| -rw-r--r-- | extra/mercurial/PKGBUILD | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index bca7147b7..c49311fb3 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 151766 2012-03-02 11:44:52Z giovanni $ +# $Id: PKGBUILD 153959 2012-03-21 06:13:44Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=mercurial pkgver=2.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64' 'mips64el') url="http://mercurial.selenic.com/" @@ -30,7 +30,7 @@ package() { install -m644 doc/{hgrc.5,hgignore.5} "${pkgdir}/usr/share/man/man5" install -m755 contrib/hgk "${pkgdir}/usr/bin" install -m644 -D contrib/zsh_completion "${pkgdir}/usr/share/zsh/site-functions/_hg" - install -m644 -D contrib/bash_completion "${pkgdir}/etc/bash_completion.d/hg" + install -m644 -D contrib/bash_completion "${pkgdir}/usr/share/bash-completion/completions/hg" install -d "${pkgdir}/usr/share/emacs/site-lisp" install -m644 contrib/{mq.el,mercurial.el} "${pkgdir}/usr/share/emacs/site-lisp" |