[arch-commits] Commit in mercurial/repos (3 files)

[Giovanni Scafora]

    Date: Wednesday, July 8, 2009 @ 07:02:05
  Author: giovanni
Revision: 45182

Merged revisions 45179 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/mercurial/trunk

........
  r45179 | douglas | 2009-07-08 03:24:34 -0700 (mer, 08 lug 2009) | 2 lines
  
  upgpkg: mercurial 1.3-3
      Improved PKGBUILD, fixed mercurial - Thanks Magus.
........

Modified:
  mercurial/repos/extra-i686/	(properties)
  mercurial/repos/extra-i686/ChangeLog
  mercurial/repos/extra-i686/PKGBUILD

-----------+
 ChangeLog |    5 +++++
 PKGBUILD  |   32 ++++++++++++++------------------
 2 files changed, 19 insertions(+), 18 deletions(-)


Property changes on: mercurial/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /mercurial/trunk:1-45125
   + /mercurial/trunk:1-45181

Modified: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog	2009-07-08 11:00:46 UTC (rev 45181)
+++ extra-i686/ChangeLog	2009-07-08 11:02:05 UTC (rev 45182)
@@ -1,4 +1,9 @@
 
+2009-07-08  Douglas Soares de Andrade  <douglas at archlinux.org>
+
+	* Improved PKGBUILD and installing the removed vim files
+	* The oscar goes to: Magnus Therning =)
+
 2009-07-06  Douglas Soares de Andrade  <douglas at archlinux.org>
 
 	* Removed vim files for mercurial.

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-07-08 11:00:46 UTC (rev 45181)
+++ extra-i686/PKGBUILD	2009-07-08 11:02:05 UTC (rev 45182)
@@ -6,7 +6,7 @@
 
 pkgname=mercurial
 pkgver=1.3
-pkgrel=2
+pkgrel=3
 pkgdesc="A scalable distributed SCM tool"
 url="http://www.selenic.com/mercurial"
 license=("GPL")
@@ -15,23 +15,19 @@
 arch=('i686' 'x86_64')
 
 build() {
-    cd $startdir/src/$pkgname-$pkgver
-    python setup.py install --root $startdir/pkg
-    
-    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
-    
-    #vimpath="$pkgdir/usr/share/vim/vim72"
-    #install -m644 -D contrib/vim/HGAnnotate.vim $vimpath/syntax/HGAnnotate.vim
+    cd $srcdir/$pkgname-$pkgver
+    python setup.py install --root $pkgdir
 
-    # Autoloading plugins to vim = no good.  
-    #  install -d $vimpath/plugin
-    #  install -m644 contrib/vim/{hg-menu.vim,hgcommand.vim,patchreview.vim} $vimpath/plugin
+    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"
+    install -m644 -D contrib/vim/HGAnnotate.vim $vimpath/syntax/HGAnnotate.vim
 }
 md5sums=('d25a867e0ef835faafdbe1e82e239945')