r393 - branches/vim-tiny/debian

[Stefano Zacchiroli]

Author: zack
Date: 2005-11-01 19:42:51 +0000 (Tue, 01 Nov 2005)
New Revision: 393

Modified:
   branches/vim-tiny/debian/control
Log:
versioned old conflicts from variants against vim-tiny (which now can coexists with them)


Modified: branches/vim-tiny/debian/control
===================================================================
--- branches/vim-tiny/debian/control	2005-11-01 19:18:51 UTC (rev 392)
+++ branches/vim-tiny/debian/control	2005-11-01 19:42:51 UTC (rev 393)
@@ -85,7 +85,7 @@
 Depends: vim-common (= ${Source-Version}), vim-runtime (= ${Source-Version}), ${shlibs:Depends}
 Suggests: cscope, vim-doc, ttf-bitstream-vera
 Provides: gvim
-Conflicts: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim-full (<< 6.4-001+3), vim-gnome (<< 6.4-001+3), vim-gtk (<< 6.4-001+3), vim-lesstif (<< 6.4-001+3), vim-python (<< 6.4-001+3), vim-ruby (<< 6.4-001+3), vim-tcl (<< 6.4-001+3), vim-tiny, vim-tty, vim-common (<< 6.4-001+3)
+Conflicts: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim-full (<< 6.4-001+3), vim-gnome (<< 6.4-001+3), vim-gtk (<< 6.4-001+3), vim-lesstif (<< 6.4-001+3), vim-python (<< 6.4-001+3), vim-ruby (<< 6.4-001+3), vim-tcl (<< 6.4-001+3), vim-tiny (<< 6.4-001+3), vim-tty, vim-common (<< 6.4-001+3)
 Replaces: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim (<= 1:6.3-068+1), vim-full (<< 6.4-001+3), vim-gnome (<< 6.4-001+3), vim-gtk (<< 6.4-001+3), vim-lesstif (<< 6.4-001+3), vim-python (<< 6.4-001+3), vim-ruby (<< 6.4-001+3), vim-tcl (<< 6.4-001+3), vim-tiny, vim-tty
 Description: Vi IMproved, with perl scripting support
  Vim is an almost compatible version of the UNIX editor Vi.  Many new
@@ -102,7 +102,7 @@
 Depends: vim-common (= ${Source-Version}), vim-runtime (= ${Source-Version}), ${shlibs:Depends}
 Suggests: cscope, vim-doc, ttf-bitstream-vera
 Provides: gvim
-Conflicts: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim-full (<< 6.4-001+3), vim-gnome (<< 6.4-001+3), vim-gtk (<< 6.4-001+3), vim-lesstif (<< 6.4-001+3), vim-perl (<< 6.4-001+3), vim-ruby (<< 6.4-001+3), vim-tcl (<< 6.4-001+3), vim-tiny, vim-tty, vim-common (<< 6.4-001+3)
+Conflicts: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim-full (<< 6.4-001+3), vim-gnome (<< 6.4-001+3), vim-gtk (<< 6.4-001+3), vim-lesstif (<< 6.4-001+3), vim-perl (<< 6.4-001+3), vim-ruby (<< 6.4-001+3), vim-tcl (<< 6.4-001+3), vim-tiny (<< 6.4-001+3), vim-tty, vim-common (<< 6.4-001+3)
 Replaces: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim (<= 1:6.3-068+1), vim-full (<< 6.4-001+3), vim-gnome (<< 6.4-001+3), vim-gtk (<< 6.4-001+3), vim-lesstif (<< 6.4-001+3), vim-perl (<< 6.4-001+3), vim-ruby (<< 6.4-001+3), vim-tcl (<< 6.4-001+3), vim-tiny, vim-tty
 Description: Vi IMproved, with python scripting support
  Vim is an almost compatible version of the UNIX editor Vi.  Many new
@@ -119,7 +119,7 @@
 Depends: vim-common (= ${Source-Version}), vim-runtime (= ${Source-Version}), ${shlibs:Depends}
 Suggests: cscope, vim-doc, ttf-bitstream-vera
 Provides: gvim
