[SCM] Vim packaging branch, debian, updated. upstream/7.2.148-965-gb131ea4

[James Vega]

The following commit has been merged in the debian branch:
commit b131ea49e6643c3aba7df50faf02397605eae0c0
Author: James Vega <jamessan at debian.org>
Date:   Mon Apr 20 18:21:56 2009 -0400

    debian/rules: Remove SHELL=/bin/bash (again) along with the bashisms
    
    Signed-off-by: James Vega <jamessan at debian.org>

diff --git a/debian/rules b/debian/rules
index e846d2b..273ad7a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,5 @@
 #!/usr/bin/make -f
 
-export SHELL=/bin/bash
 export DH_OPTIONS
 
 DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
@@ -306,12 +305,12 @@ install-stamp-vim-basic: build-stamp-vim-basic $(DOT_IN_DEPS)
 	# According to #368754 and #323820, Russian manpages should be in
 	# /usr/share/man/ru (KOI8-R encoded) and man will handle the
 	# transcoding
-	mv $(DESTDIR)/usr/share/man/ru{.KOI8-R,}
+	mv $(DESTDIR)/usr/share/man/ru.KOI8-R $(DESTDIR)/usr/share/man/ru
 	# Remove this so the dh_install later doesn't fail
 	rm -rf $(DESTDIR)/usr/share/man/ru.UTF-8
 	
 	# rm stuff handled by alternatives
-	rm -f $(DESTDIR)/usr/bin/{ex,view}
+	rm -f $(DESTDIR)/usr/bin/ex $(DESTDIR)/usr/bin/view
 	for f in `find $(DESTDIR)/usr/share/man -name view.1 -o -name ex.1`; do \
 	  rm -f $$f; \
 	done

-- 
Vim packaging