Date: Wednesday, December 2, 2009 @ 10:31:47 Author: giovanni Revision: 60253
Merged revisions 59312,60251 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/mercurial/trunk ........ r59312 | giovanni | 2009-11-21 16:30:19 -0800 (Sat, 21 Nov 2009) | 1 line ........ r60251 | giovanni | 2009-12-02 07:29:32 -0800 (Wed, 02 Dec 2009) | 2 lines upgpkg: mercurial 1.4.1-1 upstream release ........ Modified: mercurial/repos/extra-x86_64/ (properties) mercurial/repos/extra-x86_64/PKGBUILD ----------+ PKGBUILD | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) Property changes on: mercurial/repos/extra-x86_64 ___________________________________________________________________ Modified: svnmerge-integrated - /mercurial/trunk:1-59060 + /mercurial/trunk:1-60252 Modified: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2009-12-02 15:30:22 UTC (rev 60252) +++ extra-x86_64/PKGBUILD 2009-12-02 15:31:47 UTC (rev 60253) @@ -3,8 +3,8 @@ # Contributor: Douglas Soares de Andrade <doug...@archlinux.org> pkgname=mercurial -pkgver=1.4 -pkgrel=2 +pkgver=1.4.1 +pkgrel=1 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64') url="http://www.selenic.com/mercurial" @@ -12,11 +12,12 @@ depends=('python>=2.6') optdepends=('tk: for the hgk GUI') source=(http://www.selenic.com/mercurial/release/${pkgname}-${pkgver}.tar.gz) -md5sums=('951ebd4a8153eaa3c56fc0ce2575ab70') +md5sums=('eacffecad59ec145e61a1edf332b3f1f') build() { cd "${srcdir}/${pkgname}-${pkgver}" - python setup.py install --root="${pkgdir}/" || return 1 + python setup.py build + python setup.py install --skip-build --root="${pkgdir}/" || return 1 install -d ${pkgdir}/usr/share/man/{man1,man5} install -m644 doc/hg.1 "${pkgdir}/usr/share/man/man1" || return 1 @@ -29,4 +30,6 @@ vimpath="${pkgdir}/usr/share/vim/vimfiles" install -Dm644 contrib/vim/HGAnnotate.vim "${vimpath}/syntax/HGAnnotate.vim" || return 1 + rm -rf ${pkgdir}/usr/lib/python2.6/site-packages/mercurial/*.py + rm -rf ${pkgdir}/usr/lib/python2.6/site-packages/mercurial/*.pyc }