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

James Vega jamessan at debian.org
Tue Apr 8 06:46:12 UTC 2008


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

    Fix the author attribution for update-patches.
    
    Scripting to harvest the upstream author was using debian:debian/README
    instead of the current patch.  Also fixed the git-commit invocation to
    use the proper author option.
    
    Signed-off-by: James Vega <jamessan at debian.org>

diff --git a/debian/update-patches b/debian/update-patches
index c230a2a..96e99bc 100755
--- a/debian/update-patches
+++ b/debian/update-patches
@@ -45,12 +45,11 @@ lftp -c "open $host; cd $dir; get $(seq -f $version.%03g -s' ' $curpatch $newpat
 for p in $(seq -f $version.%03g $curpatch $newpatch); do
     patch -Np0 < $p
     git add $(lsdiff $p)
-    author="$(git show debian:debian/README -- | \
-              sed -n -e 's/^From: *//;t done;d;: done')"
+    author="$(sed -n -e 's/^From: *//;t done;d;: done;p' $p)"
     subject="s/^ *[0-9]* *$p *//;t done;d;: done;p"
     msg='/^Patch /,/^Files:/{s/^Files:.*//;t;p}'
     (git show debian:debian/README -- | sed -n "$subject"; \
-     sed -n "$msg" $p) | git commit -A "$author" -F -
+     sed -n "$msg" $p) | git commit --author "$author" -F -
     rm $p
 done
 

-- 
Vim packaging



More information about the pkg-vim-maintainers mailing list