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

[Tobias Kieslich]

    Date: Wednesday, October 29, 2008 @ 14:45:46
  Author: tobias
Revision: 17436

Merged revisions 12027,17435 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/gvim/trunk

........
  r12027 | tobias | 2008-09-08 01:42:21 +0200 (Mon, 08 Sep 2008) | 1 line
  
  upgpkg: gvim 7.2.13-1
........
  r17435 | tobias | 2008-10-29 19:44:49 +0100 (Wed, 29 Oct 2008) | 1 line
  
  upgpkg: gvim 7.2.25-1
........

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

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


Property changes on: gvim/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /gvim/trunk:1-9226
   + /gvim/trunk:1-17435

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-10-29 18:44:49 UTC (rev 17435)
+++ extra-i686/PKGBUILD	2008-10-29 18:45:46 UTC (rev 17436)
@@ -2,8 +2,8 @@
 # Maintainer: tobias [ tobias at archlinux org ]
 
 pkgname=gvim
-_srcver=7.1
-_patchlevel=330
+_srcver=7.2
+_patchlevel=25
 pkgver=${_srcver}.${_patchlevel}
 pkgrel=1
 pkgdesc="the vim text editor with advanced features enabled, such as a gui mode"
@@ -20,9 +20,9 @@
         ftp://ftp.vim.org/pub/vim/extra/vim-${_srcver}-extra.tar.gz \
         ftp://ftp.vim.org/pub/vim/extra/vim-${_srcver}-lang.tar.gz \
         ${pkgname}.desktop fetch_patches.sh)
-md5sums=('44c6b4914f38d6f9aa959640b89da329' '605cc7ae31bcc9d7864bb0bb6025f55d'\
-         '144aa049ba70621acf4247f0459f3ee7' '2be104c0372dd6dae19cb7968c03cd4f'\
-         'a792973dcd1d5d1103a1bb620e494b55')
+md5sums=('f0901284b338e448bfd79ccca0041254' '35e04482f07c57221c9a751aaa3b8dac' \
+         'd8884786979e0e520c112faf2e176f05' '2be104c0372dd6dae19cb7968c03cd4f' \
+         'a3b03cd44b8ed78a99850d4cbfaafe55')
 
 build()
 {
@@ -66,7 +66,7 @@
     ln -s vi.1.gz egview.1.gz
     ln -s vi.1.gz gview.1.gz
     ln -s vi.1.gz gvim.1.gz
-    ln -s vidiff.1.gz gvimdiff.1.gz
+    ln -s vimdiff.1.gz gvimdiff.1.gz
     ln -s vi.1.gz rgvim.1.gz
     ln -s vi.1.gz rgview.1.gz
   done

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