r397 - in branches/vim-tiny/debian: . tiny tiny/doc

Stefano Zacchiroli zack at costa.debian.org
Fri Nov 4 00:24:56 UTC 2005


Author: zack
Date: 2005-11-04 00:24:55 +0000 (Fri, 04 Nov 2005)
New Revision: 397

Added:
   branches/vim-tiny/debian/tiny/
   branches/vim-tiny/debian/tiny/doc/
   branches/vim-tiny/debian/tiny/doc/README.Debian
   branches/vim-tiny/debian/tiny/doc/help.txt
   branches/vim-tiny/debian/tiny/doc/tags
   branches/vim-tiny/debian/tiny/features.txt
   branches/vim-tiny/debian/vim-tiny.dirs
Removed:
   branches/vim-tiny/debian/tiny-features.txt
Modified:
   branches/vim-tiny/debian/rules
   branches/vim-tiny/debian/vim-variant.install
   branches/vim-tiny/debian/vim-variant.postinst
   branches/vim-tiny/debian/vim.install
   branches/vim-tiny/debian/vim.postinst
Log:
- set up fake help seen when vim-tiny is installed but vim-runtime is not (still to be written properly: see debian/tiny/doc/help.txt)
- moved vim-tiny related stuff to debian/tiny/
- fixed priority of vim.basic alternative for /usr/bin/vim (was 0, should be 20)


Modified: branches/vim-tiny/debian/rules
===================================================================
--- branches/vim-tiny/debian/rules	2005-11-02 22:50:23 UTC (rev 396)
+++ branches/vim-tiny/debian/rules	2005-11-04 00:24:55 UTC (rev 397)
@@ -24,7 +24,7 @@
 CFGFLAGS+=--with-compiledby="$(BUILDER)"
 
 # "vim-tiny" features: in addition to those coming from the --with-features=xxx,
-# "vim-tiny" is built with those listed in tiny-features.txt
+# "vim-tiny" is built with those listed in debian/tiny/features.txt
 TINYFLAGS+=--with-features=small
 TINYFLAGS+=--disable-gui
 TINYFLAGS+=--disable-xsmp
@@ -34,8 +34,8 @@
 TINYFLAGS+=--disable-gpm
 TINYFLAGS+=--disable-nls
 
-# add -DFEAT_* from tiny-features.txt
-TINYCFLAGS:=$(patsubst %,-D%,$(shell grep ^FEAT_ debian/tiny-features.txt | cut -f 1))
+# add -DFEAT_* from debian/tiny/features.txt
+TINYCFLAGS:=$(patsubst %,-D%,$(shell grep ^FEAT_ debian/tiny/features.txt | cut -f 1))
 
 OPTFLAGS+=--enable-gpm
 OPTFLAGS+=--enable-cscope
@@ -310,7 +310,11 @@
 	done
 	sed -e "s:@PKG@:$*:;s:@VARIANT@:$(patsubst vim-%,%,$*):;s:@DESTDIR@:vim64/src:" \
 		debian/lintian/vim-variant > debian/lintian/$*
-	dh_install $(DH_OPTIONS)
+	# fake help installation for vim-tiny
+	if [ "$*" = "vim-tiny" ]; then \
+		echo "debian/tiny/doc/	usr/share/vim/" >> debian/$*.install; \
+	fi
+	dh_install -X.svn $(DH_OPTIONS)
 
 	touch $@
 

Added: branches/vim-tiny/debian/tiny/doc/README.Debian
===================================================================
--- branches/vim-tiny/debian/tiny/doc/README.Debian	2005-11-02 22:50:23 UTC (rev 396)
+++ branches/vim-tiny/debian/tiny/doc/README.Debian	2005-11-04 00:24:55 UTC (rev 397)
@@ -0,0 +1,7 @@
+
+This directory contains Debian-specific fake help files and tags used by
+the "vim-tiny" package.  Their only purpose is to tell the user how to
+install the real VIM online help on Debian if she wants to (i.e.
+installing the "vim-runtime" package).
+
+ -- Stefano Zacchiroli <zack at debian.org>  Thu, 03 Nov 2005 22:16:23 +0100

Added: branches/vim-tiny/debian/tiny/doc/help.txt
===================================================================
--- branches/vim-tiny/debian/tiny/doc/help.txt	2005-11-02 22:50:23 UTC (rev 396)
+++ branches/vim-tiny/debian/tiny/doc/help.txt	2005-11-04 00:24:55 UTC (rev 397)
@@ -0,0 +1,6 @@
+*help.txt*	For Vim version 6.4.  Last change: 2004 Aug 29
+
+		  VIM - fake help file for vim-tiny
+
+TODO write something here ...
+

