[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 10bb09394d4376ba0585b46e14a28d7831472792
Author: James Vega <jamessan at debian.org>
Date:   Wed May 7 22:41:50 2008 -0400

    Use a standard commit message for debian/README.
    
    Signed-off-by: James Vega <jamessan at debian.org>

diff --git a/debian/update-patches b/debian/update-patches
index 4a1da84..0e2dfce 100755
--- a/debian/update-patches
+++ b/debian/update-patches
@@ -36,7 +36,7 @@ echo 'updating debian/README to latest upstream ...'
 lftp -c "open $host; cd $dir; get README -o debian/README"
 # Store debian/README while we update the other branches.  The debian branch
 # will get reset to before this commit at the end of the script.
-git commit -m 'Stash' -- debian/README
+git commit -m "Update README for patches $curpatch - $newpatch" -- debian/README
 
 git checkout upstream
 
@@ -65,11 +65,7 @@ for b in $(git for-each-ref --format="%(refname)" "refs/heads/deb/*" | sed 's at re
     fi
 done
 
-# Undo the debian/README commit but leave the new README intact so the user
-# can make a proper commit
 git checkout debian
-git reset HEAD^
 git merge upstream
 
 echo "Patches $curpatch - $newpatch comitted and merged."
-echo "Commit debian/README."

-- 
Vim packaging