r499 - trunk/vim/debian

[James Vega]

Author: jamessan
Date: 2006-02-22 18:19:49 +0000 (Wed, 22 Feb 2006)
New Revision: 499

Modified:
   trunk/vim/debian/changelog
   trunk/vim/debian/control
   trunk/vim/debian/vim-common.install
   trunk/vim/debian/vim-runtime.install
Log:
Move vimtutor from vim-runtime to vim-common.
This required adding Conflicts/Replaces to vim-common on vim-runtime.


Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog	2006-02-22 16:01:46 UTC (rev 498)
+++ trunk/vim/debian/changelog	2006-02-22 18:19:49 UTC (rev 499)
@@ -9,8 +9,10 @@
   * Added patch 159_netrw.vim.diff which adds ';' to the characters
     escape()'d when using netrw and escape()'s the tmpfile name.
     (closes: #353076)
+  * Move vimtutor from vim-runtime to vim-common to match vim-common's
+    package description.
 
- -- James Vega <jamessan at debian.org>  Wed, 22 Feb 2006 10:13:12 -0500
+ -- James Vega <jamessan at debian.org>  Wed, 22 Feb 2006 13:16:33 -0500
 
 vim (1:6.4-007+1) unstable; urgency=low
 

Modified: trunk/vim/debian/control
===================================================================
--- trunk/vim/debian/control	2006-02-22 16:01:46 UTC (rev 498)
+++ trunk/vim/debian/control	2006-02-22 18:19:49 UTC (rev 499)
@@ -11,8 +11,8 @@
 Priority: optional
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: vim (<< 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-full (<< 1:6.4-001+3)
-Replaces: vim (<< 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-full (<< 1:6.4-001+3)
+Conflicts: vim-runtime (<< 1:6.4-007+1), vim (<< 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-full (<< 1:6.4-001+3)
+Replaces: vim-runtime (<< 1:6.4-007+1), vim (<< 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-full (<< 1:6.4-001+3)
 Recommends: vim | vim-tiny
 Description: Vi IMproved - Common files
  Vim is an almost compatible version of the UNIX editor Vi.
@@ -48,8 +48,8 @@
 Package: vim-runtime
 Priority: optional
 Architecture: all
-Conflicts: vim-common (<< 1:6.4-004+2), vim (<< 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-full (<< 1:6.4-001+3)
-Replaces: vim-common (<< 1:6.4-004+2), vim (<< 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-full (<< 1:6.4-001+3)
+Conflicts: vim-common (<< 1:6.4-007+1), vim (<< 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-full (<< 1:6.4-001+3)
+Replaces: vim-common (<< 1:6.4-007+1), vim (<< 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-full (<< 1:6.4-001+3)
 Recommends: vim | vim-gnome | vim-gtk | vim-lesstif | vim-perl | vim-python | vim-ruby | vim-tcl | vim-full | vim-tiny
 Enhances: vim-tiny
 Description: Vi IMproved - Runtime files

Modified: trunk/vim/debian/vim-common.install
===================================================================
--- trunk/vim/debian/vim-common.install	2006-02-22 16:01:46 UTC (rev 498)
+++ trunk/vim/debian/vim-common.install	2006-02-22 18:19:49 UTC (rev 499)
@@ -1,3 +1,4 @@
+debian/tmp/usr/bin/vimtutor	  usr/bin/
 debian/tmp/usr/bin/xxd		  usr/bin/
 debian/helpztags		  usr/bin/
 debian/runtime/vimrc		  etc/vim/

Modified: trunk/vim/debian/vim-runtime.install
===================================================================
--- trunk/vim/debian/vim-runtime.install	2006-02-22 16:01:46 UTC (rev 498)
+++ trunk/vim/debian/vim-runtime.install	2006-02-22 18:19:49 UTC (rev 499)
@@ -1,6 +1,3 @@
-debian/tmp/usr/bin/vimtutor	      usr/bin/
-
 debian/tmp/usr/share/consolefonts/*   usr/share/consolefonts/
 debian/tmp/usr/share/vim/	      usr/share/
-
 debian/updates/*.vim		      usr/share/vim/vimcurrent/syntax/