diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-04 10:30:49 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-04 10:30:49 +0100 |
| commit | ad63cdb5324392490de7e1f70ad3256ebf32603d (patch) | |
| tree | cd8e31855114a730c3901f80e341c2f4486ba473 /extra/mercurial | |
| parent | 8288f4022c5673fa36117598c7e7a3f6c2dfb1e2 (diff) | |
| parent | f0fa42126da9e3eec6b98388b35c67929fa20dae (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/radvd/PKGBUILD
extra/samba/PKGBUILD
extra/tftp-hpa/PKGBUILD
libre/linux-libre/PKGBUILD
multilib-testing/gcc-multilib/PKGBUILD
multilib/wine/PKGBUILD
testing/gcc/PKGBUILD
testing/sudo/PKGBUILD
Diffstat (limited to 'extra/mercurial')
| -rw-r--r-- | extra/mercurial/PKGBUILD | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index 0d171589d..bca7147b7 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 151621 2012-02-28 20:53:00Z giovanni $ +# $Id: PKGBUILD 151766 2012-03-02 11:44:52Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=mercurial -pkgver=2.1 -pkgrel=2 +pkgver=2.1.1 +pkgrel=1 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64' 'mips64el') url="http://mercurial.selenic.com/" @@ -13,15 +13,13 @@ depends=('python2') optdepends=('tk: for the hgk GUI') backup=('etc/mercurial/hgrc') source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz" - 'mercurial.profile' - 'mercurial-2.1-return-code.patch') -md5sums=('d2ca44f8d0129ab50639143af99d9363' - '43e1d36564d4c7fbe9a091d3ea370a44' - '025e2ec8acc18a9b2a1b4f51f7bddbe3') + 'mercurial.profile') +md5sums=('368fab4705ebd4d1296fdd6bd2fe6272' + '43e1d36564d4c7fbe9a091d3ea370a44') package() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/mercurial-2.1-return-code.patch" + python2 setup.py install --root="${pkgdir}/" --optimize=1 sed -i -e 's#env python#env python2#' \ |