Added: branches/vim-tiny/debian/tiny/doc/tags
===================================================================
--- branches/vim-tiny/debian/tiny/doc/tags	2005-11-02 22:50:23 UTC (rev 396)
+++ branches/vim-tiny/debian/tiny/doc/tags	2005-11-04 00:24:55 UTC (rev 397)
@@ -0,0 +1 @@
+help.txt	help.txt	/*help.txt*

Copied: branches/vim-tiny/debian/tiny/features.txt (from rev 390, branches/vim-tiny/debian/tiny-features.txt)

Deleted: branches/vim-tiny/debian/tiny-features.txt
===================================================================
--- branches/vim-tiny/debian/tiny-features.txt	2005-11-02 22:50:23 UTC (rev 396)
+++ branches/vim-tiny/debian/tiny-features.txt	2005-11-04 00:24:55 UTC (rev 397)
@@ -1,92 +0,0 @@
-vim-tiny is compiled using --with-features=small. Since there a lot of features
-one-can-t-live-without which are missing from the "small" features subsed, extra
-features are built in. This file describes them and is parsed during the
-vim-tiny build process by debian/rules. Information extracted from this file are
-then used to patch src/features.h so that the desired features are actually
-built-in.
-
-Each line which does not begin with "FEAT_" is ignored. Each line which is not
-ignored must have the following format:
-  <C feature name from src/feature.h>
-  <TABs/SPACEs>
-  <feature description as per :help +feature-list>
-  <Newline>
-
-In order to add an extra feature for "vim-tiny":
-1) have a look at the features described in ":help +feature-list"
-2) lookup them in src/feature.h to find the C feature name
-3) add it below using the format described above
-
-Extra features compiled in vim tiny:
-
-FEAT_AUTOCMD		N  *+autocmd*		|:autocmd|, automatic commands
-FEAT_BYTEOFF		N  *+byte_offset*	support for 'o' flag in 'statusline' option, "go"
-FEAT_CMDL_COMPL		N  *+cmdline_compl*	command line completion |cmdline-completion|
-FEAT_CMDHIST		N  *+cmdline_hist*	command line history |cmdline-history|
-FEAT_CMDL_INFO		N  *+cmdline_info*	|'showcmd'| and |'ruler'|
-FEAT_COMMENTS		N  *+comments*		|'comments'| support
-FEAT_DIFF		N  *+diff*		|vimdiff| and 'diff'
-FEAT_DIGRAPHS		N  *+digraphs*		|digraphs| *E196*
-FEAT_EVAL		N  *+eval*		expression evaluation |eval.txt|
-FEAT_SEARCH_EXTRA	N  *+extra_search*	|'hlsearch'| and |'incsearch'| options.
-FEAT_SEARCHPATH		N  *+file_in_path*	|gf|, |CTRL-W_f| and |<cfile>|
-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_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,
-_DIFF, _SCROLLBIND, _VERTSPLIT.
-
-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|
-
- -- Stefano Zacchiroli <zack at debian.org>  Tue, 01 Nov 2005 10:38:59 +0100
-

Added: branches/vim-tiny/debian/vim-tiny.dirs
===================================================================
--- branches/vim-tiny/debian/vim-tiny.dirs	2005-11-02 22:50:23 UTC (rev 396)
+++ branches/vim-tiny/debian/vim-tiny.dirs	2005-11-04 00:24:55 UTC (rev 397)
@@ -0,0 +1 @@
+/usr/share/vim

Modified: branches/vim-tiny/debian/vim-variant.install
===================================================================
--- branches/vim-tiny/debian/vim-variant.install	2005-11-02 22:50:23 UTC (rev 396)
+++ branches/vim-tiny/debian/vim-variant.install	2005-11-04 00:24:55 UTC (rev 397)
@@ -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: branches/vim-tiny/debian/vim-variant.postinst
===================================================================
--- branches/vim-tiny/debian/vim-variant.postinst	2005-11-02 22:50:23 UTC (rev 396)
+++ branches/vim-tiny/debian/vim-variant.postinst	2005-11-04 00:24:55 UTC (rev 397)
@@ -10,6 +10,9 @@
       vim-tiny)
 	prio=10
 	;;
+      vim)
+	prio=20
+	;;
       vim-gtk|vim-lesstif|vim-gnome)
       	prio=40
 	;;

Modified: branches/vim-tiny/debian/vim.install
===================================================================
--- branches/vim-tiny/debian/vim.install	2005-11-02 22:50:23 UTC (rev 396)
+++ branches/vim-tiny/debian/vim.install	2005-11-04 00:24:55 UTC (rev 397)
@@ -1,2 +1,2 @@
-debian/lintian/vim	  usr/share/lintian/overrides/
-debian/tmp/usr/bin/vim.basic	  usr/bin/
+debian/lintian/vim	usr/share/lintian/overrides/
+debian/tmp/usr/bin/vim.basic	usr/bin/

Modified: branches/vim-tiny/debian/vim.postinst
===================================================================
--- branches/vim-tiny/debian/vim.postinst	2005-11-02 22:50:23 UTC (rev 396)
+++ branches/vim-tiny/debian/vim.postinst	2005-11-04 00:24:55 UTC (rev 397)
@@ -10,6 +10,9 @@
       vim-tiny)
 	prio=10
 	;;
+      vim)
+	prio=20
+	;;
       vim-gtk|vim-lesstif|vim-gnome)
       	prio=40
 	;;




More information about the pkg-vim-maintainers mailing list