[arch-commits] Commit in vim/repos (testing-i686 testing-i686/PKGBUILD)

[Tobias Kieslich]

    Date: Wednesday, October 29, 2008 @ 15:01:47
  Author: tobias
Revision: 17438

Merged revisions 17433 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/vim/trunk

........
  r17433 | tobias | 2008-10-29 19:38:44 +0100 (Wed, 29 Oct 2008) | 1 line
  
  upgpkg: vim 7.2.25-1
........

Modified:
  vim/repos/testing-i686/	(properties)
  vim/repos/testing-i686/PKGBUILD

----------+
 PKGBUILD |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


Property changes on: vim/repos/testing-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /vim/trunk:1-12024
   + /vim/trunk:1-17437

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2008-10-29 18:56:25 UTC (rev 17437)
+++ testing-i686/PKGBUILD	2008-10-29 19:01:47 UTC (rev 17438)
@@ -3,7 +3,7 @@
 
 pkgname=vim
 _srcver=7.2
-_patchlevel=13
+_patchlevel=25
 pkgver=${_srcver}.${_patchlevel}
 pkgrel=1
 pkgdesc="a highly configurable, improved version of the vi text editor"
@@ -46,11 +46,12 @@
   find ${startdir}/pkg/usr/share/man -type d -name 'man1' 2> /dev/null | \
    while read mandir; do
     cd ${mandir}
+    mv vimdiff.1 vimdiff.org
     rm -f *.1
     ln -s rvi.1.gz rvim.1.gz
     ln -s vi.1.gz vim.1.gz
-    ln -s vidiff.1.gz vimdiff.1.gz
     ln -s vitutor.1.gz vimtutor.1.gz
+    mv vimdiff.org vimdiff.1
   done
 
   # kill the nobackup parts