r403 - trunk/vim/debian

Mon Nov 7 08:17:34 UTC 2005

Author: zack
Date: 2005-11-07 08:17:32 +0000 (Mon, 07 Nov 2005)
New Revision: 403

Added:
   trunk/vim/debian/vim-doc.links
   trunk/vim/debian/vim-tiny.links
   trunk/vim/debian/vim-variant.links
   trunk/vim/debian/vim.links
Modified:
   trunk/vim/debian/README.Debian
   trunk/vim/debian/changelog
   trunk/vim/debian/rules
   trunk/vim/debian/vim-common.docs
   trunk/vim/debian/vim-common.links
   trunk/vim/debian/vim-doc.dirs
   trunk/vim/debian/vim-doc.doc-base.referencemanual
   trunk/vim/debian/vim-doc.doc-base.usermanual
   trunk/vim/debian/vim-doc.install
Log:
- fixed /usr/share/doc symlinks
- moved upstream changelog and FAQ from the vim-common package to vim-doc
- added a "closes: #nnn" entry in changelog which fix a bug just submitted


Modified: trunk/vim/debian/README.Debian
===================================================================

--- trunk/vim/debian/README.Debian	2005-11-06 16:52:03 UTC (rev 402)
+++ trunk/vim/debian/README.Debian	2005-11-07 08:17:32 UTC (rev 403)
@@ -29,3 +29,10 @@
 
  -- Alexis Sukrieh <sukria at sukria.net> Wed, 16 Mar 2005 10:24:32 +0100
 
+More VIM documentation
+----------------------
+
+VIM upstream changelog and FAQ are quite large and therefore not shipped in the
+"vim-common" package.  They are available in the "vim-doc" package.
+
+ -- Stefano Zacchiroli <zack at debian.org> Mon, 07 Nov 2005 09:16:00 +0100

Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog	2005-11-06 16:52:03 UTC (rev 402)
+++ trunk/vim/debian/changelog	2005-11-07 08:17:32 UTC (rev 403)
@@ -9,6 +9,7 @@
   * 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.
