[SCM] Vim packaging branch, debian, updated. upstream/7.1.285-108-g3cddda5

[James Vega]

The following commit has been merged in the debian branch:
commit 3cddda563c76423f9f660d8cc837aa9a4fc84157
Author: James Vega <jamessan at debian.org>
Date:   Wed May 7 22:58:54 2008 -0400

    The update-orig target should end up in the master branch.
    
    Signed-off-by: James Vega <jamessan at debian.org>

diff --git a/debian/rules b/debian/rules
index 673b9f5..c8bdf65 100755
--- a/debian/rules
+++ b/debian/rules
@@ -140,13 +140,14 @@ DOT_IN_DEPS_TINY := debian/tiny/vimrc.tiny
 # nothing to do per default
 all: 
 
+# Should be run from master branch after the release has been prepared
 update-orig:
 	if git rev-parse --git-dir >/dev/null 2>&1; then \
 	    git checkout upstream; \
 	    git tag upstream/$(DEBVERSION); \
 	    git archive --format=tar --prefix=$(NAME)-$(DEBVERSION)/ upstream | gzip > $(ORIG_SOURCE); \
 	    pristine-tar commit $(ORIG_SOURCE); \
-	    git checkout debian; \
+	    git checkout master; \
 	fi
 
 $(ORIG_SOURCE):

-- 
Vim packaging