[SCM] Vim packaging branch, debian, updated. upstream/7.1.285-99-g810299f

[James Vega]

The following commit has been merged in the debian branch:
commit 810299f124a04a484485e8a451d00788356c0d5e
Author: James Vega <jamessan at debian.org>
Date:   Wed May 7 18:25:17 2008 -0400

    update-patches now uses debian/changelog from master branch
    
    Signed-off-by: James Vega <jamessan at debian.org>

diff --git a/debian/update-patches b/debian/update-patches
index 8e1139c..4b40f02 100755
--- a/debian/update-patches
+++ b/debian/update-patches
@@ -22,7 +22,7 @@ host='ftp.vim.org'
 version='7.1'
 dir="pub/vim/patches/$version"
 
-curpatch=$(dpkg-parsechangelog | awk '/^Version:/{print $2}' | sed 's/^.*\.\([0-9]*\)\+-[0-9]\+$/\1/')
+curpatch=$(git show master:debian/changelog | dpkg-parsechangelog -l- | awk '/^Version:/{print $2}' | sed 's/^.*\.\([0-9]*\)\+-[0-9]\+$/\1/')
 curpatch=$(($curpatch + 1))
 newpatch=$(lftp -c "open $host; cd $dir; ls $version.*" | tail -n1 | awk -F. '{print $3}')
 
@@ -67,10 +67,10 @@ for b in $(git for-each-ref --format="%(refname)" "refs/heads/deb/*" | sed 's at re
 done
 
 # Undo the debian/README commit but leave the new README intact so the user
-# can add add/update debian/changelog
+# can make a proper commit
 git checkout debian
-git reset HEAD~1
+git reset HEAD^
 git merge upstream
 
 echo "Patches $curpatch - $newpatch comitted and merged."
-echo "Update debian/changelog and commit debian/README."
+echo "Commit debian/README."

-- 
Vim packaging