r86 - trunk/vim/debian

[Stefano Zacchiroli]

Author: zack
Date: 2005-03-18 16:17:09 +0100 (Fri, 18 Mar 2005)
New Revision: 86

Added:
   trunk/vim/debian/vim-common.install
   trunk/vim/debian/vim-doc.install
Removed:
   trunk/vim/debian/vim-common.files
   trunk/vim/debian/vim-doc.files
Modified:
   trunk/vim/debian/changelog
   trunk/vim/debian/rules
Log:
Minor cleanup in vim-{doc,common} handling: use dh_install instead of
dh_movefiles so that files get not removed and fakeroot debian/rules binary
could be invoked twice without errors. Also avoid manual compression of README,
dh_compress is good at it.



Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog	2005-03-18 14:10:14 UTC (rev 85)
+++ trunk/vim/debian/changelog	2005-03-18 15:17:09 UTC (rev 86)
@@ -43,6 +43,10 @@
   * Stefano Zacchiroli <zack@debian.org>:
     + debian/vim-{doc,common}.preinst
       - added #DEBHELPER# tag
+    + debian/rules
+      - vim-{doc,common} minor cleanup: uses dh_install instead of
+      dh_movefiles ("binary" target could now be invoked twice after a single
+      "install" invocation), let dh_compress compress README
 
  -- Debian VIM Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>  Fri, 18 Mar 2005 13:43:24 +0100
 

Modified: trunk/vim/debian/rules
===================================================================
--- trunk/vim/debian/rules	2005-03-18 14:10:14 UTC (rev 85)
+++ trunk/vim/debian/rules	2005-03-18 15:17:09 UTC (rev 86)
@@ -354,8 +354,8 @@
 	rm -f $(PWD)/debian/vim/usr/share/vim/vim63/macros/maze/Makefile
 	mkdir -p $(PWD)/debian/vim/usr/share/consolefonts/
 	cp -a $(PWD)/vim63/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
+# 	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/vim63/tools/vimspell.*
 	rm -f $(CURDIR)/debian/vim-common/usr/share/vim/vim63/tools/tcltags

Deleted: trunk/vim/debian/vim-common.files
===================================================================
--- trunk/vim/debian/vim-common.files	2005-03-18 14:10:14 UTC (rev 85)
+++ trunk/vim/debian/vim-common.files	2005-03-18 15:17:09 UTC (rev 86)
@@ -1 +0,0 @@
-usr/share/vim

Added: trunk/vim/debian/vim-common.install
===================================================================
--- trunk/vim/debian/vim-common.install	2005-03-18 14:10:14 UTC (rev 85)
+++ trunk/vim/debian/vim-common.install	2005-03-18 15:17:09 UTC (rev 86)
@@ -0,0 +1 @@
+debian/vim/usr/share/vim/   usr/share/

Deleted: trunk/vim/debian/vim-doc.files
===================================================================
--- trunk/vim/debian/vim-doc.files	2005-03-18 14:10:14 UTC (rev 85)
+++ trunk/vim/debian/vim-doc.files	2005-03-18 15:17:09 UTC (rev 86)
@@ -1 +0,0 @@
-usr/share/doc/vim/html

Added: trunk/vim/debian/vim-doc.install
===================================================================
--- trunk/vim/debian/vim-doc.install	2005-03-18 14:10:14 UTC (rev 85)
+++ trunk/vim/debian/vim-doc.install	2005-03-18 15:17:09 UTC (rev 86)
@@ -0,0 +1 @@
+debian/vim/usr/share/doc/vim/html/    usr/share/doc/vim/