now the patch is clean, it was pretty messed up before

[software/mutt-debian.git] / debian / patches / debian-specific / document_debian_defaults

diff --git a/debian/patches/debian-specific/document_debian_defaults b/debian/patches/debian-specific/document_debian_defaults
index 8d97e29becdbcd65efcff97acf394fca873bf79d..7240bef2de08690ca71e289676daf4b61d7fb84a 100644 (file)
--- a/debian/patches/debian-specific/document_debian_defaults
+++ b/debian/patches/debian-specific/document_debian_defaults
@@ -1,8 +1,10 @@
 Some customization of the option which are straying from the default
 only on Debian systems
 
---- a/init.h
-+++ b/init.h
+Index: mutt/init.h
+===================================================================
+--- mutt.orig/init.h   2009-06-25 12:36:35.000000000 +0200
++++ mutt/init.h        2009-06-25 12:36:36.000000000 +0200
 @@ -312,6 +312,9 @@
    ** .pp
    ** When this variable is \fIset\fP, mutt will include Delivered-To headers when
@@ -23,7 +25,7 @@ only on Debian systems
    */
    { "ignore_linear_white_space",    DT_BOOL, R_NONE, OPTIGNORELWS, 0 },
    /*
-@@ -1564,6 +1570,9 @@
+@@ -1554,6 +1560,9 @@
    ** system.  It is used with various sets of parameters to gather the
    ** list of known remailers, and to finally send a message through the
    ** mixmaster chain.
@@ -33,7 +35,7 @@ only on Debian systems
    */
  #endif
    { "move",           DT_QUAD, R_NONE, OPT_MOVE, M_NO },
-@@ -2580,6 +2589,10 @@
+@@ -2570,6 +2579,10 @@
    ** This variable contains the name of either a directory, or a file which
    ** contains trusted certificates for use with OpenSSL.
    ** (S/MIME only)
@@ -44,7 +46,7 @@ only on Debian systems
    */
    { "smime_certificates",     DT_PATH, R_NONE, UL &SmimeCertificates, 0 },
    /*
-@@ -2786,6 +2799,9 @@
+@@ -2776,6 +2789,9 @@
    ** .ts
    ** set smtp_authenticators="digest-md5:cram-md5"
    ** .te
@@ -54,7 +56,7 @@ only on Debian systems
    */
  # endif /* USE_SASL */
    { "smtp_pass",      DT_STR,  R_NONE, UL &SmtpPass, UL 0 },
-@@ -2833,6 +2849,9 @@
+@@ -2823,6 +2839,9 @@
    ** .pp
    ** You may optionally use the ``reverse-'' prefix to specify reverse sorting
    ** order (example: ``\fCset sort=reverse-date-sent\fP'').
@@ -64,7 +66,7 @@ only on Debian systems
    */
    { "sort_alias",     DT_SORT|DT_SORT_ALIAS,  R_NONE, UL &SortAlias, SORT_ALIAS },
    /*
-@@ -3358,6 +3377,9 @@
+@@ -3348,6 +3367,9 @@
    ** is set to deliver directly via SMTP (see $$smtp_url), this
    ** option does nothing: mutt will never write out the ``Bcc:'' header
    ** in this case.