Author: jamessan
Date: 2006-02-23 16:21:51 +0000 (Thu, 23 Feb 2006)
New Revision: 502
Modified:
trunk/vim/debian/changelog
trunk/vim/debian/control
trunk/vim/debian/rules
trunk/vim/debian/vim-common.install
trunk/vim/debian/vim-runtime.dirs
trunk/vim/debian/vim-runtime.install
Log:
Move vimtutor.1 to vim-runtime.
Remove vim-common's reference to vimtutor in its description and add one in
vim-runtime's description.
Remove vim-coomon's Conflicts/Replaces on vim-runtime.
Bump the version of vim-common that vim-runtime Conflicts/Replaces.
Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog 2006-02-22 18:28:53 UTC (rev 501)
+++ trunk/vim/debian/changelog 2006-02-23 16:21:51 UTC (rev 502)
@@ -9,10 +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.
+ * Move vimtutor.1 to the same package (vim-runtime) as vimtutor.
+ Fixes a lintian warning.
- -- James Vega <jamessan@xxxxxxxxxx> Wed, 22 Feb 2006 13:16:33 -0500
+ -- James Vega <jamessan@xxxxxxxxxx> Thu, 23 Feb 2006 09:21:04 -0500
vim (1:6.4-007+1) unstable; urgency=low
Modified: trunk/vim/debian/control
===================================================================
--- trunk/vim/debian/control 2006-02-22 18:28:53 UTC (rev 501)
+++ trunk/vim/debian/control 2006-02-23 16:21:51 UTC (rev 502)
@@ -11,8 +11,8 @@
Priority: optional
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: vim-runtime (<< 1:6.4-007+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-runtime (<< 1:6.4-007+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 (<< 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)
Recommends: vim | vim-tiny
Description: Vi IMproved - Common files
Vim is an almost compatible version of the UNIX editor Vi.
@@ -24,7 +24,7 @@
This package contains files shared by all non GUI-enabled vim
variants (vim and vim-tiny currently) available in Debian.
Examples of such shared files are: manpages, common executables
- like vimtutor and xxd, and configuration files.
+ like xxd, and configuration files.
Package: vim-gui-common
Priority: optional
@@ -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+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-007+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)
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
@@ -62,8 +62,8 @@
This package contains the architecture independent runtime
files, used, if available, by all vim variants available in
Debian. Example of such runtime files are: online documentation,
- rules for language-specific syntax highlighting and indentation,
- color schemes, and standard plugins.
+ vimtutor, rules for language-specific syntax highlighting and
+ indentation, color schemes, and standard plugins.
Package: vim-doc
Priority: optional
Modified: trunk/vim/debian/rules
===================================================================
--- trunk/vim/debian/rules 2006-02-22 18:28:53 UTC (rev 501)
+++ trunk/vim/debian/rules 2006-02-23 16:21:51 UTC (rev 502)
@@ -310,6 +310,7 @@
dh_install -X.svn --fail-missing
# evim is GUI related, move its manpage to vim-gui-common
mv debian/{vim-common,vim-gui-common}/usr/share/man/man1/evim.1
+ mv debian/{vim-common,vim-runtime}/usr/share/man/man1/vimtutor.1
dh_link
# all excepts vim
Modified: trunk/vim/debian/vim-common.install
===================================================================
--- trunk/vim/debian/vim-common.install 2006-02-22 18:28:53 UTC (rev 501)
+++ trunk/vim/debian/vim-common.install 2006-02-23 16:21:51 UTC (rev 502)
@@ -1,4 +1,3 @@
-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.dirs
===================================================================
--- trunk/vim/debian/vim-runtime.dirs 2006-02-22 18:28:53 UTC (rev 501)
+++ trunk/vim/debian/vim-runtime.dirs 2006-02-23 16:21:51 UTC (rev 502)
@@ -1,2 +1,3 @@
/usr/bin/
+/usr/share/man/man1/
/usr/share/consolefonts/
Modified: trunk/vim/debian/vim-runtime.install
===================================================================
--- trunk/vim/debian/vim-runtime.install 2006-02-22 18:28:53 UTC (rev
501)
+++ trunk/vim/debian/vim-runtime.install 2006-02-23 16:21:51 UTC (rev
502)
@@ -1,3 +1,4 @@
-debian/tmp/usr/share/consolefonts/* usr/share/consolefonts/
-debian/tmp/usr/share/vim/ usr/share/
-debian/updates/*.vim usr/share/vim/vimcurrent/syntax/
+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/
|
