[SCM] Vim packaging branch, debian, updated. upstream/7.2b.001-241-g479045a

[James Vega]

The following commit has been merged in the debian branch:
commit 690d85dea94282e5de30857fa09d089b84392c74
Author: James Vega <jamessan at debian.org>
Date:   Wed Aug 6 17:48:13 2008 -0400

    Correct main tarball extraction and mv args in get-orig-source target
    
    Signed-off-by: James Vega <jamessan at debian.org>

diff --git a/debian/rules b/debian/rules
index fc75ed0..06e56da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -131,7 +131,7 @@ VERSION:=7.2
 SNAPSHOT:=c
 VIMCUR:=$(NAME)$(subst .,,$(VERSION))$(SNAPSHOT)
 DEBVERSION:=$(shell dpkg-parsechangelog | sed -n '/^Version:/{s/Version: *\([^:]*:\)\?\([^-]*\)-.*/\2/;p;q}')
-FTP:=ftp://ftp.vim.org/pub/vim/$(if $(SNAPSHOT),unstable/,)
+FTP:=ftp://ftp.vim.org/pub/vim$(if $(SNAPSHOT),/unstable,)
 MAIN_TARBALL:=$(NAME)-$(VERSION)$(SNAPSHOT).tar.bz2
 LANG_TARBALL:=$(NAME)-$(VERSION)$(SNAPSHOT)-lang.tar.gz
 EXTRA_TARBALL:=$(NAME)-$(VERSION)$(SNAPSHOT)-extra.tar.gz
@@ -174,14 +174,15 @@ check-tarball: $(ORIG_SOURCE)
 
 get-orig-source:
 	wget -O $(MAIN_TARBALL) $(FTP)/unix/$(MAIN_TARBALL)
-	tar zx -f $(MAIN_TARBALL)
+	tar jx -f $(MAIN_TARBALL)
 	wget -O $(LANG_TARBALL) $(FTP)/extra/$(LANG_TARBALL)
 	tar zx -f $(LANG_TARBALL)
 	wget -O $(EXTRA_TARBALL) $(FTP)/extra/$(EXTRA_TARBALL)
 	tar zx -f $(EXTRA_TARBALL)
-	mv $(NAME)$(VERSION)$(SNAPSHOT) $(NAME)-$(DEBVERSION)
+	mv $(VIMCUR) $(NAME)-$(DEBVERSION)
 	tar zc -f $(ORIG_SOURCE) $(NAME)-$(DEBVERSION)
 	rm -rf $(NAME)-$(DEBVERSION)
+	rm -f $(MAIN_TARBALL) $(LANG_TARBALL) $(EXTRA_TARBALL)
 
 clean: $(foreach v,$(VARIANTS),clean-$(v))
 	dh_testdir

-- 
Vim packaging