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

[Tobias Kieslich]

    Date: Wednesday, October 29, 2008 @ 14:39:32
  Author: tobias
Revision: 17434

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

........
  r12024 | tobias | 2008-09-08 01:41:08 +0200 (Mon, 08 Sep 2008) | 1 line
  
  upgpkg: vim 7.2.13-1
........
  r17433 | tobias | 2008-10-29 19:38:44 +0100 (Wed, 29 Oct 2008) | 1 line
  
  upgpkg: vim 7.2.25-1
........

Modified:
  vim/repos/extra-i686/	(properties)
  vim/repos/extra-i686/PKGBUILD
  vim/repos/extra-i686/fetch_patches.sh

------------------+
 PKGBUILD         |   11 ++++++-----
 fetch_patches.sh |    3 ---
 2 files changed, 6 insertions(+), 8 deletions(-)


Property changes on: vim/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /vim/trunk:1-9395
   + /vim/trunk:1-17433

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-10-29 18:38:44 UTC (rev 17433)
+++ extra-i686/PKGBUILD	2008-10-29 18:39:32 UTC (rev 17434)
@@ -2,8 +2,8 @@
 # Maintainer: tobias [ tobias at archlinux org ]
 
 pkgname=vim
-_srcver=7.1
-_patchlevel=330
+_srcver=7.2
+_patchlevel=25
 pkgver=${_srcver}.${_patchlevel}
 pkgrel=1
 pkgdesc="a highly configurable, improved version of the vi text editor"
@@ -19,8 +19,8 @@
         ftp://ftp.vim.org/pub/vim/extra/vim-${_srcver}-extra.tar.gz \
         ftp://ftp.vim.org/pub/vim/extra/vim-${_srcver}-lang.tar.gz \
         fetch_patches.sh)
-md5sums=('44c6b4914f38d6f9aa959640b89da329' '605cc7ae31bcc9d7864bb0bb6025f55d'\
-         '144aa049ba70621acf4247f0459f3ee7' 'a792973dcd1d5d1103a1bb620e494b55')
+md5sums=('f0901284b338e448bfd79ccca0041254' '35e04482f07c57221c9a751aaa3b8dac' \
+         'd8884786979e0e520c112faf2e176f05' 'a3b03cd44b8ed78a99850d4cbfaafe55')
 
 build()
 {
@@ -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

Modified: extra-i686/fetch_patches.sh
===================================================================
--- extra-i686/fetch_patches.sh	2008-10-29 18:38:44 UTC (rev 17433)
+++ extra-i686/fetch_patches.sh	2008-10-29 18:39:32 UTC (rev 17434)
@@ -43,9 +43,6 @@
     fi
   done
 
-  ## TEMPFIX stupid fuckup upstream
-  mv ./7.1.126ne ./7.1.126
-  (( downloads=${downloads} - 1 ))
   ########
 
   if [ ${downloads} != ${_patchlevel} ]; then