r855 - in /tags/packages/vim/1:7.0-122+1.etch1: ./ debian/ patches/
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Fri Jan 19 14:47:40 UTC 2007
Author: jamessan
Date: Fri Jan 19 15:47:39 2007
New Revision: 855
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=855
Log:
Initial attempt at a 1:7.0-122+1.etch1 build.
Added:
tags/packages/vim/1:7.0-122+1.etch1/
- copied from r807, tags/packages/vim/1:7.0-122+1/
tags/packages/vim/1:7.0-122+1.etch1/debian/vim-runtime.postinst
- copied unchanged from r817, trunk/packages/vim/debian/vim-runtime.postinst
tags/packages/vim/1:7.0-122+1.etch1/debian/vim-runtime.postrm
- copied unchanged from r817, trunk/packages/vim/debian/vim-runtime.postrm
tags/packages/vim/1:7.0-122+1.etch1/patches/changelog.vim-ftplugin_buffer-split.diff
- copied unchanged from r791, trunk/packages/vim/patches/changelog.vim-ftplugin_buffer-split.diff
tags/packages/vim/1:7.0-122+1.etch1/patches/option.c-foldnestmax_check.diff
tags/packages/vim/1:7.0-122+1.etch1/patches/zh_TW.po-swap_recovery_typo.diff
- copied unchanged from r796, trunk/packages/vim/patches/zh_TW.po-swap_recovery_typo.diff
Removed:
tags/packages/vim/1:7.0-122+1.etch1/debian/vim-variant.postrm
Modified:
tags/packages/vim/1:7.0-122+1.etch1/debian/changelog
tags/packages/vim/1:7.0-122+1.etch1/debian/control
tags/packages/vim/1:7.0-122+1.etch1/debian/rules
tags/packages/vim/1:7.0-122+1.etch1/debian/vim-common.links.in
tags/packages/vim/1:7.0-122+1.etch1/debian/vim-variant.postinst
tags/packages/vim/1:7.0-122+1.etch1/debian/vim-variant.preinst
tags/packages/vim/1:7.0-122+1.etch1/patches/series
Modified: tags/packages/vim/1:7.0-122+1.etch1/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/tags/packages/vim/1%3A7.0-122%2B1.etch1/debian/changelog?rev=855&op=diff
==============================================================================
--- tags/packages/vim/1:7.0-122+1.etch1/debian/changelog (original)
+++ tags/packages/vim/1:7.0-122+1.etch1/debian/changelog Fri Jan 19 15:47:39 2007
@@ -1,3 +1,36 @@
+vim (1:7.0-122+1.etch1) testing-proposed-updates; urgency=low
+
+ [ James Vega ]
+ * debian/vim-variant.preinst:
+ + Move diversion removal here from vim-variant.postinst. Manually remove
+ /usr/bin/vim in order to be able to remove the diversion. Fixes
+ upgrades from Sarge leaving behind stale binaries.
+ + Remove the alternatives for ru.{UTF-8,KOI8-R} manpages so the
+ alternatives system doesn't attempt to keep the links around after the
+ upgrade.
+ * Move the Russian KOI8-R man pages to /usr/share/man/ru/man1 and remove the
+ utf8 man pages. man will handle the conversion.
+ * Add vim-runtime.postinst which runs helpztags so that we don't break the
+ help for other Vim addons everytime vim-runtime is upgraded. Remove tag
+ generation from debian/rules. Remove tags file in vim-runtime.postrm.
+ * Bump vim-common's priority to important to match the override.
+ * Update the vim-basic install target in debian/rules to not rely on the
+ vimcurrent symlink before it has been setup.
+ * Add patch changelog.vim-ftplugin_split-buffer.diff, which corrects an
+ invalid command used for opening the changelog in a split window.
+ * Add patch option.c-foldnestmax_check.diff, which prevents Vim from hanging
+ if the user tries to set 'foldnestmax' to a negative number.
+
+ [ Stefano Zacchiroli ]
+ * Added patch zh_TW.po-swap_recovery_typo.diff which fixes a typo in a
+ traditional Chinese message when editing a file for which a swap file
+ already exists.
+ * debian/control
+ - renamed svn info field to XS-Vcs-Svn, to match the forthcoming official
+ name
+
+ -- James Vega <jamessan at debian.org> Mon, 15 Jan 2007 00:09:44 -0500
+
vim (1:7.0-122+1) unstable; urgency=medium
[ Debian Vim Maintainers ]
Modified: tags/packages/vim/1:7.0-122+1.etch1/debian/control
URL: http://svn.debian.org/wsvn/pkg-vim/tags/packages/vim/1%3A7.0-122%2B1.etch1/debian/control?rev=855&op=diff
==============================================================================
--- tags/packages/vim/1:7.0-122+1.etch1/debian/control (original)
+++ tags/packages/vim/1:7.0-122+1.etch1/debian/control Fri Jan 19 15:47:39 2007
@@ -6,10 +6,10 @@
Standards-Version: 3.7.2
Build-Depends: debhelper (>= 4.2.21), dpkg (>> 1.7.0), dpkg-dev (>= 1.13.19), bzip2, perl (>= 5.6), libgpmg1-dev [!hurd-i386] | not+linux-gnu, libperl-dev (>= 5.6), tcl8.4-dev [!hurd-i386], python-dev, libxpm-dev, libncurses5-dev, ruby, ruby1.8-dev, libgtk2.0-dev (>= 2.2), libgnomeui-dev [!hurd-i386], lesstif2-dev, quilt, make (>= 3.80+3.81.b4)
Build-Conflicts: libperl-dev (= 5.8.4-1)
-XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-vim/trunk/packages/vim
+XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-vim/trunk/packages/vim
Package: vim-common
-Priority: optional
+Priority: important
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)
Modified: tags/packages/vim/1:7.0-122+1.etch1/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vim/tags/packages/vim/1%3A7.0-122%2B1.etch1/debian/rules?rev=855&op=diff
==============================================================================
--- tags/packages/vim/1:7.0-122+1.etch1/debian/rules (original)
+++ tags/packages/vim/1:7.0-122+1.etch1/debian/rules Fri Jan 19 15:47:39 2007
@@ -173,11 +173,11 @@
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 preinst
+PER_VARIANT_FILES = install postinst 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
-LANGS += ru.KOI8-R ru.UTF-8
+LANGS += ru
DOT_IN_DEPS = debian/vim-runtime.install
DOT_IN_DEPS += debian/vim-runtime.install
@@ -344,6 +344,13 @@
# DEBIAN INSTALLATION
+ # According to #368754 and #323820, Russian manpages should be in
+ # /usr/share/man/ru (KOI8-R encoded) and man will handle the
+ # transcoding
+ mv $(DESTDIR)/usr/share/man/ru{.KOI8-R,}
+ # Remove this so the dh_install later doesn't fail
+ rm -rf $(DESTDIR)/usr/share/man/ru.UTF-8
+
# disabled, waiting for an update
#cp debian/vim-install $(DESTDIR)/usr/bin
mv $(DESTDIR)/usr/bin/{vim,vim.basic} # use variant name
@@ -353,9 +360,9 @@
rm -f $$f; \
done
# rm C part of maze (no longer working)
- rm -f $(DESTDIR)/usr/share/vim/vimcurrent/macros/maze/{*.c,Makefile}
+ rm -f $(DESTDIR)/usr/share/vim/$(VIMCUR)/macros/maze/{*.c,Makefile}
# fix for CAN-2005-0069
- rm -f $(DESTDIR)/usr/share/vim/vimcurrent/tools/vimspell.*
+ rm -f $(DESTDIR)/usr/share/vim/$(VIMCUR)/tools/vimspell.*
# helpztags manpage
pod2man -c "User Commands" -s 1 -q none -r "vim 7.0aa" \
-d "September 2003" debian/helpztags debian/helpztags.1
@@ -432,9 +439,6 @@
usr/share/man/$$L/man1/eview.1 >>debian/vim-gui-common.links; \
done
dh_link
-
- # Generate helptags for any docs in /usr/share/vim/addons/doc
- perl debian/vim-common/usr/bin/helpztags debian/vim-runtime/usr/share/vim/addons/doc
# all excepts vim
dh_installchangelogs -Nvim
Modified: tags/packages/vim/1:7.0-122+1.etch1/debian/vim-common.links.in
URL: http://svn.debian.org/wsvn/pkg-vim/tags/packages/vim/1%3A7.0-122%2B1.etch1/debian/vim-common.links.in?rev=855&op=diff
==============================================================================
--- tags/packages/vim/1:7.0-122+1.etch1/debian/vim-common.links.in (original)
+++ tags/packages/vim/1:7.0-122+1.etch1/debian/vim-common.links.in Fri Jan 19 15:47:39 2007
@@ -30,8 +30,5 @@
usr/share/man/pl.UTF-8/man1/vim.1 usr/share/man/pl.UTF-8/man1/rvim.1
usr/share/man/pl.UTF-8/man1/vim.1 usr/share/man/pl.UTF-8/man1/rview.1
-usr/share/man/ru.KOI8-R/man1/vim.1 usr/share/man/ru.KOI8-R/man1/rvim.1
-usr/share/man/ru.KOI8-R/man1/vim.1 usr/share/man/ru.KOI8-R/man1/rview.1
-
-usr/share/man/ru.UTF-8/man1/vim.1 usr/share/man/ru.UTF-8/man1/rvim.1
-usr/share/man/ru.UTF-8/man1/vim.1 usr/share/man/ru.UTF-8/man1/rview.1
+usr/share/man/ru/man1/vim.1 usr/share/man/ru/man1/rvim.1
+usr/share/man/ru/man1/vim.1 usr/share/man/ru/man1/rview.1
Modified: tags/packages/vim/1:7.0-122+1.etch1/debian/vim-variant.postinst
URL: http://svn.debian.org/wsvn/pkg-vim/tags/packages/vim/1%3A7.0-122%2B1.etch1/debian/vim-variant.postinst?rev=855&op=diff
==============================================================================
--- tags/packages/vim/1:7.0-122+1.etch1/debian/vim-variant.postinst (original)
+++ tags/packages/vim/1:7.0-122+1.etch1/debian/vim-variant.postinst Fri Jan 19 15:47:39 2007
@@ -10,13 +10,6 @@
# 2) add /usr/bin/gvim as an alternative for gnome-text-editor for variants
# built with gnome support. Same principle for the priority above, with the
# additional constraint that priority should not be higher than gedit's
-
-remove_old_diversion () {
- if [ -f /usr/bin/vim.org ]; then
- dpkg-divert --package $pkg --remove --rename \
- --divert /usr/bin/vim.org /usr/bin/vim
- fi
-}
add_gnome_alternative () {
if [ -f /usr/bin/gvim ]; then
@@ -60,7 +53,6 @@
case "$1" in
configure)
- remove_old_diversion
case "$pkg" in
vim-tiny)
add_variant_alternative 10
Modified: tags/packages/vim/1:7.0-122+1.etch1/debian/vim-variant.preinst
URL: http://svn.debian.org/wsvn/pkg-vim/tags/packages/vim/1%3A7.0-122%2B1.etch1/debian/vim-variant.preinst?rev=855&op=diff
==============================================================================
--- tags/packages/vim/1:7.0-122+1.etch1/debian/vim-variant.preinst (original)
+++ tags/packages/vim/1:7.0-122+1.etch1/debian/vim-variant.preinst Fri Jan 19 15:47:39 2007
@@ -1,6 +1,7 @@
#!/bin/bash -e
pkg=@PKG@
+variant=@VARIANT@
remove_directory () {
if [ -d $1 ]; then
@@ -8,9 +9,29 @@
fi
}
+remove_variant_alternative () {
+ for i in vi view ex editor; do
+ update-alternatives --remove $i /usr/bin/vim.$variant
+ done
+}
+
+remove_old_diversion () {
+ if [ -f /usr/bin/vim.org ]; then
+ # We need to remove the actual vim binary in order to remove the diversion.
+ # This is normally done during postrm when removing the package, but since
+ # we're upgrading to a package with alternatives we have to manually
+ # perform the removal.
+ rm -f /usr/bin/vim
+ dpkg-divert --package $pkg --remove --rename \
+ --divert /usr/bin/vim.org /usr/bin/vim
+ fi
+}
+
case "$1" in
upgrade)
+ remove_old_diversion
remove_directory /usr/share/doc/$pkg
+ [ -e /usr/share/man/ru.UTF-8/man1/view.1.gz ] && remove_variant_alternative
;;
esac
Added: tags/packages/vim/1:7.0-122+1.etch1/patches/option.c-foldnestmax_check.diff
URL: http://svn.debian.org/wsvn/pkg-vim/tags/packages/vim/1%3A7.0-122%2B1.etch1/patches/option.c-foldnestmax_check.diff?rev=855&op=file
==============================================================================
--- tags/packages/vim/1:7.0-122+1.etch1/patches/option.c-foldnestmax_check.diff (added)
+++ tags/packages/vim/1:7.0-122+1.etch1/patches/option.c-foldnestmax_check.diff Fri Jan 19 15:47:39 2007
@@ -1,0 +1,32 @@
+Index: vim/src/fold.c
+===================================================================
+--- vim/src/fold.c.orig
++++ vim/src/fold.c
+@@ -2971,7 +2971,11 @@
+ else
+ flp->lvl = get_indent_buf(buf, lnum) / buf->b_p_sw;
+ if (flp->lvl > flp->wp->w_p_fdn)
++ {
+ flp->lvl = flp->wp->w_p_fdn;
++ if (flp->lvl < 0)
++ flp->lvl = 0;
++ }
+ }
+
+ /* foldlevelDiff() {{{2 */
+Index: vim/src/syntax.c
+===================================================================
+--- vim/src/syntax.c.orig
++++ vim/src/syntax.c
+@@ -6072,7 +6072,11 @@
+ ++level;
+ }
+ if (level > wp->w_p_fdn)
++ {
+ level = wp->w_p_fdn;
++ if (level < 0)
++ level = 0;
++ }
+ return level;
+ }
+ #endif
Modified: tags/packages/vim/1:7.0-122+1.etch1/patches/series
URL: http://svn.debian.org/wsvn/pkg-vim/tags/packages/vim/1%3A7.0-122%2B1.etch1/patches/series?rev=855&op=diff
==============================================================================
--- tags/packages/vim/1:7.0-122+1.etch1/patches/series (original)
+++ tags/packages/vim/1:7.0-122+1.etch1/patches/series Fri Jan 19 15:47:39 2007
@@ -15,3 +15,6 @@
zsh.vim-nested_quotes.diff -p0
gui_gtk.c-abs_path.diff -p0
mp.vim-cmd_check.diff -p0
+changelog.vim-ftplugin_buffer-split.diff -p0
+zh_TW.po-swap_recovery_typo.diff -p0
+option.c-foldnestmax_check.diff -p0
More information about the pkg-vim-maintainers
mailing list