r692 - in /trunk/packages/vim: debian/changelog debian/control
debian/rules
debian/vim-variant.preinst debian/vim-variant.prerm patches/bg_BG.diff.diff
patches/edit.c.diff patches/series patches/spell-locales.diff
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Sun May 21 02:22:40 UTC 2006
Author: jamessan
Date: Sun May 21 02:22:38 2006
New Revision: 692
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=692
Log:
Remove the spellfiles build infrastructure.
Remove the broken alternatives handling 'fix' and put it in vim-variant.preinst where it should be.
Add edit.c.diff to prevent a crash when leaving spell completion mode.
Added:
trunk/packages/vim/patches/edit.c.diff
Removed:
trunk/packages/vim/debian/vim-variant.preinst
trunk/packages/vim/patches/bg_BG.diff.diff
trunk/packages/vim/patches/spell-locales.diff
Modified:
trunk/packages/vim/debian/changelog
trunk/packages/vim/debian/control
trunk/packages/vim/debian/rules
trunk/packages/vim/debian/vim-variant.prerm
trunk/packages/vim/patches/series
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=692&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Sun May 21 02:22:38 2006
@@ -1,3 +1,25 @@
+vim (1:7.0-017+4) unstable; urgency=low
+
+ [ James Vega ]
+ * Added edit.c.diff which fixes a crash when exiting insert mode spell
+ completion.
+ * Revert changes to alternative handling in vim-variant.prerm. They should
+ only be removed during a remove, not an upgrade. (closes: #368175)
+ * Move the removal of stale alternatives to vim-variant.prerm where it
+ should've been to begin with. Also, tighten the matching done when
+ deciding which alternatives are removed. Only alternatives pointing to
+ /usr/bin/vim should be removed since those are the known stale
+ alternatives.
+ * Remove support for building spellfiles as will be moved to another set of
+ packages.
+ + debian/control: Remove Build-Depends-Indep which was only used for
+ spellfile building.
+ + debian/rules: Remove build-spell* and build-locales* targets.
+ + Remove debian/locale-gen
+ + Remove bg_BG.diff.diff and spell-locales.diff.
+
+ -- James Vega <jamessan at debian.org> Sat, 20 May 2006 21:57:31 -0400
+
vim (1:7.0-017+3) unstable; urgency=low
[ James Vega ]
Modified: trunk/packages/vim/debian/control
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/control?rev=692&op=diff
==============================================================================
--- trunk/packages/vim/debian/control (original)
+++ trunk/packages/vim/debian/control Sun May 21 02:22:38 2006
@@ -5,7 +5,6 @@
Uploaders: Norbert Tretkowski <nobse at debian.org>, Pierre Habouzit <madcoder at debian.org>, Matthijs Mohlmann <matthijs at cacholong.nl>, Stefano Zacchiroli <zack at debian.org>, Alexis Sukrieh <sukria at sukria.net>, Pepijn de Langen <pepijn at ce.et.tudelft.nl>, James Vega <jamessan at debian.org>
Standards-Version: 3.6.2
Build-Depends: debhelper (>= 4.2.21), dpkg (>> 1.7.0), 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-Depends-Indep: aap, unzip, locales
Build-Conflicts: libperl-dev (= 5.8.4-1)
Package: vim-common
Modified: trunk/packages/vim/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/rules?rev=692&op=diff
==============================================================================
--- trunk/packages/vim/debian/rules (original)
+++ trunk/packages/vim/debian/rules Sun May 21 02:22:38 2006
@@ -17,12 +17,6 @@
MAKETEST = yes
else
MAKETEST = no
-endif
-
-ifeq (,$(findstring nospell,$(DEB_BUILD_OPTIONS)))
- MAKESPELL = yes
-else
- MAKESPELL = no
endif
INSTALL+=install
@@ -192,12 +186,6 @@
DOT_IN_DEPS += debian/vim-runtime.links
DOT_IN_DEPS += debian/runtime/debian.vim
-LOCPATH = $(CURDIR)/debian/locales
-SPELL_LANGS = af am bg ca cs da de el es fo fr he hr hu
-SPELL_LANGS += it lt nl no pl pt ro ru sk sl sv tl tr uk
-# Unsupported locales
-#SPELL_LANGS += gd la
-
# nothing to do per default
all:
@@ -267,7 +255,6 @@
dh_testdir
dh_testroot
rm -f extract-stamp* build-stamp* install-stamp*
- rm -f build-locales-stamp* build-spell-stamp*
rm -f debian/helpztags.1
- quilt pop -a
rm -rf $(SRCDIR)
@@ -316,31 +303,6 @@
@echo "*** DEBIAN *** BUILDING VARIANT $*"
$(MAKE) -C $(SRCDIR) CFLAGS="$(CURCFLAGS)"
mv $(SRCDIR)/src/vim $(SRCDIR)/src/$(subst -,.,$*)
- touch $@
-
-build-locales: build-locales-stamp
-build-locales-stamp:
- dh_testdir
- if [ $(MAKESPELL) = "yes" ]; then \
- cp $(SRCDIR)/src/{vim.basic,vim}; \
- env LOCPATH=$(LOCPATH) sh debian/locale-gen; \
- fi
- touch $@
-
-build-spell: build
-build-spell: build-locales-stamp
-build-spell: build-spell-stamp
-build-spell-stamp: $(foreach l,$(SPELL_LANGS),build-spell-stamp-$(l))
- dh_testdir
- touch $@
-
-build-spell-stamp-%: build-locales-stamp
- dh_testdir
- @echo "*** DEBIAN *** BUILDING SPELLFILES FOR $*"
- # For now we'll ignore any spellfiles that fail building
- if [ $(MAKESPELL) = "yes" ]; then \
- env LOCPATH=$(LOCPATH) aap -f vim/runtime/spell/$*/main.aap || true; \
- fi
touch $@
install: build
Modified: trunk/packages/vim/debian/vim-variant.prerm
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/vim-variant.prerm?rev=692&op=diff
==============================================================================
--- trunk/packages/vim/debian/vim-variant.prerm (original)
+++ trunk/packages/vim/debian/vim-variant.prerm Sun May 21 02:22:38 2006
@@ -3,23 +3,31 @@
pkg=@PKG@
variant=@VARIANT@
-# Order is important for 1). If 1a) and 1b) are swapped, there will be stale
-# alternatives left behind on the system
# two things to do:
# 1) remove /usr/bin/vim.variant as alternative for /usr/bin/vim
-# 1a) first remove alternatives that link to /usr/bin/(g)vim
-# 1b) then remove /usr/bin/(g)vim alternative
# 2) remove /usr/bin/gvim as an alternative for gnome-text-editor for
# variants built with gnome support
+# check_and_remove_alternative cleans up stale alternatives that were left
+# behind from previous mishandling of alternatives.
+check_and_remove_alternative () {
+ if update-alternatives --list $1 | grep -q bin/vim; then
+ for f in `update-alternatives --list $1 | grep 'bin/vim$'`; do
+ update-alternatives --remove $1 $f
+ done
+ fi
+}
+
remove_gnome_alternative () {
- if [ -f /usr/bin/gvim ]; then
+ if [ -f /usr/bin/vim.$variant ]; then
+ check_and_remove_alternative gnome-text-editor
update-alternatives --remove gnome-text-editor /usr/bin/vim.$variant
fi
}
remove_variant_alternative () {
for i in vi view ex editor rvim rview vimdiff vim; do
+ check_and_remove_alternative $i
update-alternatives --remove $i /usr/bin/vim.$variant
done
case "$variant" in
@@ -31,12 +39,13 @@
remove_gui_variant_alternative () {
for i in eview evim gview gvimdiff rgview rgvim gvim; do
+ check_and_remove_alternative $i
update-alternatives --remove $i /usr/bin/vim.$variant
done
}
case "$1" in
- remove|upgrade)
+ remove)
case "$pkg" in
vim-gnome|vim-full) # gnome enabled variants
remove_gnome_alternative
Added: trunk/packages/vim/patches/edit.c.diff
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/edit.c.diff?rev=692&op=file
==============================================================================
--- trunk/packages/vim/patches/edit.c.diff (added)
+++ trunk/packages/vim/patches/edit.c.diff Sun May 21 02:22:38 2006
@@ -1,0 +1,30 @@
+Index: vim/src/edit.c
+===================================================================
+--- vim/src/edit.c.orig
++++ vim/src/edit.c
+@@ -3394,15 +3394,18 @@
+ else
+ ptr = compl_orig_text;
+ p = compl_orig_text;
+- for (temp = 0; p[temp] != NUL && p[temp] == ptr[temp]; ++temp)
+- ;
++ if (p != NULL)
++ {
++ for (temp = 0; p[temp] != NUL && p[temp] == ptr[temp]; ++temp)
++ ;
+ #ifdef FEAT_MBYTE
+- if (temp > 0)
+- temp -= (*mb_head_off)(compl_orig_text, p + temp);
++ if (temp > 0)
++ temp -= (*mb_head_off)(compl_orig_text, p + temp);
+ #endif
+- for (p += temp; *p != NUL; mb_ptr_adv(p))
+- AppendCharToRedobuff(K_BS);
+- AppendToRedobuffLit(ptr + temp, -1);
++ for (p += temp; *p != NUL; mb_ptr_adv(p))
++ AppendCharToRedobuff(K_BS);
++ AppendToRedobuffLit(ptr + temp, -1);
++ }
+ }
+
+ #ifdef FEAT_CINDENT
Modified: trunk/packages/vim/patches/series
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/series?rev=692&op=diff
==============================================================================
--- trunk/packages/vim/patches/series (original)
+++ trunk/packages/vim/patches/series Sun May 21 02:22:38 2006
@@ -1,5 +1,4 @@
virc.c.diff -p0
xdefaults.vim.diff -p0
debcontrol.vim.diff -p0
-bg_BG.diff.diff -p0
-spell-locales.diff -p0
+edit.c.diff -p0
More information about the pkg-vim-maintainers
mailing list