-Conflicts: kvim, kvim-perl, kvim-python, kvim-tcl, vim-full (<< 6.4-001+3), vim-gnome (<< 6.4-001+3), vim-gtk (<< 6.4-001+3), vim-lesstif (<< 6.4-001+3), vim-perl (<< 6.4-001+3), vim-python (<< 6.4-001+3), vim-tcl (<< 6.4-001+3), vim-tiny, vim-tty, vim-common (<< 6.4-001+3)
+Conflicts: kvim, kvim-perl, kvim-python, kvim-tcl, vim-full (<< 6.4-001+3), vim-gnome (<< 6.4-001+3), vim-gtk (<< 6.4-001+3), vim-lesstif (<< 6.4-001+3), vim-perl (<< 6.4-001+3), vim-python (<< 6.4-001+3), vim-tcl (<< 6.4-001+3), vim-tiny (<< 6.4-001+3), vim-tty, vim-common (<< 6.4-001+3)
 Replaces: kvim, kvim-perl, kvim-python, kvim-tcl, vim (<= 1:6.3-068+1), vim-full (<< 6.4-001+3), vim-gnome (<< 6.4-001+3), vim-gtk (<< 6.4-001+3), vim-lesstif (<< 6.4-001+3), vim-perl (<< 6.4-001+3), vim-python (<< 6.4-001+3), vim-tcl (<< 6.4-001+3), vim-tiny, vim-tty
 Description: Vi IMproved, with ruby scripting support
  Vim is an almost compatible version of the UNIX editor Vi.  Many new
@@ -136,7 +136,7 @@
 Depends: vim-common (= ${Source-Version}), vim-runtime (= ${Source-Version}), ${shlibs:Depends}
 Suggests: cscope, vim-doc, ttf-bitstream-vera
 Provides: gvim
-Conflicts: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim-full (<< 6.4-001+3), vim-gnome (<< 6.4-001+3), vim-gtk (<< 6.4-001+3), vim-lesstif (<< 6.4-001+3), vim-perl (<< 6.4-001+3), vim-python (<< 6.4-001+3), vim-ruby (<< 6.4-001+3), vim-tiny, vim-tty, vim-common (<< 6.4-001+3)
+Conflicts: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim-full (<< 6.4-001+3), vim-gnome (<< 6.4-001+3), vim-gtk (<< 6.4-001+3), vim-lesstif (<< 6.4-001+3), vim-perl (<< 6.4-001+3), vim-python (<< 6.4-001+3), vim-ruby (<< 6.4-001+3), vim-tiny (<< 6.4-001+3), vim-tty, vim-common (<< 6.4-001+3)
 Replaces: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim (<= 1:6.3-068+1), vim-full (<< 6.4-001+3), vim-gnome (<< 6.4-001+3), vim-gtk (<< 6.4-001+3), vim-lesstif (<< 6.4-001+3), vim-perl (<< 6.4-001+3), vim-python (<< 6.4-001+3), vim-ruby (<< 6.4-001+3), vim-tiny, vim-tty
 Description: Vi IMproved, with tcl scripting support
  Vim is an almost compatible version of the UNIX editor Vi.  Many new
@@ -153,7 +153,7 @@
 Depends: vim-common (= ${Source-Version}), vim-runtime (= ${Source-Version}), ${shlibs:Depends}
 Suggests: cscope, vim-doc, ttf-bitstream-vera
 Provides: gvim
-Conflicts: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim-full (<< 6.4-001+3), vim-gnome (<< 6.4-001+3), vim-lesstif (<< 6.4-001+3), vim-perl (<< 6.4-001+3), vim-python (<< 6.4-001+3), vim-ruby (<< 6.4-001+3), vim-tcl (<< 6.4-001+3), vim-tiny, vim-tty, vim-common (<< 6.4-001+3)
+Conflicts: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim-full (<< 6.4-001+3), vim-gnome (<< 6.4-001+3), vim-lesstif (<< 6.4-001+3), vim-perl (<< 6.4-001+3), vim-python (<< 6.4-001+3), vim-ruby (<< 6.4-001+3), vim-tcl (<< 6.4-001+3), vim-tiny (<< 6.4-001+3), vim-tty, vim-common (<< 6.4-001+3)
 Replaces: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim (<= 1:6.3-068+1), vim-full (<< 6.4-001+3), vim-gnome (<< 6.4-001+3), vim-lesstif (<< 6.4-001+3), vim-perl (<< 6.4-001+3), vim-python (<< 6.4-001+3), vim-ruby (<< 6.4-001+3), vim-tcl (<< 6.4-001+3), vim-tiny, vim-tty
 Description: Vi IMproved - GTK2 Version
  Vim is an almost compatible version of the UNIX editor Vi.  Many new features
@@ -169,7 +169,7 @@
 Depends: vim-common (= ${Source-Version}), vim-runtime (= ${Source-Version}), ${shlibs:Depends}
 Suggests: cscope, vim-doc, ttf-bitstream-vera
 Provides: gvim
