r713 - in /trunk/packages/vim: debian/ debian/runtime/ debian/tiny/ patches/

jamessan at users.alioth.debian.org jamessan at users.alioth.debian.org
Mon Jun 12 16:51:58 UTC 2006


Author: jamessan
Date: Mon Jun 12 16:51:57 2006
New Revision: 713

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=713
Log:
Constrain vi-specific behavior to vim-tiny.
+ Rename /etc/vim/virc to /etc/vim/vimrc.tiny
+ Rename patches/virc.c.diff to debian/tiny/vimrc.tiny.diff and only apply when building vim-tiny.
+ Add a NEWS entry about the changes.
Add patches/debchangelog.vim.diff to fix the infinite loop behavior. (#367566)
Add patches/scripts.vim.diff to highlight ltrace output as strace. (#372926)
Add vim-variant.preinst to ensure /usr/share/doc/$variant-pkg is properly removed before creating a symlink. (#369740)

Added:
    trunk/packages/vim/debian/tiny/vimrc.tiny
      - copied unchanged from r705, trunk/packages/vim/debian/runtime/virc
    trunk/packages/vim/debian/tiny/vimrc.tiny.diff
      - copied, changed from r705, trunk/packages/vim/patches/virc.c.diff
    trunk/packages/vim/debian/vim-variant.preinst
    trunk/packages/vim/patches/debchangelog.vim.diff
    trunk/packages/vim/patches/scripts.vim.diff
Removed:
    trunk/packages/vim/debian/runtime/virc
    trunk/packages/vim/patches/virc.c.diff
Modified:
    trunk/packages/vim/debian/NEWS
    trunk/packages/vim/debian/changelog
    trunk/packages/vim/debian/control
    trunk/packages/vim/debian/rules
    trunk/packages/vim/debian/vim-common.install.in
    trunk/packages/vim/debian/vim-common.links.in
    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=713&op=diff
==============================================================================
--- trunk/packages/vim/debian/NEWS (original)
+++ trunk/packages/vim/debian/NEWS Mon Jun 12 16:51:57 2006
@@ -1,3 +1,17 @@
+vim (1:7.0-017+6) unstable; urgency=low
+
+  * "vim" vs "vi" revisited
+
+    Invoking Vim as "vi" now only provides a vi-compatiable environment for
+    the vim-tiny package (which is included in base).  The remaining variants
+    will retain their normal behavior.
+
+    Since this behavior was restricted to vim-tiny, /etc/vim/virc has been
+    renamed /etc/vim/vimrc.tiny.  As was the case with the initial "vi"
+    changes, the only setting in /etc/vim/vimrc.tiny is "set compatible".
+
+ -- James Vega <jamessan at debian.org>  Mon,  5 Jun 2006 20:00:02 -0400
+
 vim (1:7.0-015+1) unstable; urgency=low
 
   * "vim" vs "vi"

Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=713&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Mon Jun 12 16:51:57 2006
@@ -1,12 +1,26 @@
 vim (1:7.0-017+6) UNRELEASED; urgency=low
 
   [ Pierre Habouzit ]
-  * make virc source $RUNTIME/debian.vim also, and use v:progname to detect if
-    it was called through vi or vim.
   * Add a Replace: vim-runtime to vim-common because of the vimcurrent mess,
     that may prevent vim upgrade. (Closes: #370012).
 
- -- Pierre Habouzit <madcoder at debian.org>  Sat,  3 Jun 2006 14:13:36 +0200
+  [ James Vega ]
+  * Add vim-variant.preinst to remove any cruft left behind in
+    /usr/share/doc/vim{,-$variant}, which is now a symlink to
+    /usr/share/vim/vim-common.  (closes: #369740)
+  * Update the build process so only vim-tiny starts in 'compatible' mode when
+    invoked as vi.
+    + Move patches/virc.c.diff to debian/tiny/vimrc.tiny.diff and apply only
+      when building vim-tiny.
+    + Rename /etc/vim/virc to /etc/vim/vimrc.tiny
+  * Update README.Debian to specify which package contains the vim policy and
+    the correct directory that holds vim policy.
+  * Add debchangelog.vim.diff which fixes an inifinite loop bug in the
+    debchangelog filetype plugin.  (closes: #367566)
+  * Add scripts.vim.diff which adds recognition of ltrace output and sets the
+    filetype to 'strace'.  (closes: #372926)
+
+ -- James Vega <jamessan at debian.org>  Mon, 12 Jun 2006 11:00:05 -0400
 
 vim (1:7.0-017+5) unstable; urgency=low
 

Modified: trunk/packages/vim/debian/control
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/control?rev=713&op=diff
==============================================================================
--- trunk/packages/vim/debian/control (original)
+++ trunk/packages/vim/debian/control Mon Jun 12 16:51:57 2006
@@ -12,7 +12,7 @@
 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: 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), vim-runtime (<< 1:7.0)
+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), vim-runtime (<< 1:7.0-010+1)
 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.

Modified: trunk/packages/vim/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/rules?rev=713&op=diff
==============================================================================
--- trunk/packages/vim/debian/rules (original)
+++ trunk/packages/vim/debian/rules Mon Jun 12 16:51:57 2006
@@ -171,7 +171,7 @@
 EXTRA_TARBALL=$(NAME)-$(VERSION)-extra.tar.gz
 SOURCES = $(MAIN_TARBALL) $(LANG_TARBALL) $(EXTRA_TARBALL)
 BASE_URL=ftp://ftp.vim.org/pub/vim
-PER_VARIANT_FILES = install postinst postrm prerm links
+PER_VARIANT_FILES = install postinst postrm prerm links preinst
 LANGS += fr fr.ISO8859-1 fr.UTF-8
 LANGS += it it.ISO8859-1 it.UTF-8
 LANGS += pl pl.ISO8859-2 pl.UTF-8
@@ -302,7 +302,13 @@
 build-stamp-%: configure-stamp-%
 	dh_testdir
 	@echo "*** DEBIAN *** BUILDING VARIANT $*"
+	if [ "$*" = "vim-tiny" ]; then \
+	  patch -Np0 < debian/tiny/vimrc.tiny.diff; \
+	fi
 	$(MAKE) -C $(SRCDIR) CFLAGS="$(CURCFLAGS)"
+	if [ "$*" = "vim-tiny" ]; then \
+	  patch -Rp0 < debian/tiny/vimrc.tiny.diff; \
+	fi
 	mv $(SRCDIR)/src/vim $(SRCDIR)/src/$(subst -,.,$*)
 	touch $@
 

Copied: trunk/packages/vim/debian/tiny/vimrc.tiny.diff (from r705, trunk/packages/vim/patches/virc.c.diff)
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/tiny/vimrc.tiny.diff?rev=713&op=diff
==============================================================================
--- trunk/packages/vim/patches/virc.c.diff (original)
+++ trunk/packages/vim/debian/tiny/vimrc.tiny.diff Mon Jun 12 16:51:57 2006
@@ -6,8 +6,8 @@
  /*
   * Unix system-dependent file names
   */
-+#ifndef SYS_VIRC_FILE
-+# define SYS_VIRC_FILE "$VIM/virc"
++#ifndef SYS_TINYRC_FILE
++# define SYS_TINYRC_FILE "$VIM/vimrc.tiny"
 +#endif
  #ifndef SYS_VIMRC_FILE
  # define SYS_VIMRC_FILE "$VIM/vimrc"
@@ -20,7 +20,7 @@
  #ifdef FEAT_DIFF
      int		diff_mode;		/* start with 'diff' set */
  #endif
-+#ifdef SYS_VIRC_FILE
++#ifdef SYS_TINYRC_FILE
 +    int		vi_mode;		/* started as "vi" */
 +#endif
  } mparm_T;
@@ -39,9 +39,9 @@
  	 * Get system wide defaults, if the file name is defined.
  	 */
  #ifdef SYS_VIMRC_FILE
-+# ifdef SYS_VIRC_FILE
++# ifdef SYS_TINYRC_FILE
 +	if (parmp->vi_mode)
-+	    (void)do_source((char_u *)SYS_VIRC_FILE,  FALSE, DOSO_NONE);
++	    (void)do_source((char_u *)SYS_TINYRC_FILE,  FALSE, DOSO_NONE);
 +	else
 +	    (void)do_source((char_u *)SYS_VIMRC_FILE, FALSE, DOSO_NONE);
 +# else

Modified: 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=713&op=diff
==============================================================================
--- trunk/packages/vim/debian/vim-common.install.in (original)
+++ trunk/packages/vim/debian/vim-common.install.in Mon Jun 12 16:51:57 2006
@@ -1,7 +1,7 @@
 debian/tmp/usr/bin/xxd                           usr/bin/
 debian/helpztags                                 usr/bin/
 debian/runtime/vimrc                             etc/vim/
-debian/runtime/virc                              etc/vim/
+debian/tiny/vimrc.tiny                           etc/vim/
 debian/runtime/debian.vim                        usr/share/vim/@VIMCUR@/
 debian/vim.presubj                               usr/share/bug/vim/
 debian/tmp/usr/share/man/man1/*                  usr/share/man/man1/

Modified: 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=713&op=diff
==============================================================================
--- trunk/packages/vim/debian/vim-common.links.in (original)
+++ trunk/packages/vim/debian/vim-common.links.in Mon Jun 12 16:51:57 2006
@@ -1,6 +1,6 @@
 etc/vim					usr/share/vim/vimfiles
 etc/vim/vimrc				usr/share/vim/vimrc
-etc/vim/virc				usr/share/vim/virc
+etc/vim/vimrc.tiny			usr/share/vim/vimrc.tiny
 usr/share/vim/@VIMCUR@			usr/share/vim/vimcurrent
 
 usr/share/man/man1/vim.1		usr/share/man/man1/rvim.1

Added: trunk/packages/vim/debian/vim-variant.preinst
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/vim-variant.preinst?rev=713&op=file
==============================================================================
--- trunk/packages/vim/debian/vim-variant.preinst (added)
+++ trunk/packages/vim/debian/vim-variant.preinst Mon Jun 12 16:51:57 2006
@@ -1,0 +1,19 @@
+#!/bin/bash -e
+
+pkg=@PKG@
+
+remove_directory () {
+  if [ -d $1 ]; then
+    rm -rf $1
+  fi
+}
+
+case "$1" in
+  upgrade)
+    remove_directory /usr/share/doc/$pkg
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0

Added: trunk/packages/vim/patches/debchangelog.vim.diff
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/debchangelog.vim.diff?rev=713&op=file
==============================================================================
--- trunk/packages/vim/patches/debchangelog.vim.diff (added)
+++ trunk/packages/vim/patches/debchangelog.vim.diff Mon Jun 12 16:51:57 2006
@@ -1,0 +1,54 @@
+Index: vim/runtime/ftplugin/debchangelog.vim
+===================================================================
+--- vim/runtime/ftplugin/debchangelog.vim.orig
++++ vim/runtime/ftplugin/debchangelog.vim
+@@ -2,14 +2,14 @@
+ " Language:	Debian Changelog
+ " Maintainer:	Michael Piefel <piefel at informatik.hu-berlin.de>
+ "		Stefano Zacchiroli <zack at debian.org>
+-" Last Change:	$LastChangedDate: 2006-04-28 12:15:12 -0400 (ven, 28 apr 2006) $
++" Last Change:	$LastChangedDate: 2006-05-23 09:19:19 -0400 (Tue, 23 May 2006) $
+ " License:	GNU GPL, version 2.0 or later
+ " URL:		http://svn.debian.org/wsvn/pkg-vim/trunk/runtime/ftplugin/debchangelog.vim?op=file&rev=0&sc=0
+ 
+ if exists("b:did_ftplugin")
+   finish
+ endif
+-let b:did_ftplugin = 1
++let b:did_ftplugin=1
+ 
+ " {{{1 Local settings (do on every load)
+ setlocal foldmethod=expr
+@@ -227,21 +227,22 @@
+ " }}}
+ " {{{1 folding
+ 
+-" look for an author name searching backward from a given line number
+-function! s:getAuthor(lnum)
+-  let line = getline(a:lnum)
+-  let backsteps = 0
+-  while line !~ '^ --'
+-    let backsteps += 1
+-    let line = getline(a:lnum - backsteps)
++" look for an author name in the [zonestart zoneend] lines searching backward
++function! s:getAuthor(zonestart, zoneend)
++  let linepos = a:zoneend
++  while linepos >= a:zonestart
++    let line = getline(linepos)
++    if line =~ '^ --'
++      return substitute(line, '^ --\s*\([^<]\+\)\s*.*', '\1', '')
++    endif
++    let linepos -= 1
+   endwhile
+-  let author = substitute(line, '^ --\s*\([^<]\+\)\s*.*', '\1', '')
+-  return author
++  return '[unknown]'
+ endfunction
+ 
+ function! DebChangelogFoldText()
+   if v:folddashes == '-'  " changelog entry fold
+-    return foldtext() . ' -- ' . s:getAuthor(v:foldend) . ' '
++    return foldtext() . ' -- ' . s:getAuthor(v:foldstart, v:foldend) . ' '
+   endif
+   return foldtext()
+ endfunction

Added: trunk/packages/vim/patches/scripts.vim.diff
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/scripts.vim.diff?rev=713&op=file
==============================================================================
--- trunk/packages/vim/patches/scripts.vim.diff (added)
+++ trunk/packages/vim/patches/scripts.vim.diff Mon Jun 12 16:51:57 2006
@@ -1,0 +1,13 @@
+Index: vim/runtime/scripts.vim
+===================================================================
+--- vim/runtime/scripts.vim.orig
++++ vim/runtime/scripts.vim
+@@ -265,7 +265,7 @@
+     set ft=virata
+ 
+     " Strace
+-  elseif s:line1 =~ '^[0-9]* *execve('
++  elseif s:line1 =~ '^[0-9]* *execve(' || s:line1 =~ '^__libc_start_main'
+     set ft=strace
+ 
+     " VSE JCL

Modified: trunk/packages/vim/patches/series
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/series?rev=713&op=diff
==============================================================================
--- trunk/packages/vim/patches/series (original)
+++ trunk/packages/vim/patches/series Mon Jun 12 16:51:57 2006
@@ -1,7 +1,8 @@
-virc.c.diff -p0
 xdefaults.vim.diff -p0
 debcontrol.vim.diff -p0
 edit.c.diff -p0
 po.vim.diff -p0
 python.vim-ftplugin_include.diff -p0
 mysql.vim-syntax_comment.diff -p0
+debchangelog.vim.diff -p0
+scripts.vim.diff -p0




More information about the pkg-vim-maintainers mailing list