diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-04-05 03:33:25 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-04-05 03:33:25 -0300 |
| commit | fa8be7b03b46e65b64d710cbfae7ba4a93751a57 (patch) | |
| tree | 485f4f134233af2f3d63b9dcf9e97506467a74b9 /extra/mercurial | |
| parent | aced7a6b55bc695c39eb6482b254829f0b56ff4b (diff) | |
| parent | a7f79fc1ced18c586d320033ac9738e98a21b550 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
core/expat/PKGBUILD
core/gcc/PKGBUILD
core/glibc/PKGBUILD
core/libtool/PKGBUILD
core/wpa_actiond/PKGBUILD
libre/linux-libre/PKGBUILD
multilib/binutils-multilib/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/gcc-multilib/gcc_pure64-multilib.patch
multilib/lib32-glibc/PKGBUILD
multilib/lib32-glibc/glibc-2.15-vfprintf-nargs.patch
multilib/lib32-glibc/glibc-__i686.patch
multilib/libtool-multilib/PKGBUILD
staging/kdebase-workspace/PKGBUILD
staging/kdepim-runtime/PKGBUILD
testing/telepathy-gabble/PKGBUILD
testing/telepathy-glib/PKGBUILD
testing/telepathy-mission-control/PKGBUILD
Diffstat (limited to 'extra/mercurial')
| -rw-r--r-- | extra/mercurial/PKGBUILD | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index c49311fb3..9a51493bd 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 153959 2012-03-21 06:13:44Z giovanni $ +# $Id: PKGBUILD 155397 2012-04-03 11:09:44Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=mercurial -pkgver=2.1.1 -pkgrel=2 +pkgver=2.1.2 +pkgrel=1 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64' 'mips64el') url="http://mercurial.selenic.com/" @@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI') backup=('etc/mercurial/hgrc') source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz" 'mercurial.profile') -md5sums=('368fab4705ebd4d1296fdd6bd2fe6272' +md5sums=('15354d739504ec46f68a0fee2ecfbf25' '43e1d36564d4c7fbe9a091d3ea370a44') package() { |