-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Sorry, I forgot to "quilt refresh" the patch before sending…

The correct one is attached…

Best regards, 

OdyX


-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10rc1 (GNU/Linux)

iJwEAQECAAYFAkqSl0QACgkQ884eR6Y9JhQ5wAP/a6AaEcqBCeI1AzVTY7QN56YQ
uhuKI11gsGlO8c2MnIKq1Or/YyI/fge9WFJASQF8A1M+oQBROA5vUbqtAyAZa3KR
EYB1CMVl0y0Kese7gfUdoUYKUoto4JLzBaMGQWlhVk9ylfij4/0/THAeOLuvwW+3
qrHjt4ct+6argzW8u+0=
=j9Oa
-----END PGP SIGNATURE-----
Description: Adds the --dep3 option to include a DEP-3 template in the header.
Origin:      vendor
Author:      Didier Raboud <[email protected]>
Last-Update: 2009-08-24
Index: quilt-0.46/quilt/header.in
===================================================================
--- quilt-0.46.orig/quilt/header.in     2009-08-24 14:39:14.000000000 +0200
+++ quilt-0.46/quilt/header.in  2009-08-24 14:46:19.000000000 +0200
@@ -21,7 +21,7 @@
 
 usage()
 {
-       printf $"Usage: quilt header [-a|-r|-e] [--backup] [--strip-diffstat] 
[--strip-trailing-whitespace] [patch]\n"
+       printf $"Usage: quilt header [-a|-r|-e] [--backup] [--dep3] 
[--strip-diffstat] [--strip-trailing-whitespace] [patch]\n"
 
        if [ x$1 = x-h ]
        then
@@ -41,6 +41,10 @@
 
 --backup
        Create a backup copy of the old version of a patch as patch~.
+
+--dep3
+       When editing (-e), insert a template with DEP-3 headers.
+       DEP-3 is http://dep.debian.net/deps/dep3/ Patch Tagging Guidelines.
 " "$EDITOR"
                exit 0
        else
@@ -68,7 +72,7 @@
        fi
 }
 
-options=`getopt -o areh --long backup,strip-trailing-whitespace,strip-diffstat 
-- "$@"`
+options=`getopt -o areh --long 
backup,dep3,strip-trailing-whitespace,strip-diffstat -- "$@"`
 
 if [ $? -ne 0 ]
 then
@@ -92,6 +96,9 @@
        --backup)
                QUILT_BACKUP=1
                shift ;;
+       --dep3)
+               opt_use_dep3_headers=1
+               shift ;;
        --strip-diffstat)
                opt_strip_diffstat=1
                shift ;;
@@ -147,6 +154,19 @@
                fi
        ) > $tmp
 
+        # If triggered and file is empty, cat dep-3 headers into it
+       if [ -n "$opt_use_dep3_headers" -a ! -s $tmp ]
+       then
+               ( echo "Description: <Description of the patch (can span 
multiple lines) - required>"
+                 echo "Origin:      <{upstream,backport,vendor,other} [URL] - 
required except if Author is present>"
+                 echo "Bug-<Vendor>:<URL to the bug. Use Bug: for upstream 
bugs and Bug-Debian: for Debian bugs - optional>"
+                 echo "Forwarded:   <URL where the patch has been forwarded - 
optional>"
+                 echo "Author:      <Name and email of the patch author - 
optional>"
+                 echo "Reviewed-by: <Name and email of the patch reviewers - 
optional>"
+                 echo "Last-Update: <YYYY-MM-DD - optional>"
+                ) > $tmp
+        fi
+
        if [ -n "$opt_edit" ]
        then
                LANG=$ORIGINAL_LANG $EDITOR "$tmp" || exit 1

Reply via email to