r97 - in trunk/vim/debian: . lintian patches
Matthijs Mohlmann
active2-guest@costa.debian.org
Mon, 21 Mar 2005 23:38:44 +0100
Author: active2-guest
Date: 2005-03-21 23:38:42 +0100 (Mon, 21 Mar 2005)
New Revision: 97
Added:
trunk/vim/debian/patches/111_fstab.vim.diff
trunk/vim/debian/vim-32.xpm
Removed:
trunk/vim/debian/vim.xpm
Modified:
trunk/vim/debian/changelog
trunk/vim/debian/control
trunk/vim/debian/lintian/vim
trunk/vim/debian/vim-variant.menu
trunk/vim/debian/vim.install
trunk/vim/debian/vim.menu
Log:
* Fix lintian warning packages-installs-file-to-usr-x11r6
* Removed prerm-does-not-call-installdocs from lintian/vim
* Added patch 111_fstab.vim.diff (Fixes highlighting in fstab)
* Removed Suggests: vim from vim-doc in debian/control
Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog 2005-03-21 12:48:30 UTC (rev 96)
+++ trunk/vim/debian/changelog 2005-03-21 22:38:42 UTC (rev 97)
@@ -3,8 +3,17 @@
* Pierre Habouzit <pierre.habouzit@m4x.org>:
+ Fix php indent plugin thanks to the ITLab at MUSC. (closes: #282135)
- -- Debian VIM Maintainers <pkg-vim-maintainers@lists.alioth.debian.org> Mon, 21 Mar 2005 13:46:57 +0100
+ * Matthijs Mohlmann <matthijs@cacholong.nl>:
+ + Fix lintian warning packages-installs-file-to-usr-x11r6
+ - Moving xpm files to /usr/share/pixmaps
+ - Edited the menu files
+ + Removed prerm-does-not-call-installdocs from lintian/vim
+ + Added patch 111_fstab.vim.diff (Fixes highlighting in fstab)
+ (closes: #300108)
+ + Removed Suggests: vim from vim-doc in debian/control
+ -- Debian VIM Maintainers <pkg-vim-maintainers@lists.alioth.debian.org> Mon, 21 Mar 2005 23:31:12 +0100
+
vim (1:6.3-067+2) unstable; urgency=medium
* Norbert Tretkowski <nobse@debian.org>:
Modified: trunk/vim/debian/control
===================================================================
--- trunk/vim/debian/control 2005-03-21 12:48:30 UTC (rev 96)
+++ trunk/vim/debian/control 2005-03-21 22:38:42 UTC (rev 97)
@@ -244,7 +244,6 @@
Architecture: all
Depends: vim
Replaces: vim (<< 1:6.2-098+1)
-Suggests: vim
Description: Vi IMproved - Documentation files
Vim is an almost compatible version of the UNIX editor Vi. Many new features
have been added: multi level undo, syntax highlighting, command line history,
Modified: trunk/vim/debian/lintian/vim
===================================================================
--- trunk/vim/debian/lintian/vim 2005-03-21 12:48:30 UTC (rev 96)
+++ trunk/vim/debian/lintian/vim 2005-03-21 22:38:42 UTC (rev 97)
@@ -1,4 +1,3 @@
-vim: prerm-does-not-call-installdocs usr/share/doc-base/vim-usermanual
vim: executable-in-usr-share-doc usr/share/doc/vim/tools/efm_filter.pl 0755
vim: executable-in-usr-share-doc usr/share/doc/vim/tools/efm_perl.pl 0755
vim: executable-in-usr-share-doc usr/share/doc/vim/tools/mve.awk 0755
Added: trunk/vim/debian/patches/111_fstab.vim.diff
===================================================================
--- trunk/vim/debian/patches/111_fstab.vim.diff 2005-03-21 12:48:30 UTC (rev 96)
+++ trunk/vim/debian/patches/111_fstab.vim.diff 2005-03-21 22:38:42 UTC (rev 97)
@@ -0,0 +1,32 @@
+diff -ruN vim63.orig/runtime/syntax/fstab.vim vim63/runtime/syntax/fstab.vim
+--- vim63.orig/runtime/syntax/fstab.vim 2005-03-21 22:29:43.245646000 +0100
++++ vim63/runtime/syntax/fstab.vim 2005-03-21 22:33:51.833855784 +0100
+@@ -19,8 +19,8 @@
+
+ " Device
+ syn cluster fsDeviceCluster contains=fsOperator,fsDeviceKeyword,fsDeviceError
+-syn match fsDeviceError /\%([^a-zA-Z0-9_\/#@]\|^\w\{-}\ze\W\)/ contained
+-syn keyword fsDeviceKeyword contained none proc linproc tmpfs
++syn match fsDeviceError /\%([^a-zA-Z0-9_\/#@:]\|^\w\{-}\ze\W\)/ contained
++syn keyword fsDeviceKeyword contained none proc linproc tmpfs sysfs usbfs
+ syn keyword fsDeviceKeyword contained LABEL nextgroup=fsDeviceLabel
+ syn match fsDeviceLabel contained /=[^ \t]\+/hs=s+1 contains=fsOperator
+
+@@ -32,7 +32,7 @@
+ " Type
+ syn cluster fsTypeCluster contains=fsTypeKeyword,fsTypeError
+ syn match fsTypeError /\s\+\zs\w\+/ contained
+-syn keyword fsTypeKeyword contained adfs affs auto autofs cd9660 coda cramfs devfs devpts efs ext2 ext3 fdesc hfs hpfs iso9660 kernfs linprocfs mfs minix msdos ncpfs nfs ntfs nwfs null portal proc procfs qnx4 reiserfs romfs smbfs std sysv swap tmpfs udf ufs umap umsdos union vfat xfs none cifs usbfs
++syn keyword fsTypeKeyword contained adfs affs auto autofs cd9660 coda cramfs devfs devpts efs ext2 ext3 fdesc hfs hpfs iso9660 kernfs linprocfs mfs minix msdos ncpfs nfs ntfs nwfs null portal proc procfs qnx4 reiserfs romfs smbfs std sysv swap tmpfs udf ufs umap umsdos union vfat xfs none cifs usbfs sysfs
+
+ " Options
+ " -------
+@@ -44,7 +44,7 @@
+ syn keyword fsOptionsYesNo yes no
+ syn cluster fsOptionsCheckCluster contains=fsOptionsExt2Check,fsOptionsFatCheck
+ syn keyword fsOptionsSize 512 1024 2048
+-syn keyword fsOptionsGeneral async atime auto current defaults dev exec force fstab noatime noauto noclusterr noclusterw nodev noexec nosuid nosymfollow nouser owner ro rdonly rw rq sw xx suid suiddir sync kudzu union update user supermount devuid devgid devmode
++syn keyword fsOptionsGeneral async atime auto current defaults dev exec force fstab noatime noauto noclusterr noclusterw nodev noexec nosuid nosymfollow nouser owner ro rdonly rw rq sw xx suid suiddir sync kudzu union update user supermount devuid devgid devmode users
+ syn match fsOptionsGeneral /_netdev/
+
+ " Options: adfs
Copied: trunk/vim/debian/vim-32.xpm (from rev 96, trunk/vim/debian/vim.xpm)
Modified: trunk/vim/debian/vim-variant.menu
===================================================================
--- trunk/vim/debian/vim-variant.menu 2005-03-21 12:48:30 UTC (rev 96)
+++ trunk/vim/debian/vim-variant.menu 2005-03-21 22:38:42 UTC (rev 97)
@@ -1,6 +1,6 @@
?package(@PKG@):needs="x11" section="Apps/Editors" \
title="gvim" longtitle="GVIM, graphical Vi IMproved" \
command="/usr/bin/gvim -f" \
- icon32x32="/usr/X11R6/include/X11/pixmaps/vim.xpm" \
- icon16x16="/usr/X11R6/include/X11/pixmaps/vim-16.xpm"
+ icon32x32="/usr/share/pixmaps/vim-32.xpm" \
+ icon16x16="/usr/share/pixmaps/vim-16.xpm"
Modified: trunk/vim/debian/vim.install
===================================================================
--- trunk/vim/debian/vim.install 2005-03-21 12:48:30 UTC (rev 96)
+++ trunk/vim/debian/vim.install 2005-03-21 22:38:42 UTC (rev 97)
@@ -1,5 +1,5 @@
debian/lintian/vim usr/share/lintian/overrides
-debian/vim*.xpm usr/X11R6/include/X11/pixmaps
+debian/vim*.xpm usr/share/pixmaps
debian/runtime/vimrc etc/vim
vim63/runtime/doc/*.html usr/share/doc/vim/html
vim63/runtime/vimrc_example.vim usr/share/vim/vim63
Modified: trunk/vim/debian/vim.menu
===================================================================
--- trunk/vim/debian/vim.menu 2005-03-21 12:48:30 UTC (rev 96)
+++ trunk/vim/debian/vim.menu 2005-03-21 22:38:42 UTC (rev 97)
@@ -1,6 +1,6 @@
?package(vim):needs="text" section="Apps/Editors" \
title="Vim" longtitle="VIM, Vi IMproved" \
command="/usr/bin/vim" \
- icon32x32="/usr/X11R6/include/X11/pixmaps/vim.xpm" \
- icon16x16="/usr/X11R6/include/X11/pixmaps/vim-16.xpm" \
+ icon32x32="/usr/share/pixmaps/vim-32.xpm" \
+ icon16x16="/usr/share/pixmaps/vim-16.xpm" \
hints="Text,vim"
Deleted: trunk/vim/debian/vim.xpm
===================================================================
--- trunk/vim/debian/vim.xpm 2005-03-21 12:48:30 UTC (rev 96)
+++ trunk/vim/debian/vim.xpm 2005-03-21 22:38:42 UTC (rev 97)
@@ -1,43 +0,0 @@
-/* XPM */
-static char * vim32x32[] = {
-"32 32 8 1",
-" c None",
-". c #000000",
-"+ c #00007f",
-"@ c #007f00",
-"# c #00FF00",
-"$ c #7f7f7f",
-"% c #CCCCCC",
-"& c #FFFFFF",
-" .. ",
-" .##. ",
-" ...........#@@#. ......... ",
-" .&&&&&&&&&&&.@@@#.&&&&&&&&&. ",
-" .&%%%%%%%%%%%.@@@.&%%%%%%%%%. ",
-" .%%%%%%%%%%$.@@@@.%%%%%%%%$. ",
-" .$%%%%%%$$.@@@@@@.$%%%%%$$. ",
-" .&%%%%%%$.@@@@@@.&%%%%%$$. ",
-" .&%%%%%%$.@@@@@.&&%%%%$$. ",
-" .&%%%%%%$.@@@@.&&%%%%$$. ",
-" .&%%%%%%$.@@@.&&%%%%$$. ",
-" .&%%%%%%$.@@.&&%%%%$$.#. ",
-" ..&%%%%%%$.@.&&%%%%$$.@@#. ",
-" .#.&%%%%%%$..&&%%%%$$.@@@@#. ",
-" .#@.&%%%%%%$.&&%%%%$$.@@@@@@#. ",
-".#@@.&%%%%%%$&&%%%%$$.@@@@@@@@#.",
-".+@@.&%%%%%%$&%%%%$$.@@@@@@@@@+.",
-" .+@.&%%%%%%$%%%%$$.@@@@@@@@@+. ",
-" .+.&%%%%%%%%%%...@@@@@@@@@+. ",
-" ..&%%%%%%%%%.%%.@@@@@@@@+. ",
-" .&%%%%%%%%%.%%.@@@@@@@+. ",
-" .&%%%%%%%%$...@...@...... ",
-" .&%%%%%%%$.%%%.%%%.%%%.%%. ",
-" .&%%%%%%$$..%%..%%%%%%%%%%. ",
-" .&%%%%%$$..%%...%%++%%..%. ",
-" .&%%%%$$.@.%%..%%+.%%..%%. ",
-" .&%%%$$.@@.%%..%%..%%..%%. ",
-" .&%%$$..+.%%..%%..%%..%%. ",
-" .%$$. ..%%%.%%..%%..%%%. ",
-" ... ....+.. .. ... ",
-" .++. ",
-" .. "};