r549 - trunk/vim/debian

[James Vega]

Author: jamessan
Date: 2006-03-28 17:33:21 +0000 (Tue, 28 Mar 2006)
New Revision: 549

Modified:
   trunk/vim/debian/rules
Log:
Use rmdir instead of rm to remove debian/vim-gui-common/usr/bin


Modified: trunk/vim/debian/rules
===================================================================
--- trunk/vim/debian/rules	2006-03-28 17:10:43 UTC (rev 548)
+++ trunk/vim/debian/rules	2006-03-28 17:33:21 UTC (rev 549)
@@ -270,13 +270,13 @@
 	@echo "*** DEBIAN *** INSTALLING VARIANT vim-basic"
 	dh_clean -k
 	dh_installdirs
-
+	
 	# UPSTREAM INSTALLATION
-
+	
 	$(MAKE) -C $(SRCDIR)/src DESTDIR=$(DESTDIR) install
-
+	
 	# DEBIAN INSTALLATION
-
+	
 	 # disabled, waiting for an update
 	 #cp debian/vim-install $(DESTDIR)/usr/bin
 	mv $(DESTDIR)/usr/bin/{vim,vim.basic} # use variant name
@@ -294,7 +294,7 @@
 	 # helpztags manpage
 	pod2man -c "User Commands" -s 1 -q none -r "vim 6.4"	\
 		-d "September 2003" debian/helpztags debian/helpztags.1
-
+	
 	 # variant-related installations for package "vim"
 	 # to be kept in sync with those in "install-stamp-%" target
 	for x in $(PER_VARIANT_FILES) ; do \
@@ -305,21 +305,21 @@
 	done
 	sed -e "s:@PKG@:vim:;s:@VARIANT@:basic:;s:@DESTDIR@:debian/tmp/usr/bin:" \
 		debian/lintian/vim-variant > debian/lintian/vim
-
+	
 	dh_installman
 	dh_install -X.svn --fail-missing
 	 # evim is GUI related, move its manpage to vim-gui-common
 	mv debian/{vim-common,vim-gui-common}/usr/share/man/man1/evim.1
 	mv debian/{vim-common,vim-runtime}/usr/share/man/man1/vimtutor.1
-	rm -f debian/vim-gui-common/usr/bin
+	rmdir debian/vim-gui-common/usr/bin
 	dh_link
-
+	
 	 # all excepts vim
 	dh_installchangelogs -Nvim
 	dh_installdocs
 	dh_installmenu
 	dh_installmime
-
+	
 	touch $@
 
 # the other variants only include the binary
@@ -331,7 +331,7 @@
 	@echo "*** DEBIAN *** INSTALLING VARIANT $*"
 	dh_clean -k
 	dh_installdirs
-
+	
 	 # variant-related installations
 	 # to be kept in sync with those in "install-stamp-vim-basic" target
 	for x in $(PER_VARIANT_FILES) ; do \
@@ -354,7 +354,7 @@
 	fi
 	dh_install -X.svn
 	dh_link
-
+	
 	touch $@
 
 uninstall: