--- PKGBUILD_o	2009-07-07 07:48:42.000000000 +0100
+++ PKGBUILD	2009-07-07 07:47:53.000000000 +0100
@@ -6,7 +6,7 @@
 
 pkgname=mercurial
 pkgver=1.3
-pkgrel=2
+pkgrel=2.2
 pkgdesc="A scalable distributed SCM tool"
 url="http://www.selenic.com/mercurial"
 license=("GPL")
@@ -15,20 +15,20 @@
 arch=('i686' 'x86_64')
 
 build() {
-    cd $startdir/src/$pkgname-$pkgver
-    python setup.py install --root $startdir/pkg
+    cd $srcdir/$pkgname-$pkgver
+    python setup.py install --root $pkgdir
     
-    install -d $startdir/pkg/usr/share/man/{man1,man5}
-    install -m644 doc/hg.1 $startdir/pkg/usr/share/man/man1
-    install -m644 doc/{hgrc.5,hgignore.5} $startdir/pkg/usr/share/man/man5
-    install -m755 contrib/hgk $startdir/pkg/usr/bin
-    install -m644 -D contrib/zsh_completion $startdir/pkg/usr/share/zsh/site-functions/_hg
-    install -m644 -D contrib/bash_completion $startdir/pkg/etc/bash_completion.d/hg 
-    install -d $startdir/pkg/usr/share/emacs/site-lisp
-    install -m644 contrib/{mq.el,mercurial.el} $startdir/pkg/usr/share/emacs/site-lisp
+    install -d $pkgdir/usr/share/man/{man1,man5}
+    install -m644 doc/hg.1 $pkgdir/usr/share/man/man1
+    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 -d $pkgdir/usr/share/emacs/site-lisp
+    install -m644 contrib/{mq.el,mercurial.el} $pkgdir/usr/share/emacs/site-lisp
     
-    #vimpath="$pkgdir/usr/share/vim/vim72"
-    #install -m644 -D contrib/vim/HGAnnotate.vim $vimpath/syntax/HGAnnotate.vim
+    vimpath="$pkgdir/usr/share/vim"
+    install -m644 -D contrib/vim/HGAnnotate.vim $vimpath/syntax/HGAnnotate.vim
 
     # Autoloading plugins to vim = no good.  
     #  install -d $vimpath/plugin