-Conflicts: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim-full (<< 6.4-001+3), vim-gnome (<< 6.4-001+3), vim-gtk (<< 6.4-001+3), vim-perl (<< 6.4-001+3), vim-python (<< 6.4-001+3), vim-ruby (<< 6.4-001+3), vim-tcl (<< 6.4-001+3), vim-tiny, vim-tty, vim-common (<< 6.4-001+3)
+Conflicts: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim-full (<< 6.4-001+3), vim-gnome (<< 6.4-001+3), vim-gtk (<< 6.4-001+3), vim-perl (<< 6.4-001+3), vim-python (<< 6.4-001+3), vim-ruby (<< 6.4-001+3), vim-tcl (<< 6.4-001+3), vim-tiny (<< 6.4-001+3), vim-tty, vim-common (<< 6.4-001+3)
 Replaces: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim (<= 1:6.3-068+1), vim-full (<< 6.4-001+3), vim-gnome (<< 6.4-001+3), vim-gtk (<< 6.4-001+3), vim-perl (<< 6.4-001+3), vim-python (<< 6.4-001+3), vim-ruby (<< 6.4-001+3), vim-tcl (<< 6.4-001+3), vim-tiny, vim-tty
 Description: Vi IMproved - LessTif Version
  Vim is an almost compatible version of the UNIX editor Vi.  Many new features
@@ -185,7 +185,7 @@
 Depends: vim-common (= ${Source-Version}), vim-runtime (= ${Source-Version}), ${shlibs:Depends}
 Suggests: cscope, vim-doc, ttf-bitstream-vera
 Provides: gvim
-Conflicts: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim-full (<< 6.4-001+3), vim-gtk (<< 6.4-001+3), vim-lesstif (<< 6.4-001+3), vim-perl (<< 6.4-001+3), vim-python (<< 6.4-001+3), vim-ruby (<< 6.4-001+3), vim-tcl (<< 6.4-001+3), vim-tiny, vim-tty, vim-common (<< 6.4-001+3)
+Conflicts: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim-full (<< 6.4-001+3), vim-gtk (<< 6.4-001+3), vim-lesstif (<< 6.4-001+3), vim-perl (<< 6.4-001+3), vim-python (<< 6.4-001+3), vim-ruby (<< 6.4-001+3), vim-tcl (<< 6.4-001+3), vim-tiny (<< 6.4-001+3), vim-tty, vim-common (<< 6.4-001+3)
 Replaces: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim (<= 1:6.3-068+1), vim-full (<< 6.4-001+3), vim-gtk (<< 6.4-001+3), vim-lesstif (<< 6.4-001+3), vim-perl (<< 6.4-001+3), vim-python (<< 6.4-001+3), vim-ruby (<< 6.4-001+3), vim-tcl (<< 6.4-001+3), vim-tiny, vim-tty
 Description: Vi IMproved - GNOME2 Version
  Vim is an almost compatible version of the UNIX editor Vi.  Many new features
@@ -201,7 +201,7 @@
 Depends: vim-common (= ${Source-Version}), vim-runtime (= ${Source-Version}), ${shlibs:Depends}
 Suggests: cscope, vim-doc, ttf-bitstream-vera
 Provides: gvim
-Conflicts: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim-gnome (<< 6.4-001+3), vim-gtk (<< 6.4-001+3), vim-lesstif (<< 6.4-001+3), vim-perl (<< 6.4-001+3), vim-python (<< 6.4-001+3), vim-ruby (<< 6.4-001+3), vim-tcl (<< 6.4-001+3), vim-tiny, vim-tty, vim-common (<< 6.4-001+3)
+Conflicts: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim-gnome (<< 6.4-001+3), vim-gtk (<< 6.4-001+3), vim-lesstif (<< 6.4-001+3), vim-perl (<< 6.4-001+3), vim-python (<< 6.4-001+3), vim-ruby (<< 6.4-001+3), vim-tcl (<< 6.4-001+3), vim-tiny (<< 6.4-001+3), vim-tty, vim-common (<< 6.4-001+3)
 Replaces: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim (<= 1:6.3-068+1), vim-gnome (<< 6.4-001+3), vim-gtk (<< 6.4-001+3), vim-lesstif (<< 6.4-001+3), vim-perl (<< 6.4-001+3), vim-python (<< 6.4-001+3), vim-ruby (<< 6.4-001+3), vim-tcl (<< 6.4-001+3), vim-tiny, vim-tty
 Description: Vi IMproved - full fledged version of the enhanced vi editor
  Vim is an almost compatible version of the UNIX editor Vi.  Many new features