[SCM] Vim packaging branch, debian, updated. upstream/7.1.285-87-gce71e28

James Vega jamessan at debian.org
Wed Apr 23 15:48:37 UTC 2008


The following commit has been merged in the debian branch:
commit ce71e28a2c7eaaabd2f55983436ab2512b9fc87b
Author: James Vega <jamessan at debian.org>
Date:   Wed Apr 23 11:29:01 2008 -0400

    Move vimrc.tiny from vim-common to vim-tiny.
    
    Shipping vimrc.tiny in vim-common doesn't make much sense since it's only used
    by vim-tiny.  Update debian/rules to put the proper .install/.links lines in
    for vim-tiny.  Add Conflicts/Replaces to vim-tiny against vim-common in order
    to move the config file from vim-common to vim-tiny.
    
    Signed-off-by: James Vega <jamessan at debian.org>

diff --git a/debian/control b/debian/control
index e3858d9..691fe28 100644
--- a/debian/control
+++ b/debian/control
@@ -81,7 +81,8 @@ Description: Vi IMproved - HTML documentation
 Package: vim-tiny
 Priority: important
 Architecture: any
-Conflicts: vim-runtime (<< 1:7.1-056+1)
+Conflicts: vim-runtime (<< 1:7.1-056+1), vim-common (<< 1:7.1.293-2)
+Replaces: vim-common (<< 1:7.1.293-2)
 Depends: vim-common (= ${binary:Version}), ${shlibs:Depends}
 Provides: editor
 Description: Vi IMproved - enhanced vi editor - compact version
diff --git a/debian/rules b/debian/rules
index be85d1b..69039e1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -399,6 +399,8 @@ install-stamp-%: build-stamp-% $(if $(findstring tiny,$*),$(DOT_IN_DEPS_TINY),)
 	# fake help installation for vim-tiny
 	if [ "$*" = "vim-tiny" ]; then \
 		echo "debian/tiny/doc/	usr/share/vim/$(VIMCUR)" >> debian/$*.install; \
+		echo "debian/tiny/vimrc.tiny	etc/vim" >> debian/$*.install; \
+		echo "etc/vim/vimrc.tiny	usr/share/vim/vimrc.tiny" >> debian/$*.links; \
 	fi
 	dh_install
 	dh_installmenu
diff --git a/debian/vim-common.install.in b/debian/vim-common.install.in
index 0f318af..ac7c0a6 100644
--- a/debian/vim-common.install.in
+++ b/debian/vim-common.install.in
@@ -1,6 +1,5 @@
 debian/tmp/usr/bin/xxd                           usr/bin/
 debian/helpztags                                 usr/bin/
 debian/runtime/vimrc                             etc/vim/
-debian/tiny/vimrc.tiny                           etc/vim/
 debian/runtime/debian.vim                        usr/share/vim/@VIMCUR@/
 debian/tmp/usr/share/man/man1/*                  usr/share/man/man1/
diff --git a/debian/vim-common.links.in b/debian/vim-common.links.in
index 130881b..df55cd9 100644
--- a/debian/vim-common.links.in
+++ b/debian/vim-common.links.in
@@ -1,6 +1,5 @@
 etc/vim					usr/share/vim/vimfiles
 etc/vim/vimrc				usr/share/vim/vimrc
-etc/vim/vimrc.tiny			usr/share/vim/vimrc.tiny
 usr/share/vim/@VIMCUR@			usr/share/vim/vimcurrent
 
 usr/share/man/man1/vim.1		usr/share/man/man1/rvim.1

-- 
Vim packaging



More information about the pkg-vim-maintainers mailing list