[SCM] Vim packaging branch, debian, updated. upstream/7.1.ds-328-gfb35f5e

Pierre Habouzit madcoder at debian.org
Sun Mar 30 20:30:17 UTC 2008


The following commit has been merged in the debian branch:
commit fb35f5ed410310d8c488757ba313fbec04a4d192
Author: Pierre Habouzit <madcoder at debian.org>
Date:   Sun Mar 30 22:29:52 2008 +0200

    Revert the git-apply hack, upstream uses unified diff (yuck).
    
    also fix a forgotten git-cat-file.
    
    Signed-off-by: Pierre Habouzit <madcoder at debian.org>

diff --git a/debian/update-patches b/debian/update-patches
index 8293648..1675eaf 100755
--- a/debian/update-patches
+++ b/debian/update-patches
@@ -48,8 +48,9 @@ git checkout upstream
 
 lftp -c "open $host; cd $dir; get $(seq -f $version.%03g -s' ' $curpatch $newpatch)"
 for p in $(seq -f $version.%03g $curpatch $newpatch); do
-    git apply --index -p0 "$p"
-    author="$(git cat-file blob debian:debian/README | \
+    patch -Np0 < $p
+    git add $(lsdiff $p)
+    author="$(git show debian:debian/README -- | \
               sed -n -e 's/^From: *//;t done;d;: done')"
     subject="s/^ *[0-9]* *$p *//;t done;d;: done;p"
     msg='/^Patch /,/^Files:/{s/^Files:.*//;t;p}'

-- 
Vim packaging



More information about the pkg-vim-maintainers mailing list