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

[Eric Belanger]

    Date: Thursday, July 10, 2008 @ 21:18:51
  Author: eric
Revision: 4857

fixing svn conflict

Added:
  mercurial/repos/extra-x86_64/ChangeLog
    (from rev 4856, mercurial/trunk/ChangeLog)
Modified:
  mercurial/repos/extra-x86_64/	(properties)
  mercurial/repos/extra-x86_64/PKGBUILD

-----------+
 ChangeLog |    5 +++++
 PKGBUILD  |   44 ++++++++++++++++++++++----------------------
 2 files changed, 27 insertions(+), 22 deletions(-)


Property changes on: mercurial/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /mercurial/trunk:1
   + /mercurial/trunk:1-4856

Copied: mercurial/repos/extra-x86_64/ChangeLog (from rev 4856, mercurial/trunk/ChangeLog)
===================================================================
--- extra-x86_64/ChangeLog	                        (rev 0)
+++ extra-x86_64/ChangeLog	2008-07-11 01:18:51 UTC (rev 4857)
@@ -0,0 +1,5 @@
+
+2008-07-10  Douglas Soares de Andrade  <douglas at archlinux.org>
+
+	* Updated for i686: 1.0.1
+

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-07-11 01:17:42 UTC (rev 4856)
+++ extra-x86_64/PKGBUILD	2008-07-11 01:18:51 UTC (rev 4857)
@@ -1,35 +1,35 @@
 # $Id$
-# Maintainer: Jeff Mickey <jeff at archlinux.org>
-# Maintainer: Giovanni Scafora <linuxmania at gmail.com>
+# Contributor: Jeff Mickey <jeff at archlinux.org>
+# Contributor: Giovanni Scafora <linuxmania at gmail.com>
 # Contributor: David 'SleepyDog' <goodluv at gmail.com>
+# Maintainer: Douglas Soares de Andrade <douglas at archlinux.org>
 
 pkgname=mercurial
-pkgver=1.0
-pkgrel=2
+pkgver=1.0.1
+pkgrel=1
 pkgdesc="A scalable distributed SCM tool"
 url="http://www.selenic.com/mercurial"
-license="GPL"
+license=("GPL")
 depends=('python>=2.5')
 source=(http://www.selenic.com/mercurial/release/$pkgname-$pkgver.tar.gz)
+md5sums=('a4ef7eb2c8818404a459e3be05feff6f')
 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,hgmerge.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 -m644 -D contrib/vim/HGAnnotate.vim $startdir/pkg/usr/share/vim/syntax/HGAnnotate.vim
+    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
+    install -m644 -D contrib/vim/HGAnnotate.vim $startdir/pkg/usr/share/vim/syntax/HGAnnotate.vim
 
-# Autoloading plugins to vim = no good.  
-#  install -d $startdir/pkg/usr/share/vim/plugin
-#  install -m644 contrib/vim/{hg-menu.vim,hgcommand.vim,patchreview.vim} $startdir/pkg/usr/share/vim/plugin
+    # Autoloading plugins to vim = no good.  
+    #  install -d $startdir/pkg/usr/share/vim/plugin
+    #  install -m644 contrib/vim/{hg-menu.vim,hgcommand.vim,patchreview.vim} $startdir/pkg/usr/share/vim/plugin
 }
-
-md5sums=('9f8dd7fa6f8886f77be9b923f008504c')
-sha1sums=('11689e85a91874417cb110ded6c3a4d7b30429cb')