r567 - in trunk/vim7: debian debian/updates patches
Stefano Zacchiroli
zack at costa.debian.org
Mon Apr 3 20:48:02 UTC 2006
Author: zack
Date: 2006-04-03 20:47:55 +0000 (Mon, 03 Apr 2006)
New Revision: 567
Removed:
trunk/vim7/debian/updates/debsources.vim
trunk/vim7/patches/135_debsources.vim.diff
Modified:
trunk/vim7/debian/changelog
trunk/vim7/debian/rules
trunk/vim7/patches/series
Log:
- ported to 7.0c08
- added to debian/rules an hackish target ("updatesnapshot") to update the vim7
branch to the latest snapshot
Modified: trunk/vim7/debian/changelog
===================================================================
--- trunk/vim7/debian/changelog 2006-04-01 14:25:08 UTC (rev 566)
+++ trunk/vim7/debian/changelog 2006-04-03 20:47:55 UTC (rev 567)
@@ -1,7 +1,7 @@
-vim (1:6.4+7.0c05-1) experimental; urgency=low
+vim (1:6.4+7.0c08-1) experimental; urgency=low
[ Debian Vim Maintainers ]
- * New upstream snapshot (7.0c05).
+ * New upstream snapshot (7.0c08).
+ Added support for bzr diffs in scripts.vim, thanks to Adeodato Simó.
(closes: #355922)
+ Support python `as' keyword. (closes: #352885)
@@ -33,14 +33,15 @@
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
+ 133_filetype.vim.diff, 135_debsources.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
+ + removed updates: debian/updates/debsources.vim
* Added patch 102_pycomplete.vim: fixes a python omnicompletion bug when the
cursor is on an empty line
[ Matthijs Mohlmann ]
- * Updated debsources syntax file.
+ * Updated debsources syntax file (now integrated upstream).
+ Use debsources instead of sources.
+ Make a regexpression of deb, deb-src, main, contrib and non-free.
+ Remove setlocal iskeyword.
Modified: trunk/vim7/debian/rules
===================================================================
--- trunk/vim7/debian/rules 2006-04-01 14:25:08 UTC (rev 566)
+++ trunk/vim7/debian/rules 2006-04-03 20:47:55 UTC (rev 567)
@@ -162,7 +162,7 @@
NAME=vim
VERSION=7.0c
-SNAPSHOT=05
+SNAPSHOT=08
DEBVERSION=6.4+$(VERSION)$(SNAPSHOT)
SRCDIR=$(NAME)$(subst .,,$(VERSION))
VIMCUR=$(SRCDIR)
@@ -208,6 +208,19 @@
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 \
+ && rulesversion=`echo $$zipbasename | cut -c5-8` \
+ && rulessnapshot=`echo $$zipbasename | 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 $@
@@ -503,3 +516,5 @@
@echo "*** DEBIAN *** SKIPPING VARIANTS: $(VARIANTS_SKIP)"
endlog:
@echo "*** DEBIAN *** BUILD COMPLETED"
+
+# vim: set foldmethod=marker:
Deleted: trunk/vim7/debian/updates/debsources.vim
===================================================================
--- trunk/vim7/debian/updates/debsources.vim 2006-04-01 14:25:08 UTC (rev 566)
+++ trunk/vim7/debian/updates/debsources.vim 2006-04-03 20:47:55 UTC (rev 567)
@@ -1,40 +0,0 @@
-" Vim syntax file
-" Language: Debian sources.list
-" Maintainer: Matthijs Mohlmann <matthijs at cacholong.nl>
-" Last Change: $Date: 2006/03/28 18:58:26 $
-" URL: http://www.cacholong.nl/~matthijs/vim/syntax/debsources.vim
-" $Revision: 1.4 $
-
-" this is a very simple syntax file - I will be improving it
-" add entire DEFINE syntax
-
-" Standard syntax initialization
-if version < 600
- syntax clear
-elseif exists("b:current_syntax")
- finish
-endif
-
-" case sensitive
-syn case match
-
-" A bunch of useful keywords
-syn match debsourcesKeyword /\(deb-src\|deb\|main\|contrib\|non-free\)/
-
-" Match comments
-syn match debsourcesComment /#.*/
-
-" Match uri's
-syn match debsourcesUri +\(http://\|ftp://\|file:///\)[^' <>"]\++
-syn match debsourcesDistrKeyword +\([[:alnum:]_./]*\)\(woody\|sarge\|etch\|old-stable\|stable\|testing\|unstable\|sid\|experimental\|warty\|hoary\|breezy\)\([[:alnum:]_./]*\)+
-
-" Associate our matches and regions with pretty colours
-hi def link debsourcesLine Error
-hi def link debsourcesKeyword Statement
-hi def link debsourcesDistrKeyword Type
-hi def link debsourcesComment Comment
-hi def link debsourcesUri Constant
-
-let b:current_syntax = "debsources"
-
-" vim: ts=8
Deleted: trunk/vim7/patches/135_debsources.vim.diff
===================================================================
--- trunk/vim7/patches/135_debsources.vim.diff 2006-04-01 14:25:08 UTC (rev 566)
+++ trunk/vim7/patches/135_debsources.vim.diff 2006-04-03 20:47:55 UTC (rev 567)
@@ -1,14 +0,0 @@
-Index: vim/runtime/filetype.vim
-===================================================================
---- vim/runtime/filetype.vim.orig
-+++ vim/runtime/filetype.vim
-@@ -1646,6 +1646,9 @@
- " OpenSSH server configuration
- au BufNewFile,BufRead sshd_config setf sshdconfig
-
-+" Debian sources.list
-+au BufNewFile,BufRead sources.list setf debsources
-+
- " Stored Procedures
- au BufNewFile,BufRead *.stp setf stp
-
Modified: trunk/vim7/patches/series
===================================================================
--- trunk/vim7/patches/series 2006-04-01 14:25:08 UTC (rev 566)
+++ trunk/vim7/patches/series 2006-04-03 20:47:55 UTC (rev 567)
@@ -11,7 +11,6 @@
122_html_indent.vim.diff -p0
130_fstab.vim.diff -p0
133_resolv.vim.diff -p0
-135_debsources.vim.diff -p0
136_muttrc.vim.diff -p0
140_muttrc.vim.diff -p0
145_fortran.vim.diff -p0
More information about the pkg-vim-maintainers
mailing list