r647 - in /trunk/packages/vim: debian/ debian/runtime/ debian/tiny/
debian/updates/ patches/ upstream/patches/
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Tue May 9 12:41:36 UTC 2006
Author: jamessan
Date: Tue May 9 12:41:18 2006
New Revision: 647
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=647
Log:
Merge vim7 branch back onto the trunk.
Added:
trunk/packages/vim/debian/runtime/debian.vim
trunk/packages/vim/debian/vim-common.install.in
trunk/packages/vim/debian/vim-common.links.in
trunk/packages/vim/debian/vim-gui-common.install.in
trunk/packages/vim/debian/vim-gui-common.links.in
trunk/packages/vim/debian/vim-runtime.install.in
trunk/packages/vim/patches/pushed-upstream.txt
Removed:
trunk/packages/vim/debian/updates/debsources.vim
trunk/packages/vim/debian/vim-common.install
trunk/packages/vim/debian/vim-common.links
trunk/packages/vim/debian/vim-gui-common.install
trunk/packages/vim/debian/vim-gui-common.links
trunk/packages/vim/debian/vim-runtime.install
trunk/packages/vim/patches/101_make.vim.diff
trunk/packages/vim/patches/102_filetype.vim.diff
trunk/packages/vim/patches/103_sh.vim.diff
trunk/packages/vim/patches/104_debchangelog.vim.diff
trunk/packages/vim/patches/105_recognize-gnumakefile-am.diff
trunk/packages/vim/patches/105_tutor.vim.diff
trunk/packages/vim/patches/105_xmodmap.vim.diff
trunk/packages/vim/patches/106_fstab.vim.diff
trunk/packages/vim/patches/107_vim.1.diff
trunk/packages/vim/patches/107_xxd.1.diff
trunk/packages/vim/patches/108_automake.vim.diff
trunk/packages/vim/patches/111_fstab.vim.diff
trunk/packages/vim/patches/117_fortran.vim.diff
trunk/packages/vim/patches/119_php.vim.diff
trunk/packages/vim/patches/122_html_indent.vim.diff
trunk/packages/vim/patches/123_accents.diff
trunk/packages/vim/patches/124_errorformat.vim.diff
trunk/packages/vim/patches/125_gzip.vim.diff
trunk/packages/vim/patches/127_scripts.vim.diff
trunk/packages/vim/patches/129_filetype.vim.diff
trunk/packages/vim/patches/130_fstab.vim.diff
trunk/packages/vim/patches/131_xxd.1.diff
trunk/packages/vim/patches/133_filetype.vim.diff
trunk/packages/vim/patches/133_resolv.vim.diff
trunk/packages/vim/patches/134_sshconfig.vim.diff
trunk/packages/vim/patches/135_debsources.vim.diff
trunk/packages/vim/patches/136_muttrc.vim.diff
trunk/packages/vim/patches/137_filetype.vim.diff
trunk/packages/vim/patches/138_filetype.txt.diff
trunk/packages/vim/patches/140_muttrc.vim.diff
trunk/packages/vim/patches/141_asterisk.vim.diff
trunk/packages/vim/patches/142_filetype.vim.diff
trunk/packages/vim/patches/144_scripts.vim.diff
trunk/packages/vim/patches/145_fortran.vim.diff
trunk/packages/vim/patches/146_netrw.vim.diff
trunk/packages/vim/patches/147_perl.vim.diff
trunk/packages/vim/patches/148_debchangelog.vim.diff
trunk/packages/vim/patches/149_sshconfig.vim.diff
trunk/packages/vim/patches/150_asterisk.vim.diff
trunk/packages/vim/patches/151_sed.vim.diff
trunk/packages/vim/patches/152_javascript.vim.diff
trunk/packages/vim/patches/153_filetype.vim.diff
trunk/packages/vim/patches/154_svn.vim.diff
trunk/packages/vim/patches/155_rst.vim.diff
trunk/packages/vim/patches/156_scripts.vim.diff
trunk/packages/vim/patches/157_slrnrc.vim.diff
trunk/packages/vim/patches/158_python.vim.diff
trunk/packages/vim/patches/159_netrw.vim.diff
trunk/packages/vim/patches/160_scripts.vim.diff
trunk/packages/vim/patches/161_cmake-support.diff
trunk/packages/vim/patches/162_css.vim.diff
trunk/packages/vim/patches/201_fr.po.diff
trunk/packages/vim/patches/203_zh_TW.UTF8.po.diff
trunk/packages/vim/patches/301_xxd.c.diff
trunk/packages/vim/patches/302_message.c.diff
trunk/packages/vim/patches/303_option.c.diff
trunk/packages/vim/patches/304_memline.c.diff
trunk/packages/vim/patches/305_term.c.diff
trunk/packages/vim/patches/402_doc_editing.txt.diff
trunk/packages/vim/upstream/patches/6.4.001
trunk/packages/vim/upstream/patches/6.4.002
trunk/packages/vim/upstream/patches/6.4.003
trunk/packages/vim/upstream/patches/6.4.004
trunk/packages/vim/upstream/patches/6.4.005
trunk/packages/vim/upstream/patches/6.4.006
trunk/packages/vim/upstream/patches/6.4.007
trunk/packages/vim/upstream/patches/6.4.008
trunk/packages/vim/upstream/patches/6.4.009
trunk/packages/vim/upstream/patches/6.4.010
Modified:
trunk/packages/vim/debian/NEWS
trunk/packages/vim/debian/README.Debian
trunk/packages/vim/debian/TODO
trunk/packages/vim/debian/changelog
trunk/packages/vim/debian/control
trunk/packages/vim/debian/rules
trunk/packages/vim/debian/runtime/gvimrc
trunk/packages/vim/debian/runtime/vimrc
trunk/packages/vim/debian/tiny/features.txt
trunk/packages/vim/debian/vim-doc.install
trunk/packages/vim/debian/vim-runtime.dirs
trunk/packages/vim/debian/vim-variant.install
trunk/packages/vim/debian/vim-variant.postinst
trunk/packages/vim/debian/vim-variant.prerm
trunk/packages/vim/patches/series
Modified: trunk/packages/vim/debian/NEWS
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/NEWS?rev=647&op=diff
==============================================================================
--- trunk/packages/vim/debian/NEWS (original)
+++ trunk/packages/vim/debian/NEWS Tue May 9 12:41:18 2006
@@ -1,3 +1,21 @@
+vim (1:6.4+7.0g01-1) experimental; urgency=low
+
+ /etc/vim/vimrc (and gvimrc) no longer contain the default system-wide
+ settings for Vim. They have been moved to $VIMRUNTIME/debian.vim in order
+ to ensure any changes we maintainers make are properly applied (such as
+ further modifications to the runtimepath option).
+
+ This frees up /etc/vim/vimrc (and gvimrc) for the sysadmin to make any
+ changes directly to that file instead of using vimrc.local as had previously
+ been suggested. The only line which need be maintained is "runtime!
+ debian.vim" as that is what sources the package's system-wide settings.
+
+ It is highly recommended that the new vimrc and gvimrc files are accepted or
+ carefully merged with the existing files since not doing so will very
+ likely cause Vim not to operate correctly.
+
+ -- James Vega <jamessan at debian.org> Wed, 3 May 2006 10:54:15 -0400
+
vim (1:6.4-004+1) unstable; urgency=low
* The vim-tiny package is back.
Modified: trunk/packages/vim/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/README.Debian?rev=647&op=diff
==============================================================================
--- trunk/packages/vim/debian/README.Debian (original)
+++ trunk/packages/vim/debian/README.Debian Tue May 9 12:41:18 2006
@@ -8,19 +8,14 @@
with "vim -u NONE -U NONE". If not, make sure that the "bug" is not
a result of a setting in your ~/.vimrc before reporting it.
-3. In order to make some global configuration on your box, please leave
- /etc/vim/{vimrc,gvimrc} untouched, and prefer to use /etc/vim/vimrc.local and
- /etc/vim/gvimrc.local instead. This will allow vim upgrades to be 100%
- smooth, without loosing your local changes.
-
- -- Norbert Tretkowski <nobse at debian.org> Wed, 12 May 2004 20:33:05 +0200
+ -- Stefano Zacchiroli <zack at debian.org> Mon, 10 Apr 2006 09:59:41 -0400
UTF-8 Known issues
------------------
There are some known problems with using Vim in an UTF-8 environment.
It's strongly advised to update the encoding variable when using Vim in UTF-8
- environment.
+ environment.
Putting this line in your vimrc do the trick:
set encoding=utf-8
@@ -36,3 +31,17 @@
"vim-common" package. They are available in the "vim-doc" package.
-- Stefano Zacchiroli <zack at debian.org> Mon, 07 Nov 2005 09:16:00 +0100
+
+MzScheme Vim variant
+--------------------
+
+As requested by the current MzScheme maintainer (Ari Pollak <ari at debian.org>),
+a vim-mzscheme variant is not being built. The reasons stated are as follows:
+
+ 1) MzScheme does not build on many of Debian's supported architectures.
+
+ 2) The MzScheme package is not versioned based on the library.
+
+ 3) The MzScheme ABI changes with every upstream version.
+
+ -- James Vega <jamessan at debian.org> Mon, 10 Apr 2006 09:48:25 -0400
Modified: trunk/packages/vim/debian/TODO
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/TODO?rev=647&op=diff
==============================================================================
--- trunk/packages/vim/debian/TODO (original)
+++ trunk/packages/vim/debian/TODO Tue May 9 12:41:18 2006
@@ -1,0 +1,13 @@
+
+* Make debcontrol.vim share the same destiny of debchangelog.vim (move it to
+ runtime/, integrate patches, send it to Bram, and get in touch about it with
+ Alfie at the debconf)
+
+-- Mon, 01 May 2006 11:06:59 -0400 zack
+
+* Update vim-policy.txt about debian.vim and contact maintainers of files
+ shipped in the wrong place.
+ http://lists.alioth.debian.org/pipermail/pkg-vim-maintainers/2006-May/002541.html
+
+-- Mon, 01 May 2006 11:07:17 -0400 zack
+
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=647&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Tue May 9 12:41:18 2006
@@ -1,38 +1,138 @@
-vim (1:6.4-010+1) UNRELEASED; urgency=low
+vim (1:7.0-000+1) UNRELEASED; urgency=low
[ Debian Vim Maintainers ]
- * New upstream patches (008 to 010), see README.gz for details.
+ * New upstream release (7.0). (closes: #366396)
+ + The CSS syntax file properly handles non-UTF-8 aware environments.
+ (closes: #358734)
+
+ [ James Vega ]
+ * Massage the packaging back into "stable upstream releases" mode.
+ + Remove debian/watch since it isn't useful with Vim's method of releasing
+ stable updates.
+ + Swap out the unzip Build-Depends for bzip2.
+ + Update debian/rules to use the src/lang/extra tarballs instead of one
+ zip file.
+
+ -- James Vega <jamessan at debian.org> Mon, 8 May 2006 13:47:06 -0400
+
+vim (1:6.4+7.0g01-1) experimental; urgency=low
+
+ [ Debian Vim Maintainers ]
+ * New upstream snapshot (7.0g01).
+ + Remove 161_cmake-support.diff, merged upstream.
+ + Recognize zsh-beta as a shell that supports '2>&1| tee' for the
+ 'shellpipe' option. (closes: #362999)
+ + Assign filetype=php to any .php<digit> filename. (closes: #365055)
+ + Recognition in debcontrol's syntax file of all architectures listed at
+ http://www.debian.org/ports/ (closes: 364824)
+
+ [ Stefano Zacchiroli ]
+ * Screening of patches no longer needed with vim7 & pushing upstream
+ of as many debian-specific patches as possible. Results:
+ + removed patches: 102_pythoncomplete.vim.diff, 104_debchangelog.vim.diff,
+ 106_fstab.vim.diff, 108_automake.vim.diff, 109_xdefaults.vim.diff,
+ 111_fstab.vim.diff, 119_php.vim.diff, 130_fstab.vim.diff,
+ 133_resolv.vim.diff, 136_muttrc.vim.diff, 140_muttrc.vim.diff,
+ 148_debchangelog.vim.diff, 157_slrnrc.vim.diff, 201_fr.po.diff,
+ 203_zh_TW.UTF8.po.diff
+ + The following runtime and translation files are now maintained upstream
+ in a best effort fashion (i.e. they are looking for a new maintainer) by
+ Debian VIM Maintainers: syntax/muttrc.vim, syntax/automake.vim,
+ syntax/php.vim, syntax/slrnrc.vim, lang/po/zh_TW.UTF-8.po.
+ + syntax/debchangelog.vim, syntax/debcontrol.vim, and syntax/tpp.vim are
+ now officially co-maintained upstream by Debian Vim Maintainers
+ * Improved comments and added more commented settings in /etc/vim/vimrc
+
+ [ James Vega ]
+ * Add Replaces against manpages-it and manpages-pl since upstream now
+ provides i10n manpages. (closes: #364299)
+ * Moved Debian specific settings out from /etc/vim/{,g}vimrc, so that the
+ file can be (more) freely modified by sysadmins without risking merge
+ problems with maintainer updates.
+
+ -- James Vega <jamessan at debian.org> Wed, 3 May 2006 12:34:14 -0400
+
+vim (1:6.4+7.0d03-1) experimental; urgency=low
+
+ [ Debian Vim Maintainers ]
+ * New upstream snapshot (7.0d03).
+ + A lot of new features have been added, most notably: spell checking,
+ omni completion, tabs, undo branches, internal grep, location lists,
+ list/dictionary/funcref types for scripting.
+ See ":help version7" for more information.
+ + bugfixes affecting Debian's BTS:
+ - new version of sh.vim syntax highlighting (closes: #355273, #361813)
+ - respect LC_MESSAGES in menus (closes: #147757, #217217)
+ - consistent behaviour of 'gq' when an external formatter is used
+ (closes: #177735)
+ - improved wildcard expansion of filename patterns
+ (closes: #262645, #258150)
+ - german tutorial now shows instruction on how to proceed in the first
+ page (closes: #289115)
+ - fixed encoding of slovak translation (closes: #257342)
+ - proper escaping of characters in URLs (closes: #353076, #361317)
+ - added g:is_posix flag to sh.vim to enable highlighting of POSIX shell
+ scripts (closes: #361177)
+
+ [ Stefano Zacchiroli ]
+ * Screening of patches no longer needed with vim7 & pushing upstream
+ of as many debian-specific patches as possible. Results:
+ + removed patches: 101_make.vim.diff, 103_sh.vim.diff,
+ 117_fortram.vim.diff, 122_html_indent.vim.diff, 135_debsources.vim.diff,
+ 145_fortran.vim.diff, 155_rst.vim.diff
+ + removed updates: debian/updates/debsources.vim
+
+ -- James Vega <jamessan at debian.org> Fri, 14 Apr 2006 13:29:49 -0400
+
+vim (1:6.4+7.0c05-1) experimental; urgency=low
+
+ [ Debian Vim Maintainers ]
+ * New upstream snapshot (7.0c05).
+ + Added support for bzr diffs in scripts.vim, thanks to Adeodato Simó.
+ (closes: #355922)
+ + Support python `as' keyword. (closes: #352885)
+
+ [ James Vega ]
+ * Sync with the work that's been done on the 6.4 vim package.
+ * Add a missing quote in /etc/vim/vimrc's last-position-jump example.
+ (closes: #347597)
+ * Move vimtutor.1 to the same package (vim-runtime) as vimtutor.
+ Fixes a lintian warning.
+ * Add debian/watch.
+ * Cleanup handling of manpages and alternatives.
+ * debian/control:
+ + Remove references to obsolete packages.
+ + Move vim-doc to Section: doc.
+ + Update vim-common to Recommend all the vim variants.
+ + Add Build-Depends on libxpm-dev and unzip.
+ * debian/rules:
+ + Added support for running upstream's tests during the build process.
+ + Automatically generate the necessary .install/.links/.postinst settings
+ for installing the localized manpages.
[ Pierre Habouzit ]
- * Support python `as' keyword. (closes: #352885)
* Add support for cmake (from cmake.org). (closes: #357705)
* debcontrol.vim: add kfreebsd-amd64 to the ports list.
- [ James Vega ]
- * Add a missing quote in /etc/vim/vimrc's last-position-jump example.
- (closes: #347597)
- * 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.1 to the same package (vim-runtime) as vimtutor.
- Fixes a lintian warning.
- * Added patch 162_css.vim.diff which catches an error when utf-8 characters
- aren't supported. (closes: #358734)
- * Remove the empty usr/bin directory from the vim-gui-common package.
- (closes: #354170)
-
- [ Norbert Tretkowski ]
- * Added patch 160_scripts.vim.diff which adds support for bzr diffs in
- scripts.vim, thanks to Adeodato Simó. (closes: #355922)
+ [ Stefano Zacchiroli ]
+ * Screening of patches no longer needed with vim7 & pushing upstream
+ of as many debian-specific patches as possible. Results:
+ + removed patches: 102_filetype.vim.diff, 107_vim.1.diff, 107_xxd.1.diff,
+ 105_recognize-gnumakefile-am.diff, 123_accents.diff,
+ 133_filetype.vim.diff, 142_filetype.vim.diff, 153_filetype.vim.diff,
+ 154_svn.vim.diff, 156_scripts.vim.diff, 158_python.vim.diff,
+ 301_xxd.c.diff, 303_option.c.diff, 305_term.c.diff
+ * Added patch 102_pycomplete.vim: fixes a python omnicompletion bug when the
+ cursor is on an empty line
[ Matthijs Mohlmann ]
- * Updated debsources.vim
+ * Updated debsources syntax file.
+ Use debsources instead of sources.
+ Make a regexpression of deb, deb-src, main, contrib and non-free.
+ Remove setlocal iskeyword.
+ Remove compatibility with vim 5.x.
- -- James Vega <jamessan at debian.org> Sat, 1 Apr 2006 09:09:48 -0500
+ -- James Vega <jamessan at debian.org> Fri, 31 Mar 2006 17:50:11 -0500
vim (1:6.4-007+1) unstable; urgency=low
Modified: trunk/packages/vim/debian/control
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/control?rev=647&op=diff
==============================================================================
--- trunk/packages/vim/debian/control (original)
+++ trunk/packages/vim/debian/control Tue May 9 12:41:18 2006
@@ -4,7 +4,7 @@
Maintainer: Debian VIM Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>
Uploaders: Norbert Tretkowski <nobse at debian.org>, Pierre Habouzit <madcoder at debian.org>, Matthijs Mohlmann <matthijs at cacholong.nl>, Stefano Zacchiroli <zack at debian.org>, Alexis Sukrieh <sukria at sukria.net>, Pepijn de Langen <pepijn at ce.et.tudelft.nl>, James Vega <jamessan at debian.org>
Standards-Version: 3.6.2
-Build-Depends: debhelper (>= 4.2.21), dpkg (>> 1.7.0), bzip2, perl (>= 5.6), libgpmg1-dev [!hurd-i386] | not+linux-gnu, libperl-dev (>= 5.6), tcl8.4-dev [!hurd-i386], python-dev, libncurses5-dev, ruby, ruby1.8-dev, libgtk2.0-dev (>= 2.2), libgnomeui-dev [!hurd-i386], lesstif2-dev, quilt, make (>= 3.80+3.81.b4)
+Build-Depends: debhelper (>= 4.2.21), dpkg (>> 1.7.0), bzip2, perl (>= 5.6), libgpmg1-dev [!hurd-i386] | not+linux-gnu, libperl-dev (>= 5.6), tcl8.4-dev [!hurd-i386], python-dev, libxpm-dev, libncurses5-dev, ruby, ruby1.8-dev, libgtk2.0-dev (>= 2.2), libgnomeui-dev [!hurd-i386], lesstif2-dev, quilt, make (>= 3.80+3.81.b4)
Build-Conflicts: libperl-dev (= 5.8.4-1)
Package: vim-common
@@ -12,8 +12,8 @@
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)
-Recommends: vim | vim-tiny
+Replaces: manpages-it (<= 0.3.4-3), manpages-pl (<=20060331-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
Description: Vi IMproved - Common files
Vim is an almost compatible version of the UNIX editor Vi.
.
@@ -24,14 +24,14 @@
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 xxd, and configuration files.
+ like vimtutor and xxd, and configuration files.
Package: vim-gui-common
Priority: optional
Architecture: all
Depends: vim-common (= ${Source-Version})
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)
+Replaces: manpages-pl (<=20060331-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-gnome | vim-gtk | vim-lesstif | vim-perl | vim-python | vim-ruby | vim-tcl | vim-full
Description: Vi IMproved - Common GUI files
Vim is an almost compatible version of the UNIX editor Vi.
@@ -49,7 +49,7 @@
Priority: optional
Architecture: all
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)
+Replaces: manpages-pl (<=20060331-1), 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,13 +62,13 @@
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,
- vimtutor, rules for language-specific syntax highlighting and
- indentation, color schemes, and standard plugins.
+ rules for language-specific syntax highlighting and indentation,
+ color schemes, and standard plugins.
Package: vim-doc
+Section: doc
Priority: optional
Architecture: all
-Replaces: vim (<< 1:6.2-098+1)
Description: Vi IMproved - HTML documentation
Vim is an almost compatible version of the UNIX editor Vi.
.
@@ -102,9 +102,9 @@
Architecture: any
Depends: vim-common (= ${Source-Version}), vim-runtime (= ${Source-Version}), ${shlibs:Depends}
Suggests: ctags, vim-doc, vim-scripts
-Provides: editor, vim-rt
-Conflicts: vim-rt, 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-tty (<< 6.0), vim-common (<< 1:6.4-001+3)
-Replaces: vim-rt, kvim (<< 1:6.2.135+1), 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-tty (<< 6.0)
+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)
Description: Vi IMproved - enhanced vi editor
Vim is an almost compatible version of the UNIX editor Vi.
.
@@ -122,8 +122,8 @@
Depends: vim-gui-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 (<< 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-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-tty, vim-common (<< 1:6.4-001+3)
-Replaces: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim (<= 1:6.3-068+1), 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-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-tty
+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-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 (<= 1:6.3-068+1), 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-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 - with Perl support
Vim is an almost compatible version of the UNIX editor Vi.
.
@@ -140,8 +140,8 @@
Depends: vim-gui-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 (<< 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-ruby (<< 1:6.4-001+3), vim-tcl (<< 1:6.4-001+3), vim-tiny (<< 1:6.4-001+3), vim-tty, vim-common (<< 1:6.4-001+3)
-Replaces: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim (<= 1:6.3-068+1), 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-ruby (<< 1:6.4-001+3), vim-tcl (<< 1:6.4-001+3), vim-tiny (<< 1:6.4-001+3), vim-tty
+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-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 (<= 1:6.3-068+1), 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-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 - with Python support
Vim is an almost compatible version of the UNIX editor Vi.
.
@@ -158,8 +158,8 @@
Depends: vim-gui-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 (<< 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-tcl (<< 1:6.4-001+3), vim-tiny (<< 1:6.4-001+3), vim-tty, vim-common (<< 1:6.4-001+3)
-Replaces: kvim, kvim-perl, kvim-python, kvim-tcl, vim (<= 1:6.3-068+1), 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-tcl (<< 1:6.4-001+3), vim-tiny (<< 1:6.4-001+3), vim-tty
+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-tcl (<< 1:6.4-001+3), vim-tiny (<< 1:6.4-001+3), vim-common (<< 1:6.4-001+3)
+Replaces: vim (<= 1:6.3-068+1), 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-tcl (<< 1:6.4-001+3), vim-tiny (<< 1:6.4-001+3)
Description: Vi IMproved - enhanced vi editor - with Ruby support
Vim is an almost compatible version of the UNIX editor Vi.
.
@@ -176,8 +176,8 @@
Depends: vim-gui-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 (<< 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-tiny (<< 1:6.4-001+3), vim-tty, vim-common (<< 1:6.4-001+3)
-Replaces: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim (<= 1:6.3-068+1), 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-tiny (<< 1:6.4-001+3), vim-tty
+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-tiny (<< 1:6.4-001+3), vim-common (<< 1:6.4-001+3)
+Replaces: vim (<= 1:6.3-068+1), 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-tiny (<< 1:6.4-001+3)
Description: Vi IMproved - enhanced vi editor - with TCL support
Vim is an almost compatible version of the UNIX editor Vi.
.
@@ -194,8 +194,8 @@
Depends: vim-gui-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 (<< 1:6.4-001+3), vim-gnome (<< 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-tty, vim-common (<< 1:6.4-001+3)
-Replaces: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim (<= 1:6.3-068+1), vim-full (<< 1:6.4-001+3), vim-gnome (<< 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-tty
+Conflicts: vim-full (<< 1:6.4-001+3), vim-gnome (<< 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 (<= 1:6.3-068+1), vim-full (<< 1:6.4-001+3), vim-gnome (<< 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 - with GTK2 GUI
Vim is an almost compatible version of the UNIX editor Vi.
.
@@ -212,8 +212,8 @@
Depends: vim-gui-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 (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-gtk (<< 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-tty, vim-common (<< 1:6.4-001+3)
-Replaces: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim (<= 1:6.3-068+1), vim-full (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-gtk (<< 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-tty
+Conflicts: vim-full (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-gtk (<< 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 (<= 1:6.3-068+1), vim-full (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-gtk (<< 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 - with LessTif GUI
Vim is an almost compatible version of the UNIX editor Vi.
.
@@ -230,8 +230,8 @@
Depends: vim-gui-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 (<< 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-tty, vim-common (<< 1:6.4-001+3)
-Replaces: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim (<= 1:6.3-068+1), vim-full (<< 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-tty
+Conflicts: vim-full (<< 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 (<= 1:6.3-068+1), vim-full (<< 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 - with GNOME2 GUI
Vim is an almost compatible version of the UNIX editor Vi.
.
@@ -248,8 +248,8 @@
Depends: vim-gui-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 (<< 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-tty, vim-common (<< 1:6.4-001+3)
-Replaces: kvim, kvim-perl, kvim-python, kvim-ruby, kvim-tcl, vim (<= 1:6.3-068+1), 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-tty
+Conflicts: 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 (<= 1:6.3-068+1), 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 - full fledged version
Vim is an almost compatible version of the UNIX editor Vi.
.
Modified: trunk/packages/vim/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/rules?rev=647&op=diff
==============================================================================
--- trunk/packages/vim/debian/rules (original)
+++ trunk/packages/vim/debian/rules Tue May 9 12:41:18 2006
@@ -13,6 +13,12 @@
CFLAGS+=-O2
endif
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+ MAKETEST = yes
+else
+ MAKETEST = no
+endif
+
INSTALL+=install
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL+=-s
@@ -26,6 +32,7 @@
# "vim-tiny" features: in addition to those coming from the --with-features=xxx,
# "vim-tiny" is built with those listed in debian/tiny/features.txt
TINYFLAGS+=--with-features=small
+TINYFLAGS+=--disable-syntax
TINYFLAGS+=--disable-gui
TINYFLAGS+=--disable-xsmp
TINYFLAGS+=--disable-xsmp-interact
@@ -53,30 +60,36 @@
LESSTIFFLAGS+=--enable-gui=motif
PERLFLAGS+=--enable-perlinterp
+PERLFLAGS+=--disable-mzschemeinterp
PERLFLAGS+=--disable-pythoninterp
PERLFLAGS+=--disable-rubyinterp
PERLFLAGS+=--disable-tclinterp
PYTHONFLAGS+=--enable-pythoninterp
+PYTHONFLAGS+=--disable-mzschemeinterp
PYTHONFLAGS+=--disable-perlinterp
PYTHONFLAGS+=--disable-rubyinterp
PYTHONFLAGS+=--disable-tclinterp
RUBYFLAGS+=--enable-rubyinterp
+RUBYFLAGS+=--disable-mzschemeinterp
RUBYFLAGS+=--disable-perlinterp
RUBYFLAGS+=--disable-pythoninterp
RUBYFLAGS+=--disable-tclinterp
TCLFLAGS+=--enable-tclinterp
+TCLFLAGS+=--disable-mzschemeinterp
TCLFLAGS+=--disable-perlinterp
TCLFLAGS+=--disable-pythoninterp
TCLFLAGS+=--disable-rubyinterp
+BASICFLAGS+=--disable-mzschemeinterp
BASICFLAGS+=--disable-tclinterp
BASICFLAGS+=--disable-perlinterp
BASICFLAGS+=--disable-pythoninterp
BASICFLAGS+=--disable-rubyinterp
+ALLINTERPFLAGS+=--disable-mzschemeinterp
ALLINTERPFLAGS+=--enable-perlinterp
ALLINTERPFLAGS+=--enable-pythoninterp
ALLINTERPFLAGS+=--enable-rubyinterp
@@ -148,17 +161,22 @@
CFGFLAGS_vim-full=$(CFGFLAGS) $(OPTFLAGS) $(GUIFLAGS) $(GNOMEFLAGS) $(ALLINTERPFLAGS)
NAME=vim
-VERSION=6.4
-#VIMCUR=$(subst .,,$(VERSION))
-VIMCUR=vim64
-CHANGELOG=vim64/runtime/doc/version6.txt # latest version upstream changelog
+VERSION=7.0
+DEBVERSION=$(VERSION)
+PATCH=000
+VIMCUR=$(NAME)$(subst .,,$(VERSION))
+SRCDIR=$(VIMCUR)
+CHANGELOG=$(SRCDIR)/runtime/doc/version7.txt # latest version upstream changelog
MAIN_TARBALL=$(NAME)-$(VERSION).tar.bz2
LANG_TARBALL=$(NAME)-$(VERSION)-lang.tar.gz
EXTRA_TARBALL=$(NAME)-$(VERSION)-extra.tar.gz
SOURCES = $(MAIN_TARBALL) $(LANG_TARBALL) $(EXTRA_TARBALL)
-SRCDIR=$(NAME)$(subst .,,$(VERSION))
BASE_URL=ftp://ftp.vim.org/pub/vim
PER_VARIANT_FILES = install postinst postrm prerm links
+LANGS += fr fr.ISO8859-1 fr.UTF-8
+LANGS += it it.ISO8859-1 it.UTF-8
+LANGS += pl pl.ISO8859-2 pl.UTF-8
+LANGS += ru.KOI8-R ru.UTF-8
# nothing to do per default
all:
@@ -172,25 +190,25 @@
export: clean
test -d ../build-area # this dir is in the svn repo
- rm -rf ../build-area/vim-$(VERSION)
- mkdir ../build-area/vim-$(VERSION)
- svn export debian ../build-area/vim-$(VERSION)/debian
- svn export patches ../build-area/vim-$(VERSION)/patches
- svn export upstream ../build-area/vim-$(VERSION)/upstream
+ rm -rf ../build-area/vim-$(DEBVERSION)
+ mkdir ../build-area/vim-$(DEBVERSION)
+ svn export debian ../build-area/vim-$(DEBVERSION)/debian
+ svn export patches ../build-area/vim-$(DEBVERSION)/patches
+ svn export upstream ../build-area/vim-$(DEBVERSION)/upstream
for tb in $(MAIN_TARBALL) $(LANG_TARBALL) $(EXTRA_TARBALL) ; do \
- cp upstream/tarballs/$$tb \
- ../build-area/vim-$(VERSION)/upstream/tarballs/ ; \
+ cp upstream/tarballs/$$tb \
+ ../build-area/vim-$(VERSION)/upstream/tarballs/ ; \
done
cd ../build-area && \
- tar cvzf vim_$(VERSION).orig.tar.gz \
- vim-$(VERSION)/upstream/tarballs/
+ tar cvzf vim_$(DEBVERSION).orig.tar.gz \
+ vim-$(DEBVERSION)/upstream/tarballs/
cd ../build-area && \
- dpkg-source -b vim-$(VERSION)
+ dpkg-source -b vim-$(DEBVERSION)
extract: extract-stamp
extract-stamp: $(foreach s,$(SOURCES),extract-stamp-$(s))
if [ ! -L vim -o "`readlink vim`" != "$(VIMCUR)" ]; then \
- ln -fs $(VIMCUR) vim; \
+ ln -fs $(SRCDIR) vim; \
fi
@for f in `find upstream/patches -type f -name '$(VERSION).*' -printf "%P\n" | grep -v .svn | sort -n` ; do\
echo "applying upstream patch: $$f" ;\
@@ -199,12 +217,30 @@
quilt push -a
touch $@
+# {{{1 hackish way of updating to latest unstable snapshot
+updatesnapshot:
+ zipurl=`uscan --report | tail -2 | head -1` \
+ && test ! -z "$$zipurl" \
+ && zipbasename=`basename $$zipurl` \
+ && wget -O upstream/tarballs/$$zipbasename $$zipurl \
+ && noext=`echo $$zipbasename | sed 's/.zip//'` \
+ && rulesversion=`echo $$noext | cut -c5-8` \
+ && rulessnapshot=`echo $$noext | cut -c9-10` \
+ && sedcmd="s/^VERSION=.*/VERSION=$$rulesversion/;s/^SNAPSHOT=.*/SNAPSHOT=$$rulessnapshot/" \
+ && sed -i.bak "$$sedcmd" debian/rules \
+ && sed -i.bak "1{s/+.*-/+$$rulesversion$$rulessnapshot-/};4{s/(......)/($$rulesversion$$rulessnapshot)/}" debian/changelog
+# }}}
+
extract-stamp-%.bz2:
bunzip2 -c upstream/tarballs/$(*).bz2 | tar -x
touch $@
extract-stamp-%.gz:
gunzip -c upstream/tarballs/$(*).gz | tar -x
+ touch $@
+
+extract-stamp-%.zip:
+ unzip -d $(SRCDIR) upstream/tarballs/$(*).zip
touch $@
clean: $(foreach v,$(VARIANTS),clean-$(v))
@@ -220,6 +256,10 @@
clean-vim-basic:
for x in $(PER_VARIANT_FILES) ; do \
rm -f debian/vim.$$x ; \
+ done
+ for x in vim-gui-common.{install,links} vim-common.{install,links} \
+ vim-runtime.install; do \
+ rm -f debian/$$x; \
done
clean-%:
@@ -243,8 +283,8 @@
@echo "*** DEBIAN *** CONFIGURING VARIANT $*"
$(MAKE) -C $(SRCDIR) clean
cd $(SRCDIR) \
- && make distclean \
- && CFLAGS="$(CFLAGS_$(*))" ./configure $(CFGFLAGS_$(*))
+ && make distclean \
+ && CFLAGS="$(CFLAGS_$(*))" ./configure $(CFGFLAGS_$(*))
touch $@
build-stamp-%: CURCFLAGS=$(CFLAGS_$*)
@@ -273,7 +313,16 @@
# UPSTREAM INSTALLATION
- $(MAKE) -C $(SRCDIR)/src DESTDIR=$(DESTDIR) install
+ cp $(SRCDIR)/src/{vim.basic,vim}
+ $(MAKE) -C $(SRCDIR)/src DESTDIR=$(DESTDIR) installvimbin \
+ installtutorbin \
+ installruntime \
+ installtools \
+ install-icons \
+ install-languages
+ if [ $(MAKETEST) = "yes" ]; then \
+ $(MAKE) -C $(SRCDIR)/src DESTDIR=$(DESTDIR) test; \
+ fi
# DEBIAN INSTALLATION
@@ -281,18 +330,17 @@
#cp debian/vim-install $(DESTDIR)/usr/bin
mv $(DESTDIR)/usr/bin/{vim,vim.basic} # use variant name
ln -fs $(VIMCUR) $(DESTDIR)/usr/share/vim/vimcurrent # vimcur symlink
- # console fonts
- install -m0644 -D $(VIMCUR)/farsi/fonts/UNIXs/far-a01.pcf.gz \
- $(DESTDIR)/usr/share/consolefonts/far-a01.pcf.gz
- # rm stuff handled by alternatives
- rm -f $(DESTDIR)/usr/bin/{ex,view,rvim,rview,vimdiff}
- rm -f $(DESTDIR)/usr/share/man/man1/{ex,view,rvim,rview}.1
+ # rm stuff handled by alternatives
+ rm -f $(DESTDIR)/usr/bin/{ex,view}
+ @for f in `find $(DESTDIR)/usr/share/man -name view.1 -o -name ex.1`; do \
+ rm -f $$f; \
+ done
# rm C part of maze (no longer working)
rm -f $(DESTDIR)/usr/share/vim/vimcurrent/macros/maze/{*.c,Makefile}
# fix for CAN-2005-0069
rm -f $(DESTDIR)/usr/share/vim/vimcurrent/tools/vimspell.*
# helpztags manpage
- pod2man -c "User Commands" -s 1 -q none -r "vim 6.4" \
+ pod2man -c "User Commands" -s 1 -q none -r "vim 7.0aa" \
-d "September 2003" debian/helpztags debian/helpztags.1
# variant-related installations for package "vim"
@@ -303,15 +351,74 @@
-e "s:@COMMON@:vim-common:" \
debian/vim-variant.$$x > debian/vim.$$x ;\
done
- sed -e "s:@PKG@:vim:;s:@VARIANT@:basic:;s:@DESTDIR@:debian/tmp/usr/bin:" \
+ for L in $(LANGS); do \
+ sed -e "s:\(.*\)@LANG_ALTS@:\1--slave \$$mandir/$$L/man1/\$$i.1.gz \$$i.$$L.1.gz \$$mandir/$$L/man1/vim.1.gz \\\\\n&:" \
+ -i debian/vim.postinst; \
+ done
+ sed -i "/@LANG_ALTS@/d" debian/vim.postinst
+ sed -e "s:@PKG@:vim:;s:@VARIANT@:basic:" \
debian/lintian/vim-variant > debian/lintian/vim
+
+ # Generate language-specific sections of
+ # vim-{runtime,common,gui-common}.install files
+ cp debian/vim-runtime.install{.in,}
+ @for L in $(LANGS); do \
+ echo debian/tmp/usr/share/man/$$L/man1/vimtutor.1 \
+ usr/share/man/$$L/man1/ >>debian/vim-runtime.install; \
+ done
+
+ cp debian/vim-common.install{.in,}
+ @for L in $(LANGS); do \
+ echo debian/tmp/usr/share/man/$$L/man1/\* \
+ usr/share/man/$$L/man1/ >>debian/vim-common.install; \
+ done
+
+ cp debian/vim-gui-common.install{.in,}
+ @for L in $(LANGS); do \
+ echo debian/tmp/usr/share/man/$$L/man1/evim.1 \
+ usr/share/man/$$L/man1/ >>debian/vim-gui-common.install; \
+ done
dh_installman
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
+ # adjust things for vim-gui-common
+ cp debian/vim-common/usr/share/man/man1/vim.1 \
+ debian/vim-gui-common/usr/share/man/man1/gvim.1
+ cp debian/vim-common/usr/share/man/man1/vimdiff.1 \
+ debian/vim-gui-common/usr/share/man/man1/gvimdiff.1
+ rm -f debian/vim-common/usr/share/man/man1/evim.1
+ @for L in $(LANGS); do \
+ cp debian/vim-common/usr/share/man/$$L/man1/vim.1 \
+ debian/vim-gui-common/usr/share/man/$$L/man1/gvim.1; \
+ cp debian/vim-common/usr/share/man/$$L/man1/vimdiff.1 \
+ debian/vim-gui-common/usr/share/man/$$L/man1/gvimdiff.1; \
+ rm -f debian/vim-common/usr/share/man/$$L/man1/evim.1; \
+ done
+ # remove things that are in vim-runtime
+ rm -f debian/vim-common/usr/share/man/man1/vimtutor.1
+ @for L in $(LANGS); do \
+ rm -f debian/vim-common/usr/share/man/$$L/man1/vimtutor.1; \
+ done
rmdir debian/vim-gui-common/usr/bin
+ # Generate language-specific sections of
+ # vim-{common,gui-common}.links files
+ cp debian/vim-common.links{.in,}
+ @for L in $(LANGS); do \
+ for p in rvim rview; do \
+ echo usr/share/man/$$L/man1/vim.1 \
+ usr/share/man/$$L/man1/$$p.1 >>debian/vim-common.links; \
+ done; \
+ done
+
+ cp debian/vim-gui-common.links{.in,}
+ @for L in $(LANGS); do \
+ for p in gview rgvim rgview; do \
+ echo usr/share/man/$$L/man1/gvim.1 \
+ usr/share/man/$$L/man1/$$p.1 >>debian/vim-gui-common.links; \
+ done; \
+ echo usr/share/man/$$L/man1/evim.1 \
+ usr/share/man/$$L/man1/eview.1 >>debian/vim-gui-common.links; \
+ done
dh_link
# all excepts vim
@@ -337,17 +444,21 @@
for x in $(PER_VARIANT_FILES) ; do \
if [ "$*" = "vim-tiny" ]; then \
sed -e "s:@PKG@:$*:" -e "s:@VARIANT@:$(patsubst vim-%,%,$*):" \
- -e "s:@DESTDIR@:$(VIMCUR)/src:" -e "s:@COMMON@:vim-common:" \
+ -e "s:@DESTDIR@:$(SRCDIR)/src:" -e "s:@COMMON@:vim-common:" \
debian/vim-variant.$$x > debian/$*.$$x ;\
else \
sed -e "s:@PKG@:$*:" -e "s:@VARIANT@:$(patsubst vim-%,%,$*):" \
- -e "s:@DESTDIR@:$(VIMCUR)/src:" -e "s:@COMMON@:vim-gui-common:" \
+ -e "s:@DESTDIR@:$(SRCDIR)/src:" -e "s:@COMMON@:vim-gui-common:" \
debian/vim-variant.$$x > debian/$*.$$x ;\
fi \
done
sed -e "s:@PKG@:$*:;s:@VARIANT@:$(patsubst vim-%,%,$*):" \
- -e "s:@DESTDIR@:$(VIMCUR)/src:" \
debian/lintian/vim-variant > debian/lintian/$*
+ for L in $(LANGS); do \
+ sed -e "s:\(.*\)@LANG_ALTS@:\1--slave \$$mandir/$$L/man1/\$$i.1.gz \$$i.$$L.1.gz \$$mandir/$$L/man1/vim.1.gz \\\\\n&:" \
+ -i debian/$*.postinst; \
+ done
+ sed -i "/@LANG_ALTS@/d" debian/$*.postinst
# fake help installation for vim-tiny
if [ "$*" = "vim-tiny" ]; then \
echo "debian/tiny/doc/ usr/share/vim/" >> debian/$*.install; \
@@ -415,3 +526,5 @@
@echo "*** DEBIAN *** SKIPPING VARIANTS: $(VARIANTS_SKIP)"
endlog:
@echo "*** DEBIAN *** BUILD COMPLETED"
+
+# vim: set foldmethod=marker:
Added: trunk/packages/vim/debian/runtime/debian.vim
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/runtime/debian.vim?rev=647&op=file
==============================================================================
--- trunk/packages/vim/debian/runtime/debian.vim (added)
+++ trunk/packages/vim/debian/runtime/debian.vim Tue May 9 12:41:18 2006
@@ -1,0 +1,65 @@
+
+" Debian system-wide default configuration Vim
+
+set runtimepath=~/.vim,/usr/share/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/vimcurrent,/usr/share/vim/vimfiles/after,/usr/share/vim/addons/after,~/.vim/after
+
+" Normally we use vim-extensions. If you want true vi-compatibility
+" remove change the following statements
+set nocompatible " Use Vim defaults instead of 100% vi compatibility
+set backspace=indent,eol,start " more powerful backspacing
+
+" Now we set some defaults for the editor
+set autoindent " always set autoindenting on
+" set linebreak " Don't wrap words by default
+set textwidth=0 " Don't wrap lines by default
+set viminfo='20,\"50 " read/write a .viminfo file, don't store more than
+ " 50 lines of registers
+set history=50 " keep 50 lines of command line history
+set ruler " show the cursor position all the time
+
+" Suffixes that get lower priority when doing tab completion for filenames.
+" These are files we are not likely to want to edit or read.
+set suffixes=.bak,~,.swp,.o,.info,.aux,.log,.dvi,.bbl,.blg,.brf,.cb,.ind,.idx,.ilg,.inx,.out,.toc
+
+" We know xterm-debian is a color terminal
+if &term =~ "xterm-debian" || &term =~ "xterm-xfree86"
+ set t_Co=16
+ set t_Sf=[3%dm
+ set t_Sb=[4%dm
+endif
+
+if has("autocmd")
+ " Enabled file type detection
+ " Use the default filetype settings. If you also want to load indent files
+ " to automatically do language-dependent indenting add 'indent' as well.
+ filetype plugin on
+
+endif " has ("autocmd")
+
+" Some Debian-specific things
+if has("autocmd")
+ augroup filetype
+ au BufRead reportbug.* set ft=mail
+ au BufRead reportbug-* set ft=mail
+ augroup END
+endif
+
+" Set paper size from /etc/papersize if available (Debian-specific)
+if filereadable("/etc/papersize")
+ try
+ let s:shellbak = &shell
+ let &shell="/bin/sh"
+ let s:papersize = matchstr(system("cat /etc/papersize"), "\\p*")
+ let &shell=s:shellbak
+ if strlen(s:papersize)
+ let &printoptions = "paper:" . s:papersize
+ endif
+ catch /^Vim\%((\a\+)\)\=:E145/
+ endtry
+endif
+
+if has('gui_running')
+ " Make shift-insert work like in Xterm
+ map <S-Insert> <MiddleMouse>
+ map! <S-Insert> <MiddleMouse>
+endif
Modified: trunk/packages/vim/debian/runtime/gvimrc
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/runtime/gvimrc?rev=647&op=diff
==============================================================================
--- trunk/packages/vim/debian/runtime/gvimrc (original)
+++ trunk/packages/vim/debian/runtime/gvimrc Tue May 9 12:41:18 2006
@@ -1,29 +1,9 @@
-" Configuration file for gvim
-" Written for Debian GNU/Linux by W.Akkerman <wakkerma at debian.org>
-
" Make external commands work through a pipe instead of a pseudo-tty
"set noguipty
-" Switch syntax highlighting on, when the terminal has colors
-" Make shift-insert work like in Xterm
-map <S-Insert> <MiddleMouse>
-map! <S-Insert> <MiddleMouse>
-
-" Also switch on highlighting the last used search pattern.
-if has("syntax") && (&t_Co > 2 || has("gui_running"))
- syntax on
- set hlsearch
-endif
-
-" Extensions by i18n teams
-if filereadable( "/etc/vim/langrc/" . $LANG . ".vim" )
- exe "so " . "/etc/vim/langrc/" . $LANG . ".vim"
-endif
-
-" You can also specify a different font, overriding the default font and the
-" one from the hooks above:
-" set guifont=-misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-1
-
-if filereadable("/etc/vim/gvimrc.local")
- source /etc/vim/gvimrc.local
-endif
+" You can also specify a different font, overriding the default font
+"if has('gui_gtk2')
+" set guifont=Bitstream\ Vera\ Sans\ Mono\ 12
+"else
+" set guifont=-misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-1
+"endif
Modified: trunk/packages/vim/debian/runtime/vimrc
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/runtime/vimrc?rev=647&op=diff
==============================================================================
--- trunk/packages/vim/debian/runtime/vimrc (original)
+++ trunk/packages/vim/debian/runtime/vimrc Tue May 9 12:41:18 2006
@@ -1,85 +1,50 @@
-" Configuration file for vim
-set runtimepath=~/.vim,/usr/share/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/vimcurrent,/usr/share/vim/vimfiles/after,/usr/share/vim/addons/after,~/.vim/after
+" All system-wide defaults are set in $VIMRUNTIME/debian.vim (usually just
+" /usr/share/vim/vimcurrent/debian.vim) and sourced by the call to :runtime
+" you can find below. If you wish to change any of those settings, you should
+" do it in this file (/etc/vim/vimrc), since debian.vim will be overwritten
+" everytime an upgrade of the vim packages is performed. It is recommended to
+" make changes after sourcing debian.vim since it alters the value of the
+" 'compatible' option.
-" Normally we use vim-extensions. If you want true vi-compatibility
-" remove change the following statements
-set nocompatible " Use Vim defaults instead of 100% vi compatibility
-set backspace=indent,eol,start " more powerful backspacing
+" This line should not be removed as it ensures that various options are
+" properly set to work with the Vim-related packages available in Debian.
+runtime! debian.vim
-" Now we set some defaults for the editor
-set autoindent " always set autoindenting on
-" set linebreak " Don't wrap words by default
-set textwidth=0 " Don't wrap lines by default
-set viminfo='20,\"50 " read/write a .viminfo file, don't store more than
- " 50 lines of registers
-set history=50 " keep 50 lines of command line history
-set ruler " show the cursor position all the time
-
-" Suffixes that get lower priority when doing tab completion for filenames.
-" These are files we are not likely to want to edit or read.
-set suffixes=.bak,~,.swp,.o,.info,.aux,.log,.dvi,.bbl,.blg,.brf,.cb,.ind,.idx,.ilg,.inx,.out,.toc
-
-" We know xterm-debian is a color terminal
-if &term =~ "xterm-debian" || &term =~ "xterm-xfree86"
- set t_Co=16
- set t_Sf=[3%dm
- set t_Sb=[4%dm
-endif
+" Uncomment the next line to make Vim more Vi-compatible
+" NOTE: debian.vim sets 'nocompatible'. Setting 'compatible' changes numerous
+" options, so any other options should be set AFTER setting 'compatible'.
+"set compatible
" Vim5 and later versions support syntax highlighting. Uncommenting the next
" line enables syntax highlighting by default.
-" syntax on
+"syntax on
" If using a dark background within the editing area and syntax highlighting
" turn on this option as well
-" set background=dark
-
-if has("autocmd")
- " Enabled file type detection
- " Use the default filetype settings. If you also want to load indent files
- " to automatically do language-dependent indenting add 'indent' as well.
- filetype plugin on
-
-endif " has ("autocmd")
-
-" Some Debian-specific things
-if has("autocmd")
- augroup filetype
- au BufRead reportbug.* set ft=mail
- au BufRead reportbug-* set ft=mail
- augroup END
-endif
+"set background=dark
" Uncomment the following to have Vim jump to the last position when
" reopening a file
-" if has("autocmd")
-" au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$")
-" \| exe "normal g'\"" | endif
-" endif
+"if has("autocmd")
+" au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$")
+" \| exe "normal g'\"" | endif
+"endif
-" Set paper size from /etc/papersize if available (Debian-specific)
-if filereadable("/etc/papersize")
- try
- let s:shellbak = &shell
- let &shell="/bin/sh"
- let s:papersize = matchstr(system("cat /etc/papersize"), "\\p*")
- let &shell=s:shellbak
- if strlen(s:papersize)
- let &printoptions = "paper:" . s:papersize
- endif
- catch /^Vim\%((\a\+)\)\=:E145/
- endtry
-endif
+" Uncomment the following to have Vim load indentation rules according to the
+" detected filetype. Per default Debian Vim only load filetype specific
+" plugins.
+"if has("autocmd")
+" filetype indent on
+"endif
" The following are commented out as they cause vim to behave a lot
-" different from regular vi. They are highly recommended though.
+" differently from regular Vi. They are highly recommended though.
"set showcmd " Show (partial) command in status line.
"set showmatch " Show matching brackets.
"set ignorecase " Do case insensitive matching
+"set smartcase " Do smart case matching
"set incsearch " Incremental search
"set autowrite " Automatically save before commands like :next and :make
+"set hidden " Hide buffers when they are abandoned
+"set mouse=a " Enable mouse usage (all modes) in terminals
-" Source a global configuration file if available
-if filereadable("/etc/vim/vimrc.local")
- source /etc/vim/vimrc.local
-endif
Modified: trunk/packages/vim/debian/tiny/features.txt
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/tiny/features.txt?rev=647&op=diff
==============================================================================
--- trunk/packages/vim/debian/tiny/features.txt (original)
+++ trunk/packages/vim/debian/tiny/features.txt Tue May 9 12:41:18 2006
@@ -28,15 +28,19 @@
FEAT_DIFF N *+diff* |vimdiff| and 'diff'
FEAT_DIGRAPHS N *+digraphs* |digraphs| *E196*
FEAT_EVAL N *+eval* expression evaluation |eval.txt|
+FEAT_EX_EXTRA N *+ex_extra* Vim's extra Ex commands: |:center|, |:left|,
FEAT_SEARCH_EXTRA N *+extra_search* |'hlsearch'| and |'incsearch'| options.
FEAT_SEARCHPATH N *+file_in_path* |gf|, |CTRL-W_f| and |<cfile>|
+FEAT_FOLDING N *+folding* |folding|
FEAT_INS_EXPAND N *+insert_expand* |insert_expand| Insert mode completion
FEAT_LISTCMDS N *+listcmds* Vim commands for the list of buffers |buffer-hidden|
FEAT_QUICKFIX N *+quickfix* |:make| and |quickfix| commands
FEAT_SCROLLBIND N *+scrollbind* |'scrollbind'|
FEAT_SMARTINDENT N *+smartindent* |'smartindent'|
+FEAT_TEXTOBJ N *+textobjects* |text-objects| selection
+FEAT_USR_CMDS N *+user_commands* User-defined commands. |user-commands|
+FEAT_VERTSPLIT N *+vertsplit* Vertically split windows |:vsplit|
FEAT_VIMINFO N *+viminfo* |'viminfo'|
-FEAT_VERTSPLIT N *+vertsplit* Vertically split windows |:vsplit|
FEAT_VISUALEXTRA N *+visualextra* extra Visual mode commands |blockwise-operators|
If we do not want vimdiff in vim-tiny, we can remove from above: _AUTOCMD,
@@ -44,49 +48,69 @@
All remaining features from the "normal" features subset.
- N *+browse* |:browse| command
- N *+builtin_terms* some terminals builtin |builtin-terms|
-no FEAT_CINDENT N *+cindent* |'cindent'|, C indenting
- N *+clientserver* Unix and Win32: Remote invocation |clientserver|
- N *+cryptv* encryption support |encryption|
- N *+dialog_gui* Support for |:confirm| with GUI dialog.
- N *+dialog_con* Support for |:confirm| with console dialog.
- N *+dialog_con_gui* Support for |:confirm| with GUI and console dialog.
- N *+ex_extra* Vim's extra Ex commands: |:center|, |:left|,
-no FEAT_FIND_ID N *+find_in_path* include file searches: |[I|, |:isearch|,
- N *+folding* |folding|
- N *+gettext* message translations |multi-lang|
- N *+jumplist* |jumplist|
- N *+libcall* |libcall()|
- N *+linebreak* |'linebreak'|, |'breakat'| and |'showbreak'|
- N *+lispindent* |'lisp'|
- N *+localmap* Support for mappings local to a buffer |:map-local|
- N *+menu* |:menu|
- N *+mksession* |:mksession|
- N *+modify_fname* |filename-modifiers|
- N *+mouse* Mouse handling |mouse-using|
- N *+mouseshape* |'mouseshape'|
- N *+mouse_gpm* Unix only: Linux console mouse handling |gpm-mouse|
- N *+mouse_pterm* QNX only: pterm mouse handling |qnx-terminal|
- N *+mouse_xterm* Unix only: xterm mouse handling |xterm-mouse|
- N *+multi_lang* non-English language support |multi-lang|
-no FEAT_PATH_EXTRA N *+path_extra* Up/downwards search in 'path' and 'tags'
- N *+printer* |:hardcopy| command
- N *+statusline* Options 'statusline', 'rulerformat' and special
- N *+syntax* Syntax highlighting |syntax|
- N *+tag_binary* binary searching in tags file |tag-binary-search|
- N *+tag_old_static* old method for static tags |tag-old-static|
- N *+termresponse* support for |t_RV| and |v:termresponse|
-no FEAT_TEXTOBJ N *+textobjects* |text-objects| selection
- N *+title* Setting the window title |'title'|
- N *+toolbar* |gui-toolbar|
- N *+user_commands* User-defined commands. |user-commands|
- N *+virtualedit* |'virtualedit'|
- N *+vreplace* |gR| and |gr|
- N *+wildignore* |'wildignore'|
- N *+wildmenu* |'wildmenu'|
- N *+xterm_clipboard* Unix only: xterm clipboard handling
- N *+X11* Unix only: can restore window title |X11|
+ N *+autocmd* |:autocmd|, automatic commands
+ N *+browse* |:browse| command
+ N *+builtin_terms* some terminals builtin |builtin-terms|
+ N *+byte_offset* support for 'o' flag in 'statusline' option, "go"
+ N *+cindent* |'cindent'|, C indenting
+ N *+clientserver* Unix and Win32: Remote invocation |clientserver|
+ N *+cmdline_compl* command line completion |cmdline-completion|
+ N *+cmdline_hist* command line history |cmdline-history|
+ N *+cmdline_info* |'showcmd'| and |'ruler'|
+ N *+comments* |'comments'| support
+ N *+cryptv* encryption support |encryption|
+ N *+dialog_gui* Support for |:confirm| with GUI dialog.
+ N *+dialog_con* Support for |:confirm| with console dialog.
+ N *+dialog_con_gui* Support for |:confirm| with GUI and console dialog.
+ N *+diff* |vimdiff| and 'diff'
+ N *+digraphs* |digraphs| *E196*
+ N *+eval* expression evaluation |eval.txt|
+ N *+ex_extra* Vim's extra Ex commands: |:center|, |:left|,
+ N *+extra_search* |'hlsearch'| and |'incsearch'| options.
+ N *+file_in_path* |gf|, |CTRL-W_f| and |<cfile>|
+ N *+find_in_path* include file searches: |[I|, |:isearch|,
+ N *+folding* |folding|
+ N *+gettext* message translations |multi-lang|
+ N *+insert_expand* |insert_expand| Insert mode completion
+ N *+jumplist* |jumplist|
+ N *+libcall* |libcall()|
+ N *+linebreak* |'linebreak'|, |'breakat'| and |'showbreak'|
+ N *+lispindent* |'lisp'|
+ N *+listcmds* Vim commands for the list of buffers |buffer-hidden|
+ N *+localmap* Support for mappings local to a buffer |:map-local|
+ N *+menu* |:menu|
+ N *+mksession* |:mksession|
+ N *+modify_fname* |filename-modifiers|
+ N *+mouse* Mouse handling |mouse-using|
+ N *+mouseshape* |'mouseshape'|
+ N *+mouse_gpm* Unix only: Linux console mouse handling |gpm-mouse|
+ N *+mouse_pterm* QNX only: pterm mouse handling |qnx-terminal|
+ N *+mouse_xterm* Unix only: xterm mouse handling |xterm-mouse|
+ N *+multi_lang* non-English language support |multi-lang|
+ N *+path_extra* Up/downwards search in 'path' and 'tags'
+ N *+printer* |:hardcopy| command
+ N *+quickfix* |:make| and |quickfix| commands
+ N *+reltime* |reltime()| function
+ N *+scrollbind* |'scrollbind'|
+ N *+smartindent* |'smartindent'|
+ N *+statusline* Options 'statusline', 'rulerformat' and special
+ N *+syntax* Syntax highlighting |syntax|
+ N *+tag_binary* binary searching in tags file |tag-binary-search|
+ N *+tag_old_static* old method for static tags |tag-old-static|
+ N *+termresponse* support for |t_RV| and |v:termresponse|
+ N *+textobjects* |text-objects| selection
+ N *+title* Setting the window title |'title'|
+ N *+toolbar* |gui-toolbar|
+ N *+user_commands* User-defined commands. |user-commands|
+ N *+viminfo* |'viminfo'|
+ N *+vertsplit* Vertically split windows |:vsplit|
+ N *+virtualedit* |'virtualedit'|
+ N *+visualextra* extra Visual mode commands |blockwise-operators|
+ N *+vreplace* |gR| and |gr|
+ N *+wildignore* |'wildignore'|
+ N *+wildmenu* |'wildmenu'|
+ N *+xterm_clipboard* Unix only: xterm clipboard handling
+ N *+X11* Unix only: can restore window title |X11|
- -- Stefano Zacchiroli <zack at debian.org> Tue, 01 Nov 2005 10:38:59 +0100
+ -- James Vega <jamessan at debian.org> Tue, 09 May 2006 00:16:37 -0400
Added: trunk/packages/vim/debian/vim-common.install.in
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/vim-common.install.in?rev=647&op=file
==============================================================================
--- trunk/packages/vim/debian/vim-common.install.in (added)
+++ trunk/packages/vim/debian/vim-common.install.in Tue May 9 12:41:18 2006
@@ -1,0 +1,6 @@
+debian/tmp/usr/bin/xxd usr/bin/
+debian/helpztags usr/bin/
+debian/runtime/vimrc etc/vim/
+debian/runtime/debian.vim usr/share/vim/vimcurrent/
+debian/vim.presubj usr/share/bug/vim/
+debian/tmp/usr/share/man/man1/* usr/share/man/man1/
Added: trunk/packages/vim/debian/vim-common.links.in
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/vim-common.links.in?rev=647&op=file
==============================================================================
--- trunk/packages/vim/debian/vim-common.links.in (added)
+++ trunk/packages/vim/debian/vim-common.links.in Tue May 9 12:41:18 2006
@@ -1,0 +1,35 @@
+etc/vim usr/share/vim/vimfiles
+etc/vim/vimrc usr/share/vim/vimrc
+
+usr/share/man/man1/vim.1 usr/share/man/man1/rvim.1
+usr/share/man/man1/vim.1 usr/share/man/man1/rview.1
+
+usr/share/man/fr/man1/vim.1 usr/share/man/fr/man1/rvim.1
+usr/share/man/fr/man1/vim.1 usr/share/man/fr/man1/rview.1
+
+usr/share/man/fr.ISO8859-1/man1/vim.1 usr/share/man/fr.ISO8859-1/man1/rvim.1
+usr/share/man/fr.ISO8859-1/man1/vim.1 usr/share/man/fr.ISO8859-1/man1/rview.1
+
+usr/share/man/fr.UTF-8/man1/vim.1 usr/share/man/fr.UTF-8/man1/rvim.1
+usr/share/man/fr.UTF-8/man1/vim.1 usr/share/man/fr.UTF-8/man1/rview.1
+
+usr/share/man/it/man1/vim.1 usr/share/man/it/man1/rvim.1
+usr/share/man/it/man1/vim.1 usr/share/man/it/man1/rview.1
+
+usr/share/man/it.ISO8859-1/man1/vim.1 usr/share/man/it.ISO8859-1/man1/rvim.1
+usr/share/man/it.ISO8859-1/man1/vim.1 usr/share/man/it.ISO8859-1/man1/rview.1
+
+usr/share/man/it.UTF-8/man1/vim.1 usr/share/man/it.UTF-8/man1/rvim.1
+usr/share/man/it.UTF-8/man1/vim.1 usr/share/man/it.UTF-8/man1/rview.1
+
+usr/share/man/pl.ISO8859-2/man1/vim.1 usr/share/man/pl.ISO8859-2/man1/rvim.1
+usr/share/man/pl.ISO8859-2/man1/vim.1 usr/share/man/pl.ISO8859-2/man1/rview.1
+
+usr/share/man/pl.UTF-8/man1/vim.1 usr/share/man/pl.UTF-8/man1/rvim.1
+usr/share/man/pl.UTF-8/man1/vim.1 usr/share/man/pl.UTF-8/man1/rview.1
+
+usr/share/man/ru.KOI8-R/man1/vim.1 usr/share/man/ru.KOI8-R/man1/rvim.1
+usr/share/man/ru.KOI8-R/man1/vim.1 usr/share/man/ru.KOI8-R/man1/rview.1
+
+usr/share/man/ru.UTF-8/man1/vim.1 usr/share/man/ru.UTF-8/man1/rvim.1
+usr/share/man/ru.UTF-8/man1/vim.1 usr/share/man/ru.UTF-8/man1/rview.1
Modified: trunk/packages/vim/debian/vim-doc.install
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/vim-doc.install?rev=647&op=diff
==============================================================================
--- trunk/packages/vim/debian/vim-doc.install (original)
+++ trunk/packages/vim/debian/vim-doc.install Tue May 9 12:41:18 2006
@@ -1,3 +1,3 @@
-vim64/runtime/doc/*.html usr/share/doc/vim-common/html/
+vim/runtime/doc/*.html usr/share/doc/vim-common/html/
debian/vim-policy.txt usr/share/doc/vim-common/
debian/FAQ usr/share/doc/vim-common/
Added: trunk/packages/vim/debian/vim-gui-common.install.in
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/vim-gui-common.install.in?rev=647&op=file
==============================================================================
--- trunk/packages/vim/debian/vim-gui-common.install.in (added)
+++ trunk/packages/vim/debian/vim-gui-common.install.in Tue May 9 12:41:18 2006
@@ -1,0 +1,4 @@
+debian/gvim.desktop usr/share/applications/
+debian/icons/* usr/share/pixmaps/
+debian/runtime/gvimrc etc/vim/
+debian/tmp/usr/share/man/man1/evim.1 usr/share/man/man1/
Added: trunk/packages/vim/debian/vim-gui-common.links.in
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/vim-gui-common.links.in?rev=647&op=file
==============================================================================
--- trunk/packages/vim/debian/vim-gui-common.links.in (added)
+++ trunk/packages/vim/debian/vim-gui-common.links.in Tue May 9 12:41:18 2006
@@ -1,0 +1,6 @@
+etc/vim/gvimrc usr/share/vim/gvimrc
+usr/share/doc/vim-common usr/share/doc/vim-gui-common
+usr/share/man/man1/gvim.1 usr/share/man/man1/gview.1
+usr/share/man/man1/gvim.1 usr/share/man/man1/rgvim.1
+usr/share/man/man1/gvim.1 usr/share/man/man1/rgview.1
+usr/share/man/man1/evim.1 usr/share/man/man1/eview.1
Modified: trunk/packages/vim/debian/vim-runtime.dirs
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/vim-runtime.dirs?rev=647&op=diff
==============================================================================
--- trunk/packages/vim/debian/vim-runtime.dirs (original)
+++ trunk/packages/vim/debian/vim-runtime.dirs Tue May 9 12:41:18 2006
@@ -1,3 +1,2 @@
/usr/bin/
-/usr/share/man/man1/
/usr/share/consolefonts/
Added: trunk/packages/vim/debian/vim-runtime.install.in
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/vim-runtime.install.in?rev=647&op=file
==============================================================================
--- trunk/packages/vim/debian/vim-runtime.install.in (added)
+++ trunk/packages/vim/debian/vim-runtime.install.in Tue May 9 12:41:18 2006
@@ -1,0 +1,5 @@
+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/
+debian/tmp/usr/share/man/man1/vimtutor.1 usr/share/man/man1/
Modified: trunk/packages/vim/debian/vim-variant.install
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/vim-variant.install?rev=647&op=diff
==============================================================================
--- trunk/packages/vim/debian/vim-variant.install (original)
+++ trunk/packages/vim/debian/vim-variant.install Tue May 9 12:41:18 2006
@@ -1,2 +1,2 @@
-debian/lintian/@PKG@ usr/share/lintian/overrides/
- at DESTDIR@/vim. at VARIANT@ usr/bin/
+debian/lintian/@PKG@ usr/share/lintian/overrides/
+ at DESTDIR@/vim. at VARIANT@ usr/bin/
Modified: trunk/packages/vim/debian/vim-variant.postinst
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/vim-variant.postinst?rev=647&op=diff
==============================================================================
--- trunk/packages/vim/debian/vim-variant.postinst (original)
+++ trunk/packages/vim/debian/vim-variant.postinst Tue May 9 12:41:18 2006
@@ -2,7 +2,7 @@
pkg=@PKG@
variant=@VARIANT@
-mandir=/usr/share/man/man1
+mandir=/usr/share/man
# two things to do:
# 1) add /usr/bin/vim.variant as alternative for /usr/bin/vim. Priority are
@@ -27,11 +27,17 @@
add_variant_alternative () {
update-alternatives --install /usr/bin/vim vim /usr/bin/vim.$variant $1
- update-alternatives --install /usr/bin/vimdiff vimdiff /usr/bin/vim $1
- for i in vi view ex editor rvim rview ; do
+ update-alternatives --install /usr/bin/vimdiff vimdiff /usr/bin/vim.$variant $1
+ update-alternatives --install /usr/bin/rvim rvim /usr/bin/vim.$variant $1
+ update-alternatives --install /usr/bin/rview rview /usr/bin/vim.$variant $1
+ # Since other packages provide these commands, we'll setup alternatives for
+ # their manpages, too.
+ for i in vi view ex editor ; do
update-alternatives \
- --install /usr/bin/$i $i /usr/bin/vim $1 \
- --slave $mandir/$i.1.gz $i.1.gz $mandir/vim.1.gz
+ --install /usr/bin/$i $i /usr/bin/vim.$variant $1 \
+ @LANG_ALTS@
+ --slave $mandir/man1/$i.1.gz $i.1.gz \
+ $mandir/man1/vim.1.gz
done
case "$variant" in
gtk|lesstif|perl|python|ruby|tcl|gnome|full) # gui enabled variants
@@ -41,20 +47,9 @@
}
add_gui_variant_alternative () {
- update-alternatives --install /usr/bin/gvim gvim /usr/bin/vim.$variant $1
- for i in gview rgview rgvim ; do
- update-alternatives \
- --install /usr/bin/$i $i /usr/bin/gvim $1 \
- --slave $mandir/$i.1.gz $i.1.gz $mandir/vim.1.gz
+ for i in gvim gview rgview rgvim evim eview gvimdiff ; do
+ update-alternatives --install /usr/bin/$i $i /usr/bin/vim.$variant $1
done
- # Handle evim/eview and gvimdiff separately since they have different man
- # pages
- for i in evim gvimdiff ; do
- update-alternatives \
- --install /usr/bin/$i $i /usr/bin/gvim $1
- done
- update-alternatives --install /usr/bin/eview eview /usr/bin/gvim $1 \
- --slave $mandir/eview.1.gz eview.1.gz $mandir/evim.1.gz
}
replace_dir_w_symlink () {
Modified: trunk/packages/vim/debian/vim-variant.prerm
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/vim-variant.prerm?rev=647&op=diff
==============================================================================
--- trunk/packages/vim/debian/vim-variant.prerm (original)
+++ trunk/packages/vim/debian/vim-variant.prerm Tue May 9 12:41:18 2006
@@ -19,10 +19,9 @@
}
remove_variant_alternative () {
- for i in vi view ex editor rvim rview vimdiff ; do
- update-alternatives --remove $i /usr/bin/vim
+ for i in vi view ex editor rvim rview vimdiff vim; do
+ update-alternatives --remove $i /usr/bin/vim.$variant
done
- update-alternatives --remove vim /usr/bin/vim.$variant
case "$variant" in
gtk|lesstif|perl|python|ruby|tcl|gnome|full) # gui enabled variants
remove_gui_variant_alternative
@@ -31,10 +30,9 @@
}
remove_gui_variant_alternative () {
- for i in eview evim gview gvimdiff rgview rgvim ; do
- update-alternatives --remove $i /usr/bin/gvim
+ for i in eview evim gview gvimdiff rgview rgvim gvim; do
+ update-alternatives --remove $i /usr/bin/vim.$variant
done
- update-alternatives --remove gvim /usr/bin/vim.$variant
}
case "$1" in
Added: trunk/packages/vim/patches/pushed-upstream.txt
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/pushed-upstream.txt?rev=647&op=file
==============================================================================
--- trunk/packages/vim/patches/pushed-upstream.txt (added)
+++ trunk/packages/vim/patches/pushed-upstream.txt Tue May 9 12:41:18 2006
@@ -1,0 +1,3 @@
+
+Documenting the attempt of pushing patches upstream.
+
Modified: trunk/packages/vim/patches/series
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/series?rev=647&op=diff
==============================================================================
--- trunk/packages/vim/patches/series (original)
+++ trunk/packages/vim/patches/series Tue May 9 12:41:18 2006
@@ -1,60 +1,1 @@
-101_make.vim.diff -p0
-102_filetype.vim.diff -p0
-103_sh.vim.diff -p0
-104_debchangelog.vim.diff -p0
-105_recognize-gnumakefile-am.diff -p0
-105_tutor.vim.diff -p0
-105_xmodmap.vim.diff -p0
-106_fstab.vim.diff -p0
-107_vim.1.diff -p0
-107_xxd.1.diff -p0
-108_automake.vim.diff -p0
109_xdefaults.vim.diff -p0
-111_fstab.vim.diff -p0
-117_fortran.vim.diff -p0
-119_php.vim.diff -p0
-122_html_indent.vim.diff -p0
-123_accents.diff -p0
-124_errorformat.vim.diff -p0
-125_gzip.vim.diff -p0
-127_scripts.vim.diff -p0
-129_filetype.vim.diff -p0
-130_fstab.vim.diff -p0
-131_xxd.1.diff -p0
-133_filetype.vim.diff -p0
-133_resolv.vim.diff -p0
-134_sshconfig.vim.diff -p0
-135_debsources.vim.diff -p0
-136_muttrc.vim.diff -p0
-137_filetype.vim.diff -p0
-138_filetype.txt.diff -p0
-140_muttrc.vim.diff -p0
-141_asterisk.vim.diff -p0
-142_filetype.vim.diff -p0
-144_scripts.vim.diff -p0
-145_fortran.vim.diff -p0
-146_netrw.vim.diff -p0
-147_perl.vim.diff -p0
-148_debchangelog.vim.diff -p0
-149_sshconfig.vim.diff -p0
-150_asterisk.vim.diff -p0
-151_sed.vim.diff -p0
-152_javascript.vim.diff -p0
-153_filetype.vim.diff -p0
-154_svn.vim.diff -p0
-155_rst.vim.diff -p0
-156_scripts.vim.diff -p0
-157_slrnrc.vim.diff -p0
-158_python.vim.diff -p0
-159_netrw.vim.diff -p0
-160_scripts.vim.diff -p0
-161_cmake-support.diff -p0
-162_css.vim.diff -p0
-201_fr.po.diff -p0
-203_zh_TW.UTF8.po.diff -p0
-301_xxd.c.diff -p0
-302_message.c.diff -p0
-303_option.c.diff -p0
-304_memline.c.diff -p0
-305_term.c.diff -p0
-402_doc_editing.txt.diff -p0
More information about the pkg-vim-maintainers
mailing list