r579 - in trunk/vim7: debian patches
Stefano Zacchiroli
zack at costa.debian.org
Mon Apr 10 17:07:53 UTC 2006
Author: zack
Date: 2006-04-10 17:07:48 +0000 (Mon, 10 Apr 2006)
New Revision: 579
Removed:
trunk/vim7/patches/155_rst.vim.diff
Modified:
trunk/vim7/debian/changelog
trunk/vim7/debian/rules
trunk/vim7/debian/watch
trunk/vim7/patches/pushed-upstream.txt
trunk/vim7/patches/series
Log:
snapshot 7.0d
better watch/updatesnapshot to cope with empty snapshot numbers
Modified: trunk/vim7/debian/changelog
===================================================================
--- trunk/vim7/debian/changelog 2006-04-10 14:12:19 UTC (rev 578)
+++ trunk/vim7/debian/changelog 2006-04-10 17:07:48 UTC (rev 579)
@@ -1,13 +1,13 @@
-vim (1:6.4+7.0c13-1) UNRELEASED; urgency=low
+vim (1:6.4+7.0d-1) UNRELEASED; urgency=low
[ Debian Vim Maintainers ]
- * New upstream snapshot (7.0c13).
+ * New upstream snapshot (7.0d).
[ 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, 135_debsources.vim.diff,
- 145_fortran.vim.diff
+ 145_fortran.vim.diff, 155_rst.vim.diff
+ removed updates: debian/updates/debsources.vim
-- James Vega <jamessan at debian.org> Wed, 5 Apr 2006 09:16:42 -0400
Modified: trunk/vim7/debian/rules
===================================================================
--- trunk/vim7/debian/rules 2006-04-10 14:12:19 UTC (rev 578)
+++ trunk/vim7/debian/rules 2006-04-10 17:07:48 UTC (rev 579)
@@ -161,8 +161,8 @@
CFGFLAGS_vim-full=$(CFGFLAGS) $(OPTFLAGS) $(GUIFLAGS) $(GNOMEFLAGS) $(ALLINTERPFLAGS)
NAME=vim
-VERSION=7.0c
-SNAPSHOT=13
+VERSION=7.0d
+SNAPSHOT=
DEBVERSION=6.4+$(VERSION)$(SNAPSHOT)
SRCDIR=$(NAME)$(subst .,,$(VERSION))
VIMCUR=$(SRCDIR)
@@ -214,8 +214,9 @@
&& test ! -z "$$zipurl" \
&& zipbasename=`basename $$zipurl` \
&& wget -O upstream/tarballs/$$zipbasename $$zipurl \
- && rulesversion=`echo $$zipbasename | cut -c5-8` \
- && rulessnapshot=`echo $$zipbasename | cut -c9-10` \
+ && 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
Modified: trunk/vim7/debian/watch
===================================================================
--- trunk/vim7/debian/watch 2006-04-10 14:12:19 UTC (rev 578)
+++ trunk/vim7/debian/watch 2006-04-10 17:07:48 UTC (rev 579)
@@ -1,3 +1,3 @@
version=3
opts="uversionmangle=s/^7\./6.4+7./" \
- ftp://ftp.vim.org/pub/vim/unstable/snapshot/vim-(7\.0[a-z]\d+).zip
+ ftp://ftp.vim.org/pub/vim/unstable/snapshot/vim-(7\.0[a-z]\d*).zip
Deleted: trunk/vim7/patches/155_rst.vim.diff
===================================================================
--- trunk/vim7/patches/155_rst.vim.diff 2006-04-10 14:12:19 UTC (rev 578)
+++ trunk/vim7/patches/155_rst.vim.diff 2006-04-10 17:07:48 UTC (rev 579)
@@ -1,59 +0,0 @@
-Index: vim/runtime/syntax/rst.vim
-===================================================================
---- vim/runtime/syntax/rst.vim.orig
-+++ vim/runtime/syntax/rst.vim
-@@ -14,7 +14,7 @@
-
- syn case ignore
-
--syn region rstComment start='^\.\.\%( \%([a-z0-9_.-]\+::\)\@!\|$\)'
-+syn region rstComment start='^\.\.\%( \%([[:alnum:]_\'.-]\+::\)\@!\|$\)'
- \ end='^\s\@!' contains=rstTodo
-
- syn cluster rstCruft contains=rstFootnoteLabel,rstCitationLabel,
-@@ -39,35 +39,35 @@
- \ '^\%(\s*\)\@>\%(\%(=\+\)\@>\%(\s\+\)\@>\)\%(\%(\%(=\+\)\@>\%(\s*\)\@>\)\+\)\@>$'
-
- syn region rstFootnote matchgroup=rstDirective
-- \ start='^\.\. \[\%([#*]\|[0-9]\+\|#[a-z0-9_.-]\+\)\]\s'
-+ \ start='^\.\. \[\%([#*]\|[0-9]\+\|#[[:alnum:]_\'.-]\+\)\]\s'
- \ end='^\s\@!' contains=@rstCruft
--syn match rstFootnoteLabel '\[\%([#*]\|[0-9]\+\|#[a-z0-9_.-]\+\)\]_'
-+syn match rstFootnoteLabel '\[\%([#*]\|[0-9]\+\|#[[:alnum:]_\'.-]\+\)\]_'
-
- syn region rstCitation matchgroup=rstDirective
-- \ start='^\.\. \[[a-z0-9_.-]\+\]\s'
-+ \ start='^\.\. \[[[:alnum:]_\'.-]\+\]\s'
- \ end='^\s\@!' contains=@rstCruft
--syn match rstCitationLabel '\[[a-z0-9_.-]\+\]_'
-+syn match rstCitationLabel '\[[[:alnum:]_\'.-]\+\]_'
-
- syn region rstDirectiveBody matchgroup=rstDirective
-- \ start='^\.\. [a-z0-9_.-]\+::'
-+ \ start='^\.\. [[:alnum:]_\'.-]\+::'
- \ end='^\s\@!'
-
- syn region rstSubstitution matchgroup=rstDirective
-- \ start='^\.\. |[a-z0-9_.-]|\s[a-z0-9_.-]\+::\s'
-+ \ start='^\.\. |[[:alnum:]_\'.-]|\s[[:alnum:]_\'.-]\+::\s'
- \ end='^\s\@!' contains=@rstCruft
--syn match rstSubstitutionLbl '|[a-z0-9_.-]|'
-+syn match rstSubstitutionLbl '|[[:alnum:]_\'.-]|'
-
- syn match rstInline '\*\{1,2}\S\%([^*]*\S\)\=\*\{1,2}'
- syn match rstInline '`\{1,2}\S\%([^`]*\S\)\=`\{1,2}'
-
- syn region rstHyperlinks matchgroup=RstDirective
-- \ start='^\.\. _[a-z0-9_. -]\+:\s'
-+ \ start='^\.\. _[[:alnum:]_\'. -]\+:\s'
- \ end='^\s\@!' contains=@rstCruft
-
--syn match rstHyperlinksLabel '`\S\%([^`]*\S\)\=`__\=\>'
-+syn match rstHyperlinksLabel '`\S\%(\%([^`]\|\n\)*\S\)\=`__\=\>'
- syn match rstHyperlinksLabel '\w\+__\=\>'
-
--syn match rstInternalTarget '_`\S\%([^`]*\S\)\=`'
-+syn match rstInternalTarget '_`\S\%(\%([^`]\|\n\)*\S\)\=`'
-
- syn match rstListItem '^:\w\+\%(\s\+\w\+\)*:'
- syn match rstListItem '^\s*[-*+]\s\+'
Modified: trunk/vim7/patches/pushed-upstream.txt
===================================================================
--- trunk/vim7/patches/pushed-upstream.txt 2006-04-10 14:12:19 UTC (rev 578)
+++ trunk/vim7/patches/pushed-upstream.txt 2006-04-10 17:07:48 UTC (rev 579)
@@ -46,11 +46,6 @@
Signaled to wichert
Sat, 25 Mar 2006 20:26:57 -0500 zack
-155_rst.vim.diff
-
- Signaled to maintainer and Bram
- Mon, 27 Mar 2006 09:05:11 -0500 zack
-
157_slrnrc.vim.diff
Signaled to Bram and maintainer
Modified: trunk/vim7/patches/series
===================================================================
--- trunk/vim7/patches/series 2006-04-10 14:12:19 UTC (rev 578)
+++ trunk/vim7/patches/series 2006-04-10 17:07:48 UTC (rev 579)
@@ -13,7 +13,6 @@
136_muttrc.vim.diff -p0
140_muttrc.vim.diff -p0
148_debchangelog.vim.diff -p0
-155_rst.vim.diff -p0
157_slrnrc.vim.diff -p0
161_cmake-support.diff -p0
201_fr.po.diff -p0
More information about the pkg-vim-maintainers
mailing list