+    (closes: #337825)
   * (Re-)Fixed debian/runtime/vimrc, last version inhibit /usr/bin/ex.
   * au commands in vimrc executed only if has("autocmd").
   * No longer try to move configuration files from /etc to /etc/vim

Modified: trunk/vim/debian/rules
===================================================================
--- trunk/vim/debian/rules	2005-11-06 16:52:03 UTC (rev 402)
+++ trunk/vim/debian/rules	2005-11-07 08:17:32 UTC (rev 403)
@@ -1,6 +1,5 @@
 #!/usr/bin/make -f 
 
-export DH_OPTIONS=
 export SHELL=/bin/bash
 
 DEB_HOST_GNU_SYSTEM := $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
@@ -151,6 +150,7 @@
 VERSION=6.4
 #VIMCUR=$(subst .,,$(VERSION))
 VIMCUR=vim64
+CHANGELOG=vim64/runtime/doc/version6.txt # latest version upstream changelog
 MAIN_TARBALL=$(NAME)-$(VERSION).tar.bz2
 LANG_TARBALL=$(NAME)-$(VERSION)-lang.tar.gz
 EXTRA_TARBALL=$(NAME)-$(VERSION)-extra.tar.gz
@@ -158,6 +158,9 @@
 SRCDIR=$(NAME)$(subst .,,$(VERSION))
 BASE_URL=ftp://ftp.vim.org/pub/vim
 
+# nothing to do per default
+all:
+
 PATCH_NAME=new
 make_patch: extract
 	mv $(SRCDIR) $(SRCDIR).new
@@ -284,12 +287,12 @@
 
 	dh_installman $(DH_OPTIONS)
 	dh_install $(DH_OPTIONS) --fail-missing
+	dh_link $(DH_OPTIONS)
 
-	dh_link -pvim-common
-	dh_installchangelogs -pvim-common
-	dh_installdocs -pvim-common
-	dh_installmenu -pvim-common
-	dh_installmime -pvim-common
+	dh_installchangelogs -pvim-runtime -pvim-common -pvim-doc
+	dh_installdocs $(DH_OPTIONS)
+	dh_installmenu $(DH_OPTIONS)
+	dh_installmime $(DH_OPTIONS)
 
 	touch $@
 
@@ -304,7 +307,7 @@
 
 	 # variant-related installations
 	 # to be kept in sync with those in "install-stamp-vim-basic" target
-	for x in install postinst postrm prerm ; do	\
+	for x in install postinst postrm prerm links ; do	\
 	  sed -e "s:@PKG@:$*:;s:@VARIANT@:$(patsubst vim-%,%,$*):;s:@DESTDIR@:vim64/src:" \
 	  	debian/vim-variant.$$x > debian/$*.$$x ;\
 	done
@@ -315,6 +318,7 @@
 		echo "debian/tiny/doc/	usr/share/vim/" >> debian/$*.install; \
 	fi
 	dh_install -X.svn $(DH_OPTIONS)
+	dh_link $(DH_OPTIONS)
 
 	touch $@
 
@@ -369,3 +373,4 @@
 
 binary: binary-indep binary-arch
 .PHONY: extract clean build install uninstall binary-indep binary-arch binary
+

Modified: trunk/vim/debian/vim-common.docs
===================================================================
--- trunk/vim/debian/vim-common.docs	2005-11-06 16:52:03 UTC (rev 402)
+++ trunk/vim/debian/vim-common.docs	2005-11-07 08:17:32 UTC (rev 403)
@@ -1,3 +1 @@
 debian/README
-debian/FAQ
-debian/vim-policy.txt

Modified: trunk/vim/debian/vim-common.links
===================================================================
--- trunk/vim/debian/vim-common.links	2005-11-06 16:52:03 UTC (rev 402)
+++ trunk/vim/debian/vim-common.links	2005-11-07 08:17:32 UTC (rev 403)
@@ -1,4 +1,3 @@
 etc/vim					usr/share/vim/vimfiles
 etc/vim/vimrc				usr/share/vim/vimrc
 etc/vim/gvimrc				usr/share/vim/gvimrc
-usr/share/vim/vim64/doc/version6.txt	usr/share/doc/vim/changelog

Modified: trunk/vim/debian/vim-doc.dirs
===================================================================
--- trunk/vim/debian/vim-doc.dirs	2005-11-06 16:52:03 UTC (rev 402)
+++ trunk/vim/debian/vim-doc.dirs	2005-11-07 08:17:32 UTC (rev 403)
@@ -1 +1 @@
-usr/share/doc/vim/html/
+usr/share/doc/vim-common/html/

Modified: trunk/vim/debian/vim-doc.doc-base.referencemanual
===================================================================
--- trunk/vim/debian/vim-doc.doc-base.referencemanual	2005-11-06 16:52:03 UTC (rev 402)
+++ trunk/vim/debian/vim-doc.doc-base.referencemanual	2005-11-07 08:17:32 UTC (rev 403)
@@ -7,5 +7,5 @@
  each mode as well as all configurable options.
 
 Format: html
-Index: /usr/share/doc/vim/html/index.html
-Files: /usr/share/doc/vim/html/*.html
+Index: /usr/share/doc/vim-common/html/index.html
+Files: /usr/share/doc/vim-common/html/*.html

Modified: trunk/vim/debian/vim-doc.doc-base.usermanual
===================================================================
--- trunk/vim/debian/vim-doc.doc-base.usermanual	2005-11-06 16:52:03 UTC (rev 402)
+++ trunk/vim/debian/vim-doc.doc-base.usermanual	2005-11-07 08:17:32 UTC (rev 403)
@@ -7,5 +7,5 @@
  on using vim.
 
 Format: html
-Index: /usr/share/doc/vim/html/usr_01.html
-Files: /usr/share/doc/vim/html/usr_*.html
+Index: /usr/share/doc/vim-common/html/usr_01.html
+Files: /usr/share/doc/vim-common/html/usr_*.html

Modified: trunk/vim/debian/vim-doc.install
===================================================================
--- trunk/vim/debian/vim-doc.install	2005-11-06 16:52:03 UTC (rev 402)
+++ trunk/vim/debian/vim-doc.install	2005-11-07 08:17:32 UTC (rev 403)
@@ -1 +1,3 @@
-vim64/runtime/doc/*.html	usr/share/doc/vim/html/
+vim64/runtime/doc/*.html	usr/share/doc/vim-common/html/
+debian/vim-policy.txt		usr/share/doc/vim-common/
+debian/FAQ			usr/share/doc/vim-common/

Added: trunk/vim/debian/vim-doc.links
===================================================================
--- trunk/vim/debian/vim-doc.links	2005-11-06 16:52:03 UTC (rev 402)
+++ trunk/vim/debian/vim-doc.links	2005-11-07 08:17:32 UTC (rev 403)
@@ -0,0 +1 @@
+usr/share/doc/vim-common		    usr/share/doc/vim-doc/doc

Added: trunk/vim/debian/vim-tiny.links
===================================================================
--- trunk/vim/debian/vim-tiny.links	2005-11-06 16:52:03 UTC (rev 402)
+++ trunk/vim/debian/vim-tiny.links	2005-11-07 08:17:32 UTC (rev 403)
@@ -0,0 +1 @@
+vim-common	usr/share/doc/vim-tiny

Added: trunk/vim/debian/vim-variant.links
===================================================================
--- trunk/vim/debian/vim-variant.links	2005-11-06 16:52:03 UTC (rev 402)
+++ trunk/vim/debian/vim-variant.links	2005-11-07 08:17:32 UTC (rev 403)
@@ -0,0 +1 @@
+vim-common	usr/share/doc/@PKG@

Added: trunk/vim/debian/vim.links
===================================================================
--- trunk/vim/debian/vim.links	2005-11-06 16:52:03 UTC (rev 402)
+++ trunk/vim/debian/vim.links	2005-11-07 08:17:32 UTC (rev 403)
@@ -0,0 +1 @@
+usr/share/doc/vim-common	usr/share/doc/vim


