r771 - in /trunk/packages/vim/debian: changelog control

[jamessan at users.alioth.debian.org]

Author: jamessan
Date: Mon Sep 18 21:14:59 2006
New Revision: 771

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=771
Log:
Add versioned Conflicts/Replaces against vim-doc for the vim package. (#381526)

Modified:
    trunk/packages/vim/debian/changelog
    trunk/packages/vim/debian/control

Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=771&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Mon Sep 18 21:14:59 2006
@@ -7,8 +7,10 @@
   * Since vim-gui-common no longer depends on vim-common (to allow for
     binNMUing), make /usr/share/doc/vim-gui-common a directory instead of a
     symlink to /usr/share/doc/vim-common. (closes: #387794)
-
- -- James Vega <jamessan at debian.org>  Sat, 16 Sep 2006 20:50:08 -0400
+  * Add versioned Conflicts/Replaces against vim-doc for vim to allow proper
+    upgrades from Sarge. (closes: #381526)
+
+ -- James Vega <jamessan at debian.org>  Mon, 18 Sep 2006 13:38:43 -0400
 
 vim (1:7.0-094+1) unstable; urgency=medium
 

Modified: trunk/packages/vim/debian/control
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/control?rev=771&op=diff
==============================================================================
--- trunk/packages/vim/debian/control (original)
+++ trunk/packages/vim/debian/control Mon Sep 18 21:14:59 2006
@@ -103,8 +103,8 @@
 Depends: vim-common (= ${binary:Version}), vim-runtime (= ${source:Version}), ${shlibs:Depends}
 Suggests: ctags, vim-doc, vim-scripts
 Provides: editor
-Conflicts: vim-full (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-gtk (<< 1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3), vim-python (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tcl (<< 1:6.4-001+3), vim-tiny (<< 1:6.4-001+3), vim-common (<< 1:6.4-001+3)
-Replaces: vim-full (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-gtk (<< 1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3), vim-python (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tcl (<< 1:6.4-001+3), vim-tiny (<< 1:6.4-001+3)
+Conflicts: vim-doc (<< 1:6.4-001+3), vim-full (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-gtk (<< 1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3), vim-python (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tcl (<< 1:6.4-001+3), vim-tiny (<< 1:6.4-001+3), vim-common (<< 1:6.4-001+3)
+Replaces: vim-doc (<< 1:6.4-001+3), vim-full (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-gtk (<< 1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3), vim-python (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tcl (<< 1:6.4-001+3), vim-tiny (<< 1:6.4-001+3)
 Description: Vi IMproved - enhanced vi editor
  Vim is an almost compatible version of the UNIX editor Vi.
  .