[SCM] Vim packaging branch, debian, updated. upstream/7.2.025-258-ga646dd8

James Vega jamessan at debian.org
Thu Nov 20 08:13:57 UTC 2008


The following commit has been merged in the debian branch:
commit f0116b4ca5a40a2147c6ccc01abd0e013fea0295
Author: James Vega <jamessan at debian.org>
Date:   Thu Nov 20 03:05:36 2008 -0500

    Make vim-runtime Conflict vim-tiny << ${source:Version}
    
    When upgrading from one major upstream release to another, the
    diversions from the old vimXY directory need to be removed.  This will
    fail if vim-tiny hasn't been upgraded to the new upstream because both
    vim-tiny's diverted files and vim-runtime's files will exist in the old
    vimXY, causing dpkg-divert to error out.  The Conflicts will force
    vim-tiny to be upgraded first.
    
    Closes: #503757
    
    Signed-off-by: James Vega <jamessan at debian.org>

diff --git a/debian/control b/debian/control
index edbec5a..9a15222 100644
--- a/debian/control
+++ b/debian/control
@@ -50,6 +50,7 @@ Package: vim-runtime
 Priority: optional
 Architecture: all
 Depends: dpkg (>= 1.14.20)
+Conflicts: vim-tiny (<< ${source:Version})
 Recommends: vim | vim-gnome | vim-gtk | vim-lesstif | vim-nox | vim-tiny
 Enhances: vim-tiny
 Description: Vi IMproved - Runtime files

-- 
Vim packaging



More information about the pkg-vim-maintainers mailing list