r933 - in /branches/packages/vim/vim7.1: debian/ patches/
upstream/patches/
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Fri May 11 22:27:09 UTC 2007
Author: jamessan
Date: Fri May 11 22:27:08 2007
New Revision: 933
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=933
Log:
Branch for 7.1 (actual updates this time)
Added:
branches/packages/vim/vim7.1/patches/debchangelog-ftplugin.vim.diff
- copied, changed from r932, branches/packages/vim/vim7.1/patches/debchangelog.vim.diff
branches/packages/vim/vim7.1/upstream/patches/7.1b.001
branches/packages/vim/vim7.1/upstream/patches/7.1b.002
Removed:
branches/packages/vim/vim7.1/patches/changelog.vim-ftplugin_buffer-split.diff
branches/packages/vim/vim7.1/patches/de.po.diff
branches/packages/vim/vim7.1/patches/debchangelog.vim.diff
branches/packages/vim/vim7.1/patches/html.vim-syntax_spell.diff
branches/packages/vim/vim7.1/patches/mp.vim-cmd_check.diff
branches/packages/vim/vim7.1/patches/netrw.vim-tmpfile_suffix_escape.diff
branches/packages/vim/vim7.1/patches/zsh.vim-nested_quotes.diff
branches/packages/vim/vim7.1/upstream/patches/7.0.001
branches/packages/vim/vim7.1/upstream/patches/7.0.002
branches/packages/vim/vim7.1/upstream/patches/7.0.003
branches/packages/vim/vim7.1/upstream/patches/7.0.004
branches/packages/vim/vim7.1/upstream/patches/7.0.005
branches/packages/vim/vim7.1/upstream/patches/7.0.006
branches/packages/vim/vim7.1/upstream/patches/7.0.007
branches/packages/vim/vim7.1/upstream/patches/7.0.008
branches/packages/vim/vim7.1/upstream/patches/7.0.009
branches/packages/vim/vim7.1/upstream/patches/7.0.010
branches/packages/vim/vim7.1/upstream/patches/7.0.011
branches/packages/vim/vim7.1/upstream/patches/7.0.012
branches/packages/vim/vim7.1/upstream/patches/7.0.013
branches/packages/vim/vim7.1/upstream/patches/7.0.014
branches/packages/vim/vim7.1/upstream/patches/7.0.015
branches/packages/vim/vim7.1/upstream/patches/7.0.016
branches/packages/vim/vim7.1/upstream/patches/7.0.017
branches/packages/vim/vim7.1/upstream/patches/7.0.018
branches/packages/vim/vim7.1/upstream/patches/7.0.019
branches/packages/vim/vim7.1/upstream/patches/7.0.020
branches/packages/vim/vim7.1/upstream/patches/7.0.021
branches/packages/vim/vim7.1/upstream/patches/7.0.022
branches/packages/vim/vim7.1/upstream/patches/7.0.023
branches/packages/vim/vim7.1/upstream/patches/7.0.024
branches/packages/vim/vim7.1/upstream/patches/7.0.025
branches/packages/vim/vim7.1/upstream/patches/7.0.026
branches/packages/vim/vim7.1/upstream/patches/7.0.027
branches/packages/vim/vim7.1/upstream/patches/7.0.028
branches/packages/vim/vim7.1/upstream/patches/7.0.029
branches/packages/vim/vim7.1/upstream/patches/7.0.030
branches/packages/vim/vim7.1/upstream/patches/7.0.031
branches/packages/vim/vim7.1/upstream/patches/7.0.032
branches/packages/vim/vim7.1/upstream/patches/7.0.033
branches/packages/vim/vim7.1/upstream/patches/7.0.034
branches/packages/vim/vim7.1/upstream/patches/7.0.035
branches/packages/vim/vim7.1/upstream/patches/7.0.036
branches/packages/vim/vim7.1/upstream/patches/7.0.037
branches/packages/vim/vim7.1/upstream/patches/7.0.038
branches/packages/vim/vim7.1/upstream/patches/7.0.039
branches/packages/vim/vim7.1/upstream/patches/7.0.040
branches/packages/vim/vim7.1/upstream/patches/7.0.041
branches/packages/vim/vim7.1/upstream/patches/7.0.042
branches/packages/vim/vim7.1/upstream/patches/7.0.043
branches/packages/vim/vim7.1/upstream/patches/7.0.044
branches/packages/vim/vim7.1/upstream/patches/7.0.045
branches/packages/vim/vim7.1/upstream/patches/7.0.046
branches/packages/vim/vim7.1/upstream/patches/7.0.047
branches/packages/vim/vim7.1/upstream/patches/7.0.048
branches/packages/vim/vim7.1/upstream/patches/7.0.049
branches/packages/vim/vim7.1/upstream/patches/7.0.050
branches/packages/vim/vim7.1/upstream/patches/7.0.051
branches/packages/vim/vim7.1/upstream/patches/7.0.052
branches/packages/vim/vim7.1/upstream/patches/7.0.053
branches/packages/vim/vim7.1/upstream/patches/7.0.054
branches/packages/vim/vim7.1/upstream/patches/7.0.055
branches/packages/vim/vim7.1/upstream/patches/7.0.056
branches/packages/vim/vim7.1/upstream/patches/7.0.057
branches/packages/vim/vim7.1/upstream/patches/7.0.058
branches/packages/vim/vim7.1/upstream/patches/7.0.059
branches/packages/vim/vim7.1/upstream/patches/7.0.060
branches/packages/vim/vim7.1/upstream/patches/7.0.061
branches/packages/vim/vim7.1/upstream/patches/7.0.062
branches/packages/vim/vim7.1/upstream/patches/7.0.063
branches/packages/vim/vim7.1/upstream/patches/7.0.064
branches/packages/vim/vim7.1/upstream/patches/7.0.065
branches/packages/vim/vim7.1/upstream/patches/7.0.066
branches/packages/vim/vim7.1/upstream/patches/7.0.067
branches/packages/vim/vim7.1/upstream/patches/7.0.068
branches/packages/vim/vim7.1/upstream/patches/7.0.069
branches/packages/vim/vim7.1/upstream/patches/7.0.070
branches/packages/vim/vim7.1/upstream/patches/7.0.071
branches/packages/vim/vim7.1/upstream/patches/7.0.072
branches/packages/vim/vim7.1/upstream/patches/7.0.073
branches/packages/vim/vim7.1/upstream/patches/7.0.074
branches/packages/vim/vim7.1/upstream/patches/7.0.075
branches/packages/vim/vim7.1/upstream/patches/7.0.076
branches/packages/vim/vim7.1/upstream/patches/7.0.077
branches/packages/vim/vim7.1/upstream/patches/7.0.078
branches/packages/vim/vim7.1/upstream/patches/7.0.079
branches/packages/vim/vim7.1/upstream/patches/7.0.080
branches/packages/vim/vim7.1/upstream/patches/7.0.081
branches/packages/vim/vim7.1/upstream/patches/7.0.082
branches/packages/vim/vim7.1/upstream/patches/7.0.083
branches/packages/vim/vim7.1/upstream/patches/7.0.084
branches/packages/vim/vim7.1/upstream/patches/7.0.085
branches/packages/vim/vim7.1/upstream/patches/7.0.086
branches/packages/vim/vim7.1/upstream/patches/7.0.087
branches/packages/vim/vim7.1/upstream/patches/7.0.088
branches/packages/vim/vim7.1/upstream/patches/7.0.089
branches/packages/vim/vim7.1/upstream/patches/7.0.090
branches/packages/vim/vim7.1/upstream/patches/7.0.091
branches/packages/vim/vim7.1/upstream/patches/7.0.092
branches/packages/vim/vim7.1/upstream/patches/7.0.093
branches/packages/vim/vim7.1/upstream/patches/7.0.094
branches/packages/vim/vim7.1/upstream/patches/7.0.095
branches/packages/vim/vim7.1/upstream/patches/7.0.096
branches/packages/vim/vim7.1/upstream/patches/7.0.097
branches/packages/vim/vim7.1/upstream/patches/7.0.098
branches/packages/vim/vim7.1/upstream/patches/7.0.099
branches/packages/vim/vim7.1/upstream/patches/7.0.100
branches/packages/vim/vim7.1/upstream/patches/7.0.101
branches/packages/vim/vim7.1/upstream/patches/7.0.102
branches/packages/vim/vim7.1/upstream/patches/7.0.103
branches/packages/vim/vim7.1/upstream/patches/7.0.104
branches/packages/vim/vim7.1/upstream/patches/7.0.105
branches/packages/vim/vim7.1/upstream/patches/7.0.106
branches/packages/vim/vim7.1/upstream/patches/7.0.107
branches/packages/vim/vim7.1/upstream/patches/7.0.108
branches/packages/vim/vim7.1/upstream/patches/7.0.109
branches/packages/vim/vim7.1/upstream/patches/7.0.110
branches/packages/vim/vim7.1/upstream/patches/7.0.111
branches/packages/vim/vim7.1/upstream/patches/7.0.112
branches/packages/vim/vim7.1/upstream/patches/7.0.113
branches/packages/vim/vim7.1/upstream/patches/7.0.114
branches/packages/vim/vim7.1/upstream/patches/7.0.115
branches/packages/vim/vim7.1/upstream/patches/7.0.116
branches/packages/vim/vim7.1/upstream/patches/7.0.117
branches/packages/vim/vim7.1/upstream/patches/7.0.118
branches/packages/vim/vim7.1/upstream/patches/7.0.119
branches/packages/vim/vim7.1/upstream/patches/7.0.120
branches/packages/vim/vim7.1/upstream/patches/7.0.121
branches/packages/vim/vim7.1/upstream/patches/7.0.122
branches/packages/vim/vim7.1/upstream/patches/7.0.123
branches/packages/vim/vim7.1/upstream/patches/7.0.124
branches/packages/vim/vim7.1/upstream/patches/7.0.125
branches/packages/vim/vim7.1/upstream/patches/7.0.126
branches/packages/vim/vim7.1/upstream/patches/7.0.127
branches/packages/vim/vim7.1/upstream/patches/7.0.128
branches/packages/vim/vim7.1/upstream/patches/7.0.129
branches/packages/vim/vim7.1/upstream/patches/7.0.130
branches/packages/vim/vim7.1/upstream/patches/7.0.131
branches/packages/vim/vim7.1/upstream/patches/7.0.132
branches/packages/vim/vim7.1/upstream/patches/7.0.133
branches/packages/vim/vim7.1/upstream/patches/7.0.134
branches/packages/vim/vim7.1/upstream/patches/7.0.135
branches/packages/vim/vim7.1/upstream/patches/7.0.136
branches/packages/vim/vim7.1/upstream/patches/7.0.137
branches/packages/vim/vim7.1/upstream/patches/7.0.138
branches/packages/vim/vim7.1/upstream/patches/7.0.139
branches/packages/vim/vim7.1/upstream/patches/7.0.140
branches/packages/vim/vim7.1/upstream/patches/7.0.141
branches/packages/vim/vim7.1/upstream/patches/7.0.142
branches/packages/vim/vim7.1/upstream/patches/7.0.143
branches/packages/vim/vim7.1/upstream/patches/7.0.144
branches/packages/vim/vim7.1/upstream/patches/7.0.145
branches/packages/vim/vim7.1/upstream/patches/7.0.146
branches/packages/vim/vim7.1/upstream/patches/7.0.147
branches/packages/vim/vim7.1/upstream/patches/7.0.148
branches/packages/vim/vim7.1/upstream/patches/7.0.149
branches/packages/vim/vim7.1/upstream/patches/7.0.150
branches/packages/vim/vim7.1/upstream/patches/7.0.151
branches/packages/vim/vim7.1/upstream/patches/7.0.152
branches/packages/vim/vim7.1/upstream/patches/7.0.153
branches/packages/vim/vim7.1/upstream/patches/7.0.154
branches/packages/vim/vim7.1/upstream/patches/7.0.155
branches/packages/vim/vim7.1/upstream/patches/7.0.156
branches/packages/vim/vim7.1/upstream/patches/7.0.157
branches/packages/vim/vim7.1/upstream/patches/7.0.158
branches/packages/vim/vim7.1/upstream/patches/7.0.159
branches/packages/vim/vim7.1/upstream/patches/7.0.160
branches/packages/vim/vim7.1/upstream/patches/7.0.161
branches/packages/vim/vim7.1/upstream/patches/7.0.162
branches/packages/vim/vim7.1/upstream/patches/7.0.163
branches/packages/vim/vim7.1/upstream/patches/7.0.164
branches/packages/vim/vim7.1/upstream/patches/7.0.165
branches/packages/vim/vim7.1/upstream/patches/7.0.166
branches/packages/vim/vim7.1/upstream/patches/7.0.167
branches/packages/vim/vim7.1/upstream/patches/7.0.168
branches/packages/vim/vim7.1/upstream/patches/7.0.169
branches/packages/vim/vim7.1/upstream/patches/7.0.170
branches/packages/vim/vim7.1/upstream/patches/7.0.171
branches/packages/vim/vim7.1/upstream/patches/7.0.172
branches/packages/vim/vim7.1/upstream/patches/7.0.173
branches/packages/vim/vim7.1/upstream/patches/7.0.174
branches/packages/vim/vim7.1/upstream/patches/7.0.175
branches/packages/vim/vim7.1/upstream/patches/7.0.176
branches/packages/vim/vim7.1/upstream/patches/7.0.177
branches/packages/vim/vim7.1/upstream/patches/7.0.178
branches/packages/vim/vim7.1/upstream/patches/7.0.179
branches/packages/vim/vim7.1/upstream/patches/7.0.180
branches/packages/vim/vim7.1/upstream/patches/7.0.181
branches/packages/vim/vim7.1/upstream/patches/7.0.182
branches/packages/vim/vim7.1/upstream/patches/7.0.183
branches/packages/vim/vim7.1/upstream/patches/7.0.184
branches/packages/vim/vim7.1/upstream/patches/7.0.185
branches/packages/vim/vim7.1/upstream/patches/7.0.186
branches/packages/vim/vim7.1/upstream/patches/7.0.187
branches/packages/vim/vim7.1/upstream/patches/7.0.188
branches/packages/vim/vim7.1/upstream/patches/7.0.189
branches/packages/vim/vim7.1/upstream/patches/7.0.190
branches/packages/vim/vim7.1/upstream/patches/7.0.191
branches/packages/vim/vim7.1/upstream/patches/7.0.192
branches/packages/vim/vim7.1/upstream/patches/7.0.193
branches/packages/vim/vim7.1/upstream/patches/7.0.194
branches/packages/vim/vim7.1/upstream/patches/7.0.195
branches/packages/vim/vim7.1/upstream/patches/7.0.196
branches/packages/vim/vim7.1/upstream/patches/7.0.197
branches/packages/vim/vim7.1/upstream/patches/7.0.198
branches/packages/vim/vim7.1/upstream/patches/7.0.199
branches/packages/vim/vim7.1/upstream/patches/7.0.200
branches/packages/vim/vim7.1/upstream/patches/7.0.201
branches/packages/vim/vim7.1/upstream/patches/7.0.202
branches/packages/vim/vim7.1/upstream/patches/7.0.203
branches/packages/vim/vim7.1/upstream/patches/7.0.204
branches/packages/vim/vim7.1/upstream/patches/7.0.205
branches/packages/vim/vim7.1/upstream/patches/7.0.206
branches/packages/vim/vim7.1/upstream/patches/7.0.207
branches/packages/vim/vim7.1/upstream/patches/7.0.208
branches/packages/vim/vim7.1/upstream/patches/7.0.209
branches/packages/vim/vim7.1/upstream/patches/7.0.210
branches/packages/vim/vim7.1/upstream/patches/7.0.211
branches/packages/vim/vim7.1/upstream/patches/7.0.212
branches/packages/vim/vim7.1/upstream/patches/7.0.213
branches/packages/vim/vim7.1/upstream/patches/7.0.214
branches/packages/vim/vim7.1/upstream/patches/7.0.215
branches/packages/vim/vim7.1/upstream/patches/7.0.216
branches/packages/vim/vim7.1/upstream/patches/7.0.217
branches/packages/vim/vim7.1/upstream/patches/7.0.218
branches/packages/vim/vim7.1/upstream/patches/7.0.219
branches/packages/vim/vim7.1/upstream/patches/7.0.220
branches/packages/vim/vim7.1/upstream/patches/7.0.221
branches/packages/vim/vim7.1/upstream/patches/7.0.222
branches/packages/vim/vim7.1/upstream/patches/7.0.223
branches/packages/vim/vim7.1/upstream/patches/7.0.224
branches/packages/vim/vim7.1/upstream/patches/7.0.225
branches/packages/vim/vim7.1/upstream/patches/7.0.226
branches/packages/vim/vim7.1/upstream/patches/7.0.227
branches/packages/vim/vim7.1/upstream/patches/7.0.228
branches/packages/vim/vim7.1/upstream/patches/7.0.229
branches/packages/vim/vim7.1/upstream/patches/7.0.230
branches/packages/vim/vim7.1/upstream/patches/7.0.231
branches/packages/vim/vim7.1/upstream/patches/7.0.232
branches/packages/vim/vim7.1/upstream/patches/7.0.233
branches/packages/vim/vim7.1/upstream/patches/7.0.234
branches/packages/vim/vim7.1/upstream/patches/7.0.235
branches/packages/vim/vim7.1/upstream/patches/7.0.236
Modified:
branches/packages/vim/vim7.1/debian/changelog
branches/packages/vim/vim7.1/debian/rules
branches/packages/vim/vim7.1/patches/dosini.vim-hash_comment.diff
branches/packages/vim/vim7.1/patches/php.vim.diff
branches/packages/vim/vim7.1/patches/series
branches/packages/vim/vim7.1/upstream/patches/get_patches.py
Modified: branches/packages/vim/vim7.1/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/branches/packages/vim/vim7.1/debian/changelog?rev=933&op=diff
==============================================================================
--- branches/packages/vim/vim7.1/debian/changelog (original)
+++ branches/packages/vim/vim7.1/debian/changelog Fri May 11 22:27:08 2007
@@ -1,17 +1,40 @@
-vim (1:7.0-236+1) UNRELEASED; urgency=low
+vim (1:7.1~b-002+1) experimental; urgency=low
[ Debian Vim Maintainers ]
- * New upstream patches (220 - 236), see README.gz for details.
+ * New upstream beta release (7.1b)
+ * New upstream patches (001 - 002), see README.gz for details.
[ James Vega ]
- * patches/debchangelog.vim.diff:
- + Call foldopen silently so Vim doesn't error if there are no folds.
- (Closes: #416184)
- + Allow users to let g:debchangelog_fold_disabled to disable automatic
- folding of debchangelogs. 'foldexpr' and 'foldtext' will still be set
- but 'foldmethod' will not be changed to 'expr'.
-
- -- Stefano Zacchiroli <zack at debian.org> Tue, 01 May 2007 14:53:02 +0200
+ * debian/rules:
+ + Adjust version variables to take into account snapshots
+ + Remove extraneous update-snapshot target since snapshots are being
+ handled similar to normal releases, but in a different directory on the
+ ftp server.
+ * upstream/patches:
+ + Remove all the 7.0 patches
+ + Update get_patches.py to look in the proper spot for snapshots. This
+ will currently have to be updated for each new 'major' snapshot (7.1a,
+ 7.1b, etc).
+ * Removed patches:
+ + de.po.diff, applied upstream.
+ + zsh.vim-nested_quotes.diff, New upstream rewrite fixes the same problem
+ as our patch.
+ + mp.vim-cmd_check.diff, applied upstream.
+ + html.vim-syntax_spell.diff, applied upstream.
+ + changelog.vim-ftplugin_buffer-split.diff, applied upstream.
+ + netrw.vim-tmpfile_suffix_escape.diff, applied upstream.
+ * Refreshed patches:
+ + php.vim.diff, simple rediff against new upstream.
+ + dosini.vim-hash_comment.diff, simple rediff against new upstream.
+ * Updated patches:
+ + debchangelog-ftplugin.diff
+ - Call foldopen silently so Vim doesn't error if there are no folds.
+ (Closes: #416184)
+ - Allow users to "let g:debchangelog_fold_disabled" to disable automatic
+ folding of debchangelogs. 'foldexpr' and 'foldtext' will still be set
+ but 'foldmethod' will not be set to 'expr'.
+
+ -- James Vega <jamessan at debian.org> Fri, 11 May 2007 15:27:39 -0400
vim (1:7.0-219+1) unstable; urgency=low
Modified: branches/packages/vim/vim7.1/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vim/branches/packages/vim/vim7.1/debian/rules?rev=933&op=diff
==============================================================================
--- branches/packages/vim/vim7.1/debian/rules (original)
+++ branches/packages/vim/vim7.1/debian/rules Fri May 11 22:27:08 2007
@@ -163,14 +163,14 @@
CFGFLAGS_vim-full=$(CFGFLAGS) $(OPTFLAGS) $(GUIFLAGS) $(GNOMEFLAGS) $(ALLINTERPFLAGS)
NAME=vim
-VERSION=7.0
-DEBVERSION=$(VERSION)
+VERSION=7.1
+SNAPSHOT=b
VIMCUR=$(NAME)$(subst .,,$(VERSION))
-SRCDIR=$(VIMCUR)
+SRCDIR=$(VIMCUR)$(SNAPSHOT)
CHANGELOG=$(SRCDIR)/runtime/doc/version7.txt # latest version upstream changelog
-MAIN_TARBALL=$(NAME)-$(VERSION).tar.bz2
-LANG_TARBALL=$(NAME)-$(VERSION)-lang.tar.gz
-EXTRA_TARBALL=$(NAME)-$(VERSION)-extra.tar.gz
+MAIN_TARBALL=$(NAME)-$(VERSION)$(SNAPSHOT).tar.bz2
+LANG_TARBALL=$(NAME)-$(VERSION)$(SNAPSHOT)-lang.tar.gz
+EXTRA_TARBALL=$(NAME)-$(VERSION)$(SNAPSHOT)-extra.tar.gz
SOURCES = $(MAIN_TARBALL) $(LANG_TARBALL) $(EXTRA_TARBALL)
PER_VARIANT_FILES = install postinst prerm links preinst
LANGS += fr fr.ISO8859-1 fr.UTF-8
@@ -192,7 +192,7 @@
extract: extract-stamp
extract-stamp: $(foreach s,$(SOURCES),extract-stamp-$(s))
- if [ ! -L vim -o "`readlink vim`" != "$(VIMCUR)" ]; then \
+ if [ ! -L vim -o "`readlink vim`" != "$(SRCDIR)" ]; then \
ln -fs $(SRCDIR) vim; \
fi
@for f in `find upstream/patches -type f -name '$(VERSION).*' -printf "%P\n" | grep -v .svn | sort -n` ; do\
@@ -201,21 +201,6 @@
done
quilt push -a
touch $@
-
-# {{{1 hackish way of updating to latest unstable snapshot
-# XXX Zack: should this be removed and/or ported to svn-buildpackage?
-updatesnapshot:
- zipurl=`uscan --report | tail -2 | head -1` \
- && test ! -z "$$zipurl" \
- && zipbasename=`basename $$zipurl` \
- && wget -O upstream/tarballs/$$zipbasename $$zipurl \
- && 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
-# }}}
extract-stamp-%.bz2:
bunzip2 -c upstream/tarballs/$(*).bz2 | tar -x
@@ -335,9 +320,9 @@
rm -f $$f; \
done
# rm C part of maze (no longer working)
- rm -f $(DESTDIR)/usr/share/vim/$(VIMCUR)/macros/maze/{*.c,Makefile}
+ rm -f $(DESTDIR)/usr/share/vim/$(SRCDIR)/macros/maze/{*.c,Makefile}
# fix for CAN-2005-0069
- rm -f $(DESTDIR)/usr/share/vim/$(VIMCUR)/tools/vimspell.*
+ rm -f $(DESTDIR)/usr/share/vim/$(SRCDIR)/tools/vimspell.*
# helpztags manpage
pod2man -c "User Commands" -s 1 -q none -r "vim 7.0aa" \
-d "September 2003" debian/helpztags debian/helpztags.1
@@ -469,7 +454,7 @@
dh_clean
%: %.in
- cat $< | sed 's/@VIMCUR@/$(VIMCUR)/' > $@
+ cat $< | sed 's/@VIMCUR@/$(SRCDIR)/' > $@
binary-indep: export DH_OPTIONS=-i
binary-indep: build install
Copied: branches/packages/vim/vim7.1/patches/debchangelog-ftplugin.vim.diff (from r932, branches/packages/vim/vim7.1/patches/debchangelog.vim.diff)
URL: http://svn.debian.org/wsvn/pkg-vim/branches/packages/vim/vim7.1/patches/debchangelog-ftplugin.vim.diff?rev=933&op=diff
==============================================================================
--- branches/packages/vim/vim7.1/patches/debchangelog.vim.diff (original)
+++ branches/packages/vim/vim7.1/patches/debchangelog-ftplugin.vim.diff Fri May 11 22:27:08 2007
@@ -6,7 +6,7 @@
" 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-08-24 23:41:26 +0200 (gio, 24 ago 2006) $
+" Last Change: $LastChangedDate: 2007-04-10 08:54:47 -0400 (Tue, 10 Apr 2007) $
" 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
@@ -14,8 +14,7 @@
if exists("b:did_ftplugin")
finish
endif
--let b:did_ftplugin = 1
-+let b:did_ftplugin=1
+ let b:did_ftplugin=1
" {{{1 Local settings (do on every load)
-setlocal foldmethod=expr
@@ -33,39 +32,6 @@
" Clean unloading
let b:undo_ftplugin = "setlocal tw< comments< foldmethod< foldexpr< foldtext<"
-@@ -227,21 +229,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
@@ -260,6 +263,8 @@
return '='
endfunction
Modified: branches/packages/vim/vim7.1/patches/dosini.vim-hash_comment.diff
URL: http://svn.debian.org/wsvn/pkg-vim/branches/packages/vim/vim7.1/patches/dosini.vim-hash_comment.diff?rev=933&op=diff
==============================================================================
--- branches/packages/vim/vim7.1/patches/dosini.vim-hash_comment.diff (original)
+++ branches/packages/vim/vim7.1/patches/dosini.vim-hash_comment.diff Fri May 11 22:27:08 2007
@@ -2,10 +2,10 @@
===================================================================
--- vim/runtime/syntax/dosini.vim.orig
+++ vim/runtime/syntax/dosini.vim
-@@ -17,7 +17,7 @@
+@@ -19,7 +19,7 @@
syn match dosiniLabel "^.\{-}="
- syn region dosiniHeader start="\[" end="\]"
+ syn region dosiniHeader start="^\[" end="\]"
-syn match dosiniComment "^;.*$"
+syn match dosiniComment "^[;#].*$"
Modified: branches/packages/vim/vim7.1/patches/php.vim.diff
URL: http://svn.debian.org/wsvn/pkg-vim/branches/packages/vim/vim7.1/patches/php.vim.diff?rev=933&op=diff
==============================================================================
--- branches/packages/vim/vim7.1/patches/php.vim.diff (original)
+++ branches/packages/vim/vim7.1/patches/php.vim.diff Fri May 11 22:27:08 2007
@@ -3,11 +3,11 @@
--- vim/runtime/syntax/php.vim.orig
+++ vim/runtime/syntax/php.vim
@@ -146,7 +146,7 @@
- syn keyword phpFunctions fbsql_affected_rows fbsql_autocommit fbsql_change_user fbsql_close fbsql_commit fbsql_connect fbsql_create_blob fbsql_create_clob fbsql_create_db fbsql_data_seek fbsql_database_password fbsql_database fbsql_db_query fbsql_db_status fbsql_drop_db fbsql_errno fbsql_error fbsql_fetch_array fbsql_fetch_assoc fbsql_fetch_field fbsql_fetch_lengths fbsql_fetch_object fbsql_fetch_row fbsql_field_flags fbsql_field_len fbsql_field_name fbsql_field_seek fbsql_field_table fbsql_field_type fbsql_free_result fbsql_get_autostart_info fbsql_hostname fbsql_insert_id fbsql_list_dbs fbsql_list_fields fbsql_list_tables fbsql_next_result fbsql_num_fields fbsql_num_rows fbsql_password fbsql_pconnect fbsql_query fbsql_read_blob fbsql_read_clob fbsql_result fbsql_rollback fbsql_select_db fbsql_set_lob_mode fbsql_set_transaction fbsql_start_db fbsql_stop_db fbsql_tablename fbsql_username fbsql_warnings contained
- syn keyword phpFunctions fdf_add_doc_javascript fdf_add_template fdf_close fdf_create fdf_enum_values fdf_errno fdf_error fdf_get_ap fdf_get_attachment fdf_get_encoding fdf_get_file fdf_get_flags fdf_get_opt fdf_get_status fdf_get_value fdf_get_version fdf_header fdf_next_field_name fdf_open_string fdf_open fdf_remove_item fdf_save_string fdf_save fdf_set_ap fdf_set_encoding fdf_set_file fdf_set_flags fdf_set_javascript_action fdf_set_opt fdf_set_status fdf_set_submit_form_action fdf_set_target_frame fdf_set_value fdf_set_version contained
- syn keyword phpFunctions filepro_fieldcount filepro_fieldname filepro_fieldtype filepro_fieldwidth filepro_retrieve filepro_rowcount filepro contained
--syn keyword phpFunctions basename chgrp chmod chown clearstatcache copy delete dirname disk_free_space disk_total_space diskfreespace fclose feof fflush fgetc fgetcsv fgets fgetss file_exists file_get_contents file_put_contents file fileatime filectime filegroup fileinode filemtime fileowner fileperms filesize filetype flock fnmatch fopen fpassthru fputs fread fscanf fseek fstat ftell ftruncate fwrite glob is_dir is_executable is_file is_link is_readable is_uploaded_file is_writable is_writeable link linkinfo lstat mkdir move_uploaded_file parse_ini_file pathinfo pclose popen readfile readlink realpath rename rewind rmdir set_file_buffer stat symlink tempnam tmpfile touch umask unlink contained
-+syn keyword phpFunctions basename chgrp chmod chown clearstatcache copy dirname disk_free_space disk_total_space diskfreespace fclose feof fflush fgetc fgetcsv fgets fgetss file_exists file_get_contents file_put_contents file fileatime filectime filegroup fileinode filemtime fileowner fileperms filesize filetype flock fnmatch fopen fpassthru fputs fread fscanf fseek fstat ftell ftruncate fwrite glob is_dir is_executable is_file is_link is_readable is_uploaded_file is_writable is_writeable link linkinfo lstat mkdir move_uploaded_file parse_ini_file pathinfo pclose popen readfile readlink realpath rename rewind rmdir set_file_buffer stat symlink tempnam tmpfile touch umask unlink contained
- syn keyword phpFunctions fribidi_log2vis contained
- syn keyword phpFunctions ftp_alloc ftp_cdup ftp_chdir ftp_chmod ftp_close ftp_connect ftp_delete ftp_exec ftp_fget ftp_fput ftp_get_option ftp_get ftp_login ftp_mdtm ftp_mkdir ftp_nb_continue ftp_nb_fget ftp_nb_fput ftp_nb_get ftp_nb_put ftp_nlist ftp_pasv ftp_put ftp_pwd ftp_quit ftp_raw ftp_rawlist ftp_rename ftp_rmdir ftp_set_option ftp_site ftp_size ftp_ssl_connect ftp_systype contained
- syn keyword phpFunctions call_user_func_array call_user_func create_function func_get_arg func_get_args func_num_args function_exists get_defined_functions register_shutdown_function register_tick_function unregister_tick_function contained
+ syn keyword phpFunctions fbsql_affected_rows fbsql_autocommit fbsql_change_user fbsql_close fbsql_commit fbsql_connect fbsql_create_blob fbsql_create_clob fbsql_create_db fbsql_data_seek fbsql_database_password fbsql_database fbsql_db_query fbsql_db_status fbsql_drop_db fbsql_errno fbsql_error fbsql_fetch_array fbsql_fetch_assoc fbsql_fetch_field fbsql_fetch_lengths fbsql_fetch_object fbsql_fetch_row fbsql_field_flags fbsql_field_len fbsql_field_name fbsql_field_seek fbsql_field_table fbsql_field_type fbsql_free_result fbsql_get_autostart_info fbsql_hostname fbsql_insert_id fbsql_list_dbs fbsql_list_fields fbsql_list_tables fbsql_next_result fbsql_num_fields fbsql_num_rows fbsql_password fbsql_pconnect fbsql_query fbsql_read_blob fbsql_read_clob fbsql_result fbsql_rollback fbsql_select_db fbsql_set_lob_mode fbsql_set_transaction fbsql_start_db fbsql_stop_db fbsql_tablename fbsql_username fbsql_warnings contained
+ syn keyword phpFunctions fdf_add_doc_javascript fdf_add_template fdf_close fdf_create fdf_enum_values fdf_errno fdf_error fdf_get_ap fdf_get_attachment fdf_get_encoding fdf_get_file fdf_get_flags fdf_get_opt fdf_get_status fdf_get_value fdf_get_version fdf_header fdf_next_field_name fdf_open_string fdf_open fdf_remove_item fdf_save_string fdf_save fdf_set_ap fdf_set_encoding fdf_set_file fdf_set_flags fdf_set_javascript_action fdf_set_opt fdf_set_status fdf_set_submit_form_action fdf_set_target_frame fdf_set_value fdf_set_version contained
+ syn keyword phpFunctions filepro_fieldcount filepro_fieldname filepro_fieldtype filepro_fieldwidth filepro_retrieve filepro_rowcount filepro contained
+-syn keyword phpFunctions basename chgrp chmod chown clearstatcache copy delete dirname disk_free_space disk_total_space diskfreespace fclose feof fflush fgetc fgetcsv fgets fgetss file_exists file_get_contents file_put_contents file fileatime filectime filegroup fileinode filemtime fileowner fileperms filesize filetype flock fnmatch fopen fpassthru fputs fread fscanf fseek fstat ftell ftruncate fwrite glob is_dir is_executable is_file is_link is_readable is_uploaded_file is_writable is_writeable link linkinfo lstat mkdir move_uploaded_file parse_ini_file pathinfo pclose popen readfile readlink realpath rename rewind rmdir set_file_buffer stat symlink tempnam tmpfile touch umask unlink contained
++syn keyword phpFunctions basename chgrp chmod chown clearstatcache copy dirname disk_free_space disk_total_space diskfreespace fclose feof fflush fgetc fgetcsv fgets fgetss file_exists file_get_contents file_put_contents file fileatime filectime filegroup fileinode filemtime fileowner fileperms filesize filetype flock fnmatch fopen fpassthru fputs fread fscanf fseek fstat ftell ftruncate fwrite glob is_dir is_executable is_file is_link is_readable is_uploaded_file is_writable is_writeable link linkinfo lstat mkdir move_uploaded_file parse_ini_file pathinfo pclose popen readfile readlink realpath rename rewind rmdir set_file_buffer stat symlink tempnam tmpfile touch umask unlink contained
+ syn keyword phpFunctions fribidi_log2vis contained
+ syn keyword phpFunctions ftp_alloc ftp_cdup ftp_chdir ftp_chmod ftp_close ftp_connect ftp_delete ftp_exec ftp_fget ftp_fput ftp_get_option ftp_get ftp_login ftp_mdtm ftp_mkdir ftp_nb_continue ftp_nb_fget ftp_nb_fput ftp_nb_get ftp_nb_put ftp_nlist ftp_pasv ftp_put ftp_pwd ftp_quit ftp_raw ftp_rawlist ftp_rename ftp_rmdir ftp_set_option ftp_site ftp_size ftp_ssl_connect ftp_systype contained
+ syn keyword phpFunctions call_user_func_array call_user_func create_function func_get_arg func_get_args func_num_args function_exists get_defined_functions register_shutdown_function register_tick_function unregister_tick_function contained
Modified: branches/packages/vim/vim7.1/patches/series
URL: http://svn.debian.org/wsvn/pkg-vim/branches/packages/vim/vim7.1/patches/series?rev=933&op=diff
==============================================================================
--- branches/packages/vim/vim7.1/patches/series (original)
+++ branches/packages/vim/vim7.1/patches/series Fri May 11 22:27:08 2007
@@ -3,18 +3,12 @@
po.vim.diff -p0
python.vim-ftplugin_include.diff -p0
mysql.vim-syntax_comment.diff -p0
-debchangelog.vim.diff -p0
+debchangelog-ftplugin.vim.diff -p0
scripts.vim.diff -p0
php.vim.diff -p0
-de.po.diff -p0
filetype.vim-better_tex_vs_plaintex.diff -p0
perl.vim-ftplugin_perldoc.diff -p0
ruby.vim-ftplugin_ri.diff -p0
python.vim-ftplugin_pydoc.diff -p0
-zsh.vim-nested_quotes.diff -p0
-mp.vim-cmd_check.diff -p0
dosini.vim-hash_comment.diff -p0
-html.vim-syntax_spell.diff -p0
-changelog.vim-ftplugin_buffer-split.diff -p0
zh_TW.po-swap_recovery_typo.diff -p0
-netrw.vim-tmpfile_suffix_escape.diff -p0
Added: branches/packages/vim/vim7.1/upstream/patches/7.1b.001
URL: http://svn.debian.org/wsvn/pkg-vim/branches/packages/vim/vim7.1/upstream/patches/7.1b.001?rev=933&op=file
==============================================================================
--- branches/packages/vim/vim7.1/upstream/patches/7.1b.001 (added)
+++ branches/packages/vim/vim7.1/upstream/patches/7.1b.001 Fri May 11 22:27:08 2007
@@ -1,0 +1,47 @@
+To: vim-dev at vim.org
+Subject: patch 7.1b.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 7.1b.001 (extra)
+Problem: Random text in a source file. No idea how it got there.
+Solution: Delete the text.
+Files: src/gui_w32.c
+
+
+*** ../vim-7.1b.000/src/gui_w32.c Thu May 10 20:18:47 2007
+--- src/gui_w32.c Thu May 10 22:03:22 2007
+***************
+*** 1,4 ****
+! s, if any./* vi:set ts=8 sts=4 sw=4:
+ *
+ * VIM - Vi IMproved by Bram Moolenaar
+ * GUI support by Robert Webb
+--- 1,4 ----
+! /* vi:set ts=8 sts=4 sw=4:
+ *
+ * VIM - Vi IMproved by Bram Moolenaar
+ * GUI support by Robert Webb
+*** ../vim-7.1b.000/src/version.c Thu May 10 20:25:06 2007
+--- src/version.c Thu May 10 22:18:04 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 1,
+ /**/
+
+--
+From "know your smileys":
+ <|-) Chinese
+ <|-( Chinese and doesn't like these kind of jokes
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ download, build and distribute -- http://www.A-A-P.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
Added: branches/packages/vim/vim7.1/upstream/patches/7.1b.002
URL: http://svn.debian.org/wsvn/pkg-vim/branches/packages/vim/vim7.1/upstream/patches/7.1b.002?rev=933&op=file
==============================================================================
--- branches/packages/vim/vim7.1/upstream/patches/7.1b.002 (added)
+++ branches/packages/vim/vim7.1/upstream/patches/7.1b.002 Fri May 11 22:27:08 2007
@@ -1,0 +1,72 @@
+To: vim-dev at vim.org
+Subject: patch 7.1b.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 7.1b.002
+Problem: When 'maxmem' is large there can be an overflow in computations.
+ (Thomas Wiegner)
+Solution: Use the same mechanism as in mch_total_mem(): first reduce the
+ multiplier as much as possible.
+Files: src/memfile.c
+
+
+*** ../vim-7.1b.001/src/memfile.c Thu May 10 21:17:23 2007
+--- src/memfile.c Fri May 11 19:50:12 2007
+***************
+*** 190,196 ****
+ mfp->mf_blocknr_min = -1;
+ mfp->mf_neg_count = 0;
+ mfp->mf_infile_count = mfp->mf_blocknr_max;
+! mfp->mf_used_count_max = p_mm * 1024 / mfp->mf_page_size;
+
+ return mfp;
+ }
+--- 190,214 ----
+ mfp->mf_blocknr_min = -1;
+ mfp->mf_neg_count = 0;
+ mfp->mf_infile_count = mfp->mf_blocknr_max;
+!
+! /*
+! * Compute maximum number of pages ('maxmem' is in Kbyte):
+! * 'mammem' * 1Kbyte / page-size-in-bytes.
+! * Avoid overflow by first reducing page size as much as possible.
+! */
+! {
+! int shift = 10;
+! unsigned page_size = mfp->mf_page_size;
+!
+! while (shift > 0 && (page_size & 1) == 0)
+! {
+! page_size = page_size >> 1;
+! --shift;
+! }
+! mfp->mf_used_count_max = (p_mm << shift) / page_size;
+! if (mfp->mf_used_count_max < 10)
+! mfp->mf_used_count_max = 10;
+! }
+
+ return mfp;
+ }
+*** ../vim-7.1b.001/src/version.c Thu May 10 22:19:40 2007
+--- src/version.c Fri May 11 20:09:22 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 2,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+99. The hum of a cooling fan and the click of keys is comforting to you.
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ download, build and distribute -- http://www.A-A-P.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
Modified: branches/packages/vim/vim7.1/upstream/patches/get_patches.py
URL: http://svn.debian.org/wsvn/pkg-vim/branches/packages/vim/vim7.1/upstream/patches/get_patches.py?rev=933&op=diff
==============================================================================
--- branches/packages/vim/vim7.1/upstream/patches/get_patches.py (original)
+++ branches/packages/vim/vim7.1/upstream/patches/get_patches.py Fri May 11 22:27:08 2007
@@ -10,7 +10,7 @@
# $Id$
host='ftp.vim.org'
-dir='pub/vim/patches/7.0'
+dir='pub/vim/unstable/patches/7.1b'
import os
import re
@@ -18,7 +18,7 @@
from ftplib import FTP
-patch_RE = re.compile(r'^\d+\.\d+\.\d+$')
+patch_RE = re.compile(r'^\d+\.\d+[a-z]+\.\d+$')
print 'connecting to %s' % host
More information about the pkg-vim-maintainers
mailing list