[SCM] Vim packaging branch, debian, updated. upstream/7.1.285-73-g952ee7a

[James Vega]

The following commit has been merged in the debian branch:
commit dcbc531eaa39d15d3d4f8094fc3c7cb9a0a39e9d
Author: James Vega <jamessan at debian.org>
Date:   Tue Apr 8 01:31:23 2008 -0400

    Re-work update-patches' merge process.
    
    Remove the debian branch from the mass merging so that the script can
    undo the stashed commit first.
    
    Signed-off-by: James Vega <jamessan at debian.org>

diff --git a/debian/update-patches b/debian/update-patches
index 96e99bc..8e1139c 100755
--- a/debian/update-patches
+++ b/debian/update-patches
@@ -53,7 +53,7 @@ for p in $(seq -f $version.%03g $curpatch $newpatch); do
     rm $p
 done
 
-for b in $(git for-each-ref --format="%(refname)" "refs/heads/deb/*" | sed 's at refs/heads/@@') upstream-runtime debian; do
+for b in $(git for-each-ref --format="%(refname)" "refs/heads/deb/*" | sed 's at refs/heads/@@') upstream-runtime; do
     git checkout $b
     git merge upstream
     if [ $? -ne 0 ]; then
@@ -68,7 +68,9 @@ done
 
 # Undo the debian/README commit but leave the new README intact so the user
 # can add add/update debian/changelog
+git checkout debian
 git reset HEAD~1
+git merge upstream
 
 echo "Patches $curpatch - $newpatch comitted and merged."
 echo "Update debian/changelog and commit debian/README."

-- 
Vim packaging