r384 - in trunk/vim/debian: . runtime

[Stefano Zacchiroli]

Author: zack
Date: 2005-10-25 17:44:17 +0000 (Tue, 25 Oct 2005)
New Revision: 384

Modified:
   trunk/vim/debian/changelog
   trunk/vim/debian/rules
   trunk/vim/debian/runtime/vimrc
Log:
- added /usr/share/vim/vimcurrent/ -> vim64/ symlink
- vimrc no longer version-aware
- sane runtimepath in vimrc
- factorized "vim64" strings in debian/rules in a single variable


Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog	2005-10-23 14:42:20 UTC (rev 383)
+++ trunk/vim/debian/changelog	2005-10-25 17:44:17 UTC (rev 384)
@@ -1,6 +1,9 @@
 vim (1:6.4-001+3) UNRELEASED; urgency=low
 
-  * 
+  [ Stefano Zacchiroli ]
+  * Added symlink /usr/share/vim/vimcurrent -> vim64, will be kept
+    proper in future releases. /etc/vim/vimrc no longer version-aware.
+  * Removed duplicate /usr/share/vim/vimfiles entry in vimrc
 
  -- Debian VIM Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>  Sun, 23 Oct 2005 16:41:04 +0200
 

Modified: trunk/vim/debian/rules
===================================================================
--- trunk/vim/debian/rules	2005-10-23 14:42:20 UTC (rev 383)
+++ trunk/vim/debian/rules	2005-10-25 17:44:17 UTC (rev 384)
@@ -122,6 +122,8 @@
 
 NAME=vim
 VERSION=6.4
+#VIMCUR=$(subst .,,$(VERSION))
+VIMCUR=vim64
 MAIN_TARBALL=$(NAME)-$(VERSION).tar.bz2
 LANG_TARBALL=$(NAME)-$(VERSION)-lang.tar.gz
 EXTRA_TARBALL=$(NAME)-$(VERSION)-extra.tar.gz
@@ -237,7 +239,7 @@
 # install usr/share/bug/vim/presubj file
 	install -m 644 -D $(CURDIR)/debian/vim.presubj $(DESTDIR)/usr/share/bug/vim/presubj
 # make less.sh executable
-	chmod a+x $(DESTDIR)/usr/share/vim/vim64/macros/less.sh
+	chmod a+x $(DESTDIR)/usr/share/vim/$(VIMCUR)/macros/less.sh
 # remove things which are handled via alternatives
 	rm -f $(DESTDIR)/usr/bin/{view,ex}
 	rm -f $(DESTDIR)/usr/bin/[ce]tags
@@ -259,7 +261,7 @@
 #	cp debian/vim-install $(DESTDIR)/usr/bin
 	cp debian/helpztags $(DESTDIR)/usr/bin
 # copying updated syntax files
-	cp debian/updates/*.vim $(DESTDIR)/usr/share/vim/vim64/syntax/
+	cp debian/updates/*.vim $(DESTDIR)/usr/share/vim/$(VIMCUR)/syntax/
 # desktop entry
 	cp debian/gvim.desktop $(DESTDIR)/usr/share/applications/
 # it's over
@@ -290,15 +292,16 @@
 
 binary-indep: DH_OPTIONS=-i
 binary-indep: build install
-	rm -f $(PWD)/debian/vim/usr/share/vim/vim64/macros/maze/*.c
-	rm -f $(PWD)/debian/vim/usr/share/vim/vim64/macros/maze/Makefile
+	rm -f $(PWD)/debian/vim/usr/share/vim/$(VIMCUR)/macros/maze/*.c
+	rm -f $(PWD)/debian/vim/usr/share/vim/$(VIMCUR)/macros/maze/Makefile
 	mkdir -p $(PWD)/debian/vim/usr/share/consolefonts/
-	cp -a $(PWD)/vim64/farsi/fonts/UNIXs/far-a01.pcf.gz $(PWD)/debian/vim/usr/share/consolefonts/
+	cp -a $(PWD)/$(VIMCUR)/farsi/fonts/UNIXs/far-a01.pcf.gz $(PWD)/debian/vim/usr/share/consolefonts/
 # 	gzip -9 $(PWD)/debian/vim/usr/share/doc/vim/README
 # 	dh_movefiles --sourcedir=debian/vim
 # fix for CAN-2005-0069
-	rm -f $(CURDIR)/debian/vim-common/usr/share/vim/vim64/tools/vimspell.*
-	rm -f $(CURDIR)/debian/vim-common/usr/share/vim/vim64/tools/tcltags
+	rm -f $(CURDIR)/debian/vim-common/usr/share/vim/$(VIMCUR)/tools/vimspell.*
+	rm -f $(CURDIR)/debian/vim-common/usr/share/vim/$(VIMCUR)/tools/tcltags
+	ln -fs $(VIMCUR) $(CURDIR)/debian/vim-common/usr/share/vim/vimcurrent
 	dh_testdir
 	dh_testroot
 	dh_compress

Modified: trunk/vim/debian/runtime/vimrc
===================================================================
--- trunk/vim/debian/runtime/vimrc	2005-10-23 14:42:20 UTC (rev 383)
+++ trunk/vim/debian/runtime/vimrc	2005-10-25 17:44:17 UTC (rev 384)
@@ -1,5 +1,5 @@
 " Configuration file for vim
-set runtimepath=~/.vim,/etc/vim,/usr/share/vim/vimfiles,/usr/share/vim/addons,/usr/share/vim/vim64,/usr/share/vim/vimfiles,/usr/share/vim/addons/after,~/.vim/after
+set runtimepath=~/.vim,/usr/share/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/vimcurrent,/usr/share/vim/vimfiles/after,/usr/share/vim/addons/after,~/.vim/after
 
 " Normally we use vim-extensions. If you want true vi-compatibility
 " remove change the following statements