r13442 - /scripts/dpatch2quilt

[dmn at users.alioth.debian.org]

Author: dmn
Date: Thu Jan 24 18:48:17 2008
New Revision: 13442

URL: http://svn.debian.org/wsvn/?sc=1&rev=13442
Log:
Use .patch extension for imported patches; move removal of @DPATCH@ things in the importing loop

Modified:
    scripts/dpatch2quilt

Modified: scripts/dpatch2quilt
URL: http://svn.debian.org/wsvn/scripts/dpatch2quilt?rev=13442&op=diff
==============================================================================
--- scripts/dpatch2quilt (original)
+++ scripts/dpatch2quilt Thu Jan 24 18:48:17 2008
@@ -11,15 +11,17 @@
 [ -f debian/patches/00list ] || exit 1
 
 for p in $(dpatch list-all); do
-        quilt import -P $p.diff debian/patches/$p.dpatch
+        quilt import -P $p.patch debian/patches/$p.dpatch
+        sed -i -e '1,/@DPATCH@/ d' debian/patches/$p.patch
+
         quilt push
         quilt refresh
-        svn add debian/patches/$p.diff
+        svn add debian/patches/$p.patch
 done
 quilt pop -a
 
 COUNT_D=$(ls -1 debian/patches/*.dpatch | wc -l)
-COUNT_Q=$(ls -1 debian/patches/*.diff | wc -l)
+COUNT_Q=$(ls -1 debian/patches/*.patch | wc -l)
 
 svn add debian/patches/series
 svn rm debian/patches/00list debian/patches/*.dpatch
@@ -41,8 +43,6 @@
     $do_replace = 0;
 }' debian/control
 
-sed -i -e '1,/@DPATCH@/ d' debian/patches/*.diff
-
 echo
 echo "The next commit would remove $COUNT_D dpatch patches and add $COUNT_Q quilt patches."