[SCM] Vim packaging branch, debian, updated. upstream/7.2c.000-213-gc420277

[James Vega]

The following commit has been merged in the debian branch:
commit c42027732b159b30f09a73646bb38a390513cea8
Author: James Vega <jamessan at debian.org>
Date:   Sat Aug 9 21:25:05 2008 -0400

    Update version to 7.2 (non-snapshot) in relevant files.
    
    Signed-off-by: James Vega <jamessan at debian.org>

diff --git a/debian/README b/debian/README
index 16e09a7..1040d89 100644
--- a/debian/README
+++ b/debian/README
@@ -1,4 +1,4 @@
-Patches for Vim - Vi IMproved 7.2b
+Patches for Vim - Vi IMproved 7.2
 
 The files in this directory contain source code changes to fix
 problems in released versions of Vim.  Each file also contains an
@@ -14,40 +14,13 @@ Before patching, change to the top Vim directory, where the "src"
 and "runtime" directories are located.
 Depending on the version of "patch" that you use, you may have add
 an argument to make it patch the right file:
-        patch -p < 7.2b.001
-        patch -p0 < 7.2b.001
+        patch -p < 7.2.001
+        patch -p0 < 7.2.001
 
 After applying a patch, you need to compile Vim.  There are no
 patches for binaries.
 
 Checksums for the patch files can be found in the file MD5.
 
-Individual patches for Vim 7.2b:
+Individual patches for Vim 7.2:
 
-  SIZE  NAME      FIXES
-  2113  7.2b.001  mb_fix_col() missing with some combination of features
-  2371  7.2b.002  compiler warnings for signed/unsigned mismatch
-  1642  7.2b.003  still compilation problem, check_col() + check_row() missing
-  3944  7.2b.004  ":helpgrep" may try to free memory for a static string
-  3465  7.2b.005  shellescape() doesn't take care of "!" and "\n"
-  1288  7.2b.006  using unsafe temp file when running configure
-  1703  7.2b.007  part of a message cannot be translated
-  4078  7.2b.008  a few filetypes are not detected or not detected properly
-  1751  7.2b.009  trying to read past end of screenline
-  4327  7.2b.010  ":mksession" doesn't work for some unusual mappings
-  2906  7.2b.011  include file in compiler command when configuring for TCL
-  1764  7.2b.012  build failure with +multi_byte but without +diff
-  3048  7.2b.013  build fails with tiny features and Perl or Python
-  4045  7.2b.014  configure uses an unsafe temp file to store commands
-  2396  7.2b.015  build failure on Mac when using Aap
-  4870  7.2b.016  build fails with normal features but without +autocmd
-  2898  7.2b.017  "vim -O foo foo" results in only one window
-  8321  7.2b.018  cmdline completion on shell cmd fails on file containing '!'
- 11142  7.2b.019  (extra) Win32: Various compiler warnings
-  4478  7.2b.020  ":sort n" doesn't handle negative numbers
-  1536  7.2b.021  reloading doesn't read the BOM correctly
-  2496  7.2b.022  operator count lost using ":normal" while updating statusline
-  3363  7.2b.023  crash when using the result of synstack(0,0)
-  4182  7.2b.024  ":gui" with netrw plugin causes a delay in display updating
-  5109  7.2b.025  when the CursorHold event triggers a pending count is lost
-  1783  7.2b.026  GTK 2 file chooser causes significant slowdown
diff --git a/debian/rules b/debian/rules
index 06e56da..6c4fe47 100755
--- a/debian/rules
+++ b/debian/rules
@@ -128,7 +128,7 @@ CFGFLAGS_vim-nox:=$(CFGFLAGS) $(OPTFLAGS) $(NOXFLAGS) $(ALLINTERPFLAGS)
 
 NAME:=vim
 VERSION:=7.2
-SNAPSHOT:=c
+SNAPSHOT:=
 VIMCUR:=$(NAME)$(subst .,,$(VERSION))$(SNAPSHOT)
 DEBVERSION:=$(shell dpkg-parsechangelog | sed -n '/^Version:/{s/Version: *\([^:]*:\)\?\([^-]*\)-.*/\2/;p;q}')
 FTP:=ftp://ftp.vim.org/pub/vim$(if $(SNAPSHOT),/unstable,)
diff --git a/debian/update-patches b/debian/update-patches
index 91d1a62..57795b0 100755
--- a/debian/update-patches
+++ b/debian/update-patches
@@ -40,7 +40,7 @@ checkout_and_merge() {
 }
 
 host='ftp.vim.org'
-version='7.2c'
+version='7.2'
 snapshot='unstable/'
 dir="pub/vim/${snapshot}patches/$version"
 
diff --git a/debian/vim-runtime.preinst.in b/debian/vim-runtime.preinst.in
index 9595001..67919db 100644
--- a/debian/vim-runtime.preinst.in
+++ b/debian/vim-runtime.preinst.in
@@ -15,7 +15,7 @@ add_diversion() {
 # Used to remove the previous diversion when upgrading from one major release
 # to the next
 remove_previous_diversions() {
-  for v in vim71 vim72a vim72b; do
+  for v in vim71 vim72a vim72b vim72c; do
     oldpath="$(echo $1 | sed s/@VIMCUR@/$v/)"
     if dpkg-divert --list 2>/dev/null | grep -q "$oldpath"; then
       rm_diversion $oldpath

-- 
Vim packaging