r816 - in /trunk/packages/vim: debian/ upstream/patches/
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Thu Jan 4 06:56:16 CET 2007
Author: jamessan
Date: Thu Jan 4 06:56:16 2007
New Revision: 816
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=816
Log:
Back out the upstream patches and work on fixing the two RC bugs open in hopes of one last upload.
This commit fixes #401000.
Removed:
trunk/packages/vim/upstream/patches/7.0.165
trunk/packages/vim/upstream/patches/7.0.166
trunk/packages/vim/upstream/patches/7.0.167
trunk/packages/vim/upstream/patches/7.0.168
trunk/packages/vim/upstream/patches/7.0.169
trunk/packages/vim/upstream/patches/7.0.170
trunk/packages/vim/upstream/patches/7.0.171
trunk/packages/vim/upstream/patches/7.0.172
trunk/packages/vim/upstream/patches/7.0.173
trunk/packages/vim/upstream/patches/7.0.174
Modified:
trunk/packages/vim/debian/changelog
trunk/packages/vim/debian/vim-variant.postinst
trunk/packages/vim/debian/vim-variant.preinst
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=816&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Thu Jan 4 06:56:16 2007
@@ -1,9 +1,13 @@
-vim (1:7.0-174+1) unstable; urgency=low
-
- [ Debian Vim Maintainers ]
- * New upstream patches (165 - 174), see README.gz for details.
-
- -- James Vega <jamessan at debian.org> Tue, 28 Nov 2006 16:19:04 -0500
+vim (1:7.0-164+2) unstable; urgency=high
+
+ [ James Vega ]
+ * Move diversion removal back to vim-variant.preinst. Perform the diversion
+ check and removal only when $pkg is not vim since it didn't have a
+ diversion. Also requires manually removing /usr/bin/vim in order to
+ remove the diversion. Fixes upgrades from Etch leaving behind stale
+ binaries. (closes: #401000)
+
+ -- James Vega <jamessan at debian.org> Wed, 3 Jan 2007 21:58:53 -0500
vim (1:7.0-164+1) unstable; urgency=low
Modified: trunk/packages/vim/debian/vim-variant.postinst
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/vim-variant.postinst?rev=816&op=diff
==============================================================================
--- trunk/packages/vim/debian/vim-variant.postinst (original)
+++ trunk/packages/vim/debian/vim-variant.postinst Thu Jan 4 06:56:16 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: trunk/packages/vim/debian/vim-variant.preinst
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/vim-variant.preinst?rev=816&op=diff
==============================================================================
--- trunk/packages/vim/debian/vim-variant.preinst (original)
+++ trunk/packages/vim/debian/vim-variant.preinst Thu Jan 4 06:56:16 2007
@@ -8,8 +8,21 @@
fi
}
+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
;;
esac
More information about the pkg-vim-maintainers
mailing list