[SCM] Vim packaging branch, debian, updated. upstream/7.1.285-56-gb7af39a

[James Vega]

The following commit has been merged in the debian branch:
commit 8d87f28bf013e763cfcd7fb428e2bc133adc5ebd
Author: James Vega <jamessan at debian.org>
Date:   Sun Mar 30 17:52:38 2008 -0400

    Update check-tarball target to use the current upstream version from
    debian/changelog.
    Signed-off-by: James Vega <jamessan at debian.org>

diff --git a/debian/rules b/debian/rules
index 78327a7..c3c76db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -116,7 +116,7 @@ NAME:=vim
 VERSION:=7.1
 SNAPSHOT:=
 VIMCUR:=$(NAME)$(subst .,,$(VERSION))
-DEBVERSION:=$(VERSION)$(if $(SNAPSHOT),~$(SNAPSHOT),).ds
+DEBVERSION:=$(shell dpkg-parsechangelog | sed -n '/^Version:/{s/Version: *\([^:]*:\)\?\([^-]*\)-.*/\2/;p;q}')
 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
@@ -140,7 +140,7 @@ DOT_IN_DEPS += debian/runtime/debian.vim
 all: 
 
 $(ORIG_SOURCE):
-	if git rev-parse --git-dir 2>&1 >/dev/null; then \
+	if git rev-parse --git-dir >/dev/null 2>&1; then \
 	  pristine-tar checkout $@; \
 	fi
 

-- 
Vim packaging