r356 - in trunk/vim: debian debian/runtime upstream/patches
Norbert Tretkowski
nobse at costa.debian.org
Sat Oct 15 16:43:01 UTC 2005
Author: nobse
Date: 2005-10-15 16:42:59 +0000 (Sat, 15 Oct 2005)
New Revision: 356
Removed:
trunk/vim/upstream/patches/6.4b.001
trunk/vim/upstream/patches/6.4b.002
trunk/vim/upstream/patches/6.4b.003
trunk/vim/upstream/patches/6.4b.004
Modified:
trunk/vim/debian/changelog
trunk/vim/debian/rules
trunk/vim/debian/runtime/vimrc
trunk/vim/debian/vim.install
trunk/vim/debian/vim.links
Log:
New upstream release.
Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog 2005-10-14 20:38:40 UTC (rev 355)
+++ trunk/vim/debian/changelog 2005-10-15 16:42:59 UTC (rev 356)
@@ -1,9 +1,9 @@
-vim (1:6.3+6.4b-004+1) UNRELEASED; urgency=low
+vim (1:6.4-000+1) unstable; urgency=low
[ Debian VIM Maintainers ]
- * New upstream patch (004), see README.gz for details.
+ * New major upstream release (6.4).
- -- Debian VIM Maintainers <pkg-vim-maintainers at lists.alioth.debian.org> Fri, 14 Oct 2005 22:37:34 +0200
+ -- Debian VIM Maintainers <pkg-vim-maintainers at lists.alioth.debian.org> Sat, 15 Oct 2005 18:40:22 +0200
vim (1:6.3+6.4b-003+1) experimental; urgency=low
Modified: trunk/vim/debian/rules
===================================================================
--- trunk/vim/debian/rules 2005-10-14 20:38:40 UTC (rev 355)
+++ trunk/vim/debian/rules 2005-10-15 16:42:59 UTC (rev 356)
@@ -131,7 +131,7 @@
CFGFLAGS_vim-full=$(CFGFLAGS) $(OPTFLAGS) $(GUIFLAGS) $(GNOMEFLAGS) $(ALLINTERPFLAGS)
NAME=vim
-VERSION=6.4b
+VERSION=6.4
SOURCES+=$(NAME)-$(VERSION).tar.bz2
SOURCES+=$(NAME)-$(VERSION)-lang.tar.gz
SOURCES+=$(NAME)-$(VERSION)-extra.tar.gz
@@ -230,7 +230,7 @@
# install usr/share/bug/vim/presubj file
install -m 644 -D $(CURDIR)/debian/vim.presubj $(DESTDIR)/usr/share/bug/vim/presubj
# make less.sh executable
- chmod a+x $(DESTDIR)/usr/share/vim/vim64b/macros/less.sh
+ chmod a+x $(DESTDIR)/usr/share/vim/vim64/macros/less.sh
# remove things which are handled via alternatives
rm -f $(DESTDIR)/usr/bin/{view,ex}
rm -f $(DESTDIR)/usr/bin/[ce]tags
@@ -256,7 +256,7 @@
# cp debian/vim-install $(DESTDIR)/usr/bin
cp debian/helpztags $(DESTDIR)/usr/bin
# copying updated syntax files
- cp debian/updates/*.vim $(DESTDIR)/usr/share/vim/vim64b/syntax/
+ cp debian/updates/*.vim $(DESTDIR)/usr/share/vim/vim64/syntax/
touch $@
# the other variants only include the binary
@@ -297,15 +297,15 @@
binary-indep: DH_OPTIONS=-i
binary-indep: build install
- rm -f $(PWD)/debian/vim/usr/share/vim/vim64b/macros/maze/*.c
- rm -f $(PWD)/debian/vim/usr/share/vim/vim64b/macros/maze/Makefile
+ rm -f $(PWD)/debian/vim/usr/share/vim/vim64/macros/maze/*.c
+ rm -f $(PWD)/debian/vim/usr/share/vim/vim64/macros/maze/Makefile
mkdir -p $(PWD)/debian/vim/usr/share/consolefonts/
- cp -a $(PWD)/vim64b/farsi/fonts/UNIXs/far-a01.pcf.gz $(PWD)/debian/vim/usr/share/consolefonts/
+ cp -a $(PWD)/vim64/farsi/fonts/UNIXs/far-a01.pcf.gz $(PWD)/debian/vim/usr/share/consolefonts/
# gzip -9 $(PWD)/debian/vim/usr/share/doc/vim/README
# dh_movefiles --sourcedir=debian/vim
# fix for CAN-2005-0069
- rm -f $(CURDIR)/debian/vim-common/usr/share/vim/vim64b/tools/vimspell.*
- rm -f $(CURDIR)/debian/vim-common/usr/share/vim/vim64b/tools/tcltags
+ rm -f $(CURDIR)/debian/vim-common/usr/share/vim/vim64/tools/vimspell.*
+ rm -f $(CURDIR)/debian/vim-common/usr/share/vim/vim64/tools/tcltags
dh_testdir
dh_testroot
dh_compress
Modified: trunk/vim/debian/runtime/vimrc
===================================================================
--- trunk/vim/debian/runtime/vimrc 2005-10-14 20:38:40 UTC (rev 355)
+++ trunk/vim/debian/runtime/vimrc 2005-10-15 16:42:59 UTC (rev 356)
@@ -1,5 +1,5 @@
" Configuration file for vim
-set runtimepath=~/.vim,/etc/vim,/usr/share/vim/vimfiles,/usr/share/vim/addons,/usr/share/vim/vim64b,/usr/share/vim/vimfiles,/usr/share/vim/addons/after,~/.vim/after
+set runtimepath=~/.vim,/etc/vim,/usr/share/vim/vimfiles,/usr/share/vim/addons,/usr/share/vim/vim64,/usr/share/vim/vimfiles,/usr/share/vim/addons/after,~/.vim/after
" Normally we use vim-extensions. If you want true vi-compatibility
" remove change the following statements
Modified: trunk/vim/debian/vim.install
===================================================================
--- trunk/vim/debian/vim.install 2005-10-14 20:38:40 UTC (rev 355)
+++ trunk/vim/debian/vim.install 2005-10-15 16:42:59 UTC (rev 356)
@@ -1,5 +1,5 @@
debian/lintian/vim usr/share/lintian/overrides
debian/runtime/vimrc etc/vim
-vim64b/runtime/doc/*.html usr/share/doc/vim/html
-vim64b/runtime/vimrc_example.vim usr/share/vim/vim64b
+vim64/runtime/doc/*.html usr/share/doc/vim/html
+vim64/runtime/vimrc_example.vim usr/share/vim/vim64
debian/icons/vim.svg usr/share/pixmaps
Modified: trunk/vim/debian/vim.links
===================================================================
--- trunk/vim/debian/vim.links 2005-10-14 20:38:40 UTC (rev 355)
+++ trunk/vim/debian/vim.links 2005-10-15 16:42:59 UTC (rev 356)
@@ -1,3 +1,3 @@
-usr/share/vim/vim64b/doc/version6.txt usr/share/doc/vim/changelog
+usr/share/vim/vim64/doc/version6.txt usr/share/doc/vim/changelog
etc/vim/vimrc usr/share/vim/vimrc
etc/vim usr/share/vim/vimfiles
Deleted: trunk/vim/upstream/patches/6.4b.001
===================================================================
--- trunk/vim/upstream/patches/6.4b.001 2005-10-14 20:38:40 UTC (rev 355)
+++ trunk/vim/upstream/patches/6.4b.001 2005-10-15 16:42:59 UTC (rev 356)
@@ -1,45 +0,0 @@
-To: vim-dev at vim.org
-Subject: Patch 6.4b.001
-Fcc: outbox
-From: Bram Moolenaar <Bram at moolenaar.net>
-Mime-Version: 1.0
-Content-Type: text/plain; charset=ISO-8859-1
-Content-Transfer-Encoding: 8bit
-------------
-
-Patch 6.4b.001
-Problem: Vim reports "Vim 6.4a" in the ":version" output.
-Solution: Change "a" to "b". (Tony Mechelynck)
-Files: src/version.h
-
-
-*** ../vim-6.4b.000/src/version.h Mon Oct 10 14:14:11 2005
---- src/version.h Tue Oct 11 10:00:40 2005
-***************
-*** 37,40 ****
- #define VIM_VERSION_SHORT "6.4b"
- #define VIM_VERSION_MEDIUM "6.4b BETA"
- #define VIM_VERSION_LONG "VIM - Vi IMproved 6.4b BETA (2005 Oct 10)"
-! #define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 6.4a BETA (2005 Oct 10, compiled "
---- 37,40 ----
- #define VIM_VERSION_SHORT "6.4b"
- #define VIM_VERSION_MEDIUM "6.4b BETA"
- #define VIM_VERSION_LONG "VIM - Vi IMproved 6.4b BETA (2005 Oct 10)"
-! #define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 6.4b BETA (2005 Oct 10, compiled "
-*** ../vim-6.4b.000/src/version.c Mon Oct 10 14:15:50 2005
---- src/version.c Tue Oct 11 10:00:53 2005
-***************
-*** 643,644 ****
---- 643,646 ----
- { /* Add new patch number below this line */
-+ /**/
-+ 1,
- /**/
-
---
-Imagine a world without hypothetical situations.
-
- /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\
-/// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
-\\\ Project leader for A-A-P -- http://www.A-A-P.org ///
- \\\ Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html ///
Deleted: trunk/vim/upstream/patches/6.4b.002
===================================================================
--- trunk/vim/upstream/patches/6.4b.002 2005-10-14 20:38:40 UTC (rev 355)
+++ trunk/vim/upstream/patches/6.4b.002 2005-10-15 16:42:59 UTC (rev 356)
@@ -1,68 +0,0 @@
-To: vim-dev at vim.org
-Subject: Patch 6.4b.002
-Fcc: outbox
-From: Bram Moolenaar <Bram at moolenaar.net>
-Mime-Version: 1.0
-Content-Type: text/plain; charset=ISO-8859-1
-Content-Transfer-Encoding: 8bit
-------------
-
-Patch 6.4b.002
-Problem: In Insert mode, pasting a multi-byte character after the end of
- the line leaves the cursor just before that character.
-Solution: Make sure "gP" leaves the cursor in the right place when
- 'virtualedit' is set.
-Files: src/ops.c
-
-
-*** ../vim-6.4b.001/src/ops.c Sat Dec 11 16:11:42 2004
---- src/ops.c Wed Oct 12 20:51:39 2005
-***************
-*** 3619,3628 ****
- && curwin->w_cursor.col > 0
- && !(restart_edit || (State & INSERT)))
- {
- --curwin->w_cursor.col;
- #ifdef FEAT_VIRTUALEDIT
- if (ve_flags == VE_ALL)
-! ++curwin->w_cursor.coladd;
- #endif
- }
- }
---- 3619,3635 ----
- && curwin->w_cursor.col > 0
- && !(restart_edit || (State & INSERT)))
- {
-+ #ifdef FEAT_VIRTUALEDIT
-+ col = curwin->w_cursor.col;
-+ #endif
- --curwin->w_cursor.col;
-+ #ifdef FEAT_MBYTE
-+ if (has_mbyte)
-+ mb_adjust_cursor();
-+ #endif
- #ifdef FEAT_VIRTUALEDIT
- if (ve_flags == VE_ALL)
-! curwin->w_cursor.coladd = col - curwin->w_cursor.col;
- #endif
- }
- }
-*** ../vim-6.4b.001/src/version.c Tue Oct 11 10:05:39 2005
---- src/version.c Wed Oct 12 20:52:41 2005
-***************
-*** 643,644 ****
---- 643,646 ----
- { /* Add new patch number below this line */
-+ /**/
-+ 2,
- /**/
-
---
-hundred-and-one symptoms of being an internet addict:
-16. You step out of your room and realize that your parents have moved and
- you don't have a clue when it happened.
-
- /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\
-/// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
-\\\ Project leader for A-A-P -- http://www.A-A-P.org ///
- \\\ Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html ///
Deleted: trunk/vim/upstream/patches/6.4b.003
===================================================================
--- trunk/vim/upstream/patches/6.4b.003 2005-10-14 20:38:40 UTC (rev 355)
+++ trunk/vim/upstream/patches/6.4b.003 2005-10-15 16:42:59 UTC (rev 356)
@@ -1,99 +0,0 @@
-To: vim-dev at vim.org
-Subject: Patch 6.4b.003
-Fcc: outbox
-From: Bram Moolenaar <Bram at moolenaar.net>
-Mime-Version: 1.0
-Content-Type: text/plain; charset=ISO-8859-1
-Content-Transfer-Encoding: 8bit
-------------
-
-Patch 6.4b.003 (after 6.4b.002)
-Problem: The problem still exists when 'encoding' is set to "cp936".
-Solution: Fix the problem in getvvcol(), compute the coladd field correctly.
-Files: src/charset.c, src/ops.c
-
-
-*** ../vim-6.4b.002/src/charset.c Sun Apr 10 17:35:14 2005
---- src/charset.c Fri Oct 14 17:24:31 2005
-***************
-*** 1374,1381 ****
- if (c != TAB && vim_isprintc(c))
- {
- endadd = char2cells(c) - 1;
-! if (coladd >= endadd)
-! coladd -= endadd;
- else
- coladd = 0;
- }
---- 1374,1381 ----
- if (c != TAB && vim_isprintc(c))
- {
- endadd = char2cells(c) - 1;
-! if (coladd > endadd) /* past end of line */
-! endadd = 0;
- else
- coladd = 0;
- }
-*** ../vim-6.4b.002/src/ops.c Wed Oct 12 20:56:28 2005
---- src/ops.c Fri Oct 14 17:36:07 2005
-***************
-*** 3619,3627 ****
- && curwin->w_cursor.col > 0
- && !(restart_edit || (State & INSERT)))
- {
-! #ifdef FEAT_VIRTUALEDIT
-! col = curwin->w_cursor.col;
-! #endif
- --curwin->w_cursor.col;
- #ifdef FEAT_MBYTE
- if (has_mbyte)
---- 3619,3625 ----
- && curwin->w_cursor.col > 0
- && !(restart_edit || (State & INSERT)))
- {
-! /* Put the cursor on the last character in the line. */
- --curwin->w_cursor.col;
- #ifdef FEAT_MBYTE
- if (has_mbyte)
-***************
-*** 3629,3635 ****
- #endif
- #ifdef FEAT_VIRTUALEDIT
- if (ve_flags == VE_ALL)
-! curwin->w_cursor.coladd = col - curwin->w_cursor.col;
- #endif
- }
- }
---- 3627,3639 ----
- #endif
- #ifdef FEAT_VIRTUALEDIT
- if (ve_flags == VE_ALL)
-! {
-! colnr_T scol, ecol;
-!
-! /* Coladd is set to the width of the last character. */
-! getvcol(curwin, &curwin->w_cursor, &scol, NULL, &ecol);
-! curwin->w_cursor.coladd = ecol - scol + 1;
-! }
- #endif
- }
- }
-*** ../vim-6.4b.002/src/version.c Wed Oct 12 20:56:28 2005
---- src/version.c Fri Oct 14 17:40:42 2005
-***************
-*** 643,644 ****
---- 643,646 ----
- { /* Add new patch number below this line */
-+ /**/
-+ 3,
- /**/
-
---
-If Pacman had affected us as kids we'd be running around in dark rooms,
-munching pills and listening to repetitive music.
- -- Marcus Brigstocke
-
- /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\
-/// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
-\\\ Project leader for A-A-P -- http://www.A-A-P.org ///
- \\\ Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html ///
Deleted: trunk/vim/upstream/patches/6.4b.004
===================================================================
--- trunk/vim/upstream/patches/6.4b.004 2005-10-14 20:38:40 UTC (rev 355)
+++ trunk/vim/upstream/patches/6.4b.004 2005-10-15 16:42:59 UTC (rev 356)
@@ -1,54 +0,0 @@
-To: vim-dev at vim.org
-Subject: Patch 6.4b.004
-Fcc: outbox
-From: Bram Moolenaar <Bram at moolenaar.net>
-Mime-Version: 1.0
-Content-Type: text/plain; charset=ISO-8859-1
-Content-Transfer-Encoding: 8bit
-------------
-
-Patch 6.4b.004
-Problem: Selecting a {} block with "viB" includes the '}' when there is an
- empty line before it.
-Solution: Don't advance the cursor to include a line break when it's already
- at the line break.
-Files: src/search.c
-
-
-*** ../vim-6.4b.003/src/search.c Thu Oct 6 20:41:27 2005
---- src/search.c Fri Oct 14 20:22:17 2005
-***************
-*** 3408,3414 ****
- {
- if (*p_sel == 'e')
- ++curwin->w_cursor.col;
-! if (sol)
- inc(&curwin->w_cursor); /* include the line break */
- VIsual = start_pos;
- VIsual_mode = 'v';
---- 3408,3414 ----
- {
- if (*p_sel == 'e')
- ++curwin->w_cursor.col;
-! if (sol && gchar_cursor() != NUL)
- inc(&curwin->w_cursor); /* include the line break */
- VIsual = start_pos;
- VIsual_mode = 'v';
-*** ../vim-6.4b.003/src/version.c Fri Oct 14 17:44:45 2005
---- src/version.c Fri Oct 14 22:34:30 2005
-***************
-*** 643,644 ****
---- 643,646 ----
- { /* Add new patch number below this line */
-+ /**/
-+ 4,
- /**/
-
---
-How To Keep A Healthy Level Of Insanity:
-13. Go to a poetry recital and ask why the poems don't rhyme.
-
- /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\
-/// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
-\\\ Project leader for A-A-P -- http://www.A-A-P.org ///
- \\\ Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html ///
More information about the pkg-vim-maintainers
mailing list