[SCM] Vim packaging branch, debian, updated. upstream/7.2.148-1044-gd656d62

James Vega jamessan at debian.org
Mon Jul 6 13:05:30 UTC 2009


The following commit has been merged in the debian branch:
commit d656d626c21b80b66ff5b2abde9dc19c81a11f6a
Author: James Vega <jamessan at debian.org>
Date:   Fri Jul 3 01:22:56 2009 -0400

    Revert "Set VIMRCLOC to /etc/vim"
    
    Setting VIMRCLOC changes what Vim sets for its internal $VIM path.  This is
    too intrusive for the effect we want.
    
    This reverts commit a66ad6b4f51bb4c7a9f9d6fb5205326c976a0f54.

diff --git a/debian/rules b/debian/rules
index 992a943..273ad7a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -254,7 +254,7 @@ build-stamp-%: configure-stamp-%
 	dh_testdir
 	dh_clean -p$* -k
 	@echo "*** DEBIAN *** BUILDING VARIANT $*"
-	$(MAKE) -C src/$(SHADOWDIR) CFLAGS="$(CURCFLAGS)" VIMRCLOC="/etc/vim"
+	$(MAKE) -C src/$(SHADOWDIR) CFLAGS="$(CURCFLAGS)"
 	mv src/$(SHADOWDIR)/vim src/$(SHADOWDIR)/$(subst -,.,$*)
 	touch $@
 
@@ -281,14 +281,13 @@ install-stamp-vim-basic: build-stamp-vim-basic $(DOT_IN_DEPS)
 	
 	# UPSTREAM INSTALLATION
 	
-	$(MAKE) -C src/vim-basic VIMRCLOC="/etc/vim" DESTDIR="$(DESTDIR)" \
-	    installvimbin \
-	    installtutorbin \
-	    installgtutorbin \
-	    installruntime \
-	    installtools \
-	    install-icons \
-	    install-languages
+	$(MAKE) -C src/vim-basic DESTDIR=$(DESTDIR) installvimbin \
+	                                            installtutorbin \
+	                                            installgtutorbin \
+	                                            installruntime \
+	                                            installtools \
+	                                            install-icons \
+	                                            install-languages
 	
 # Tests need to be run in series, otherwise the terminal requests may not see
 # proper responses
diff --git a/debian/vim-common.links.in b/debian/vim-common.links.in
index 1353ff2..0050695 100644
--- a/debian/vim-common.links.in
+++ b/debian/vim-common.links.in
@@ -1,4 +1,5 @@
 etc/vim					usr/share/vim/vimfiles
+etc/vim/vimrc				usr/share/vim/vimrc
 usr/share/vim/@VIMCUR@			usr/share/vim/vimcurrent
 usr/share/man/man1/vim.1		usr/share/man/man1/rvim.1
 usr/share/man/man1/vim.1		usr/share/man/man1/rview.1
diff --git a/debian/vim-gui-common.links.in b/debian/vim-gui-common.links.in
index 6f0f436..dc9a8cd 100644
--- a/debian/vim-gui-common.links.in
+++ b/debian/vim-gui-common.links.in
@@ -1,3 +1,4 @@
+etc/vim/gvimrc				usr/share/vim/gvimrc
 usr/share/man/man1/gvim.1		usr/share/man/man1/gview.1
 usr/share/man/man1/gvim.1		usr/share/man/man1/rgvim.1
 usr/share/man/man1/gvim.1		usr/share/man/man1/rgview.1

-- 
Vim packaging



More information about the pkg-vim-maintainers mailing list