Sidebar patch replaced with the one written by Stuart Henderson (Closes: 619822)

[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 7240bef2de08690ca71e289676daf4b61d7fb84a..38f46ad5f5abf3a0b7f88890a1fc556699f4dc8a 100644 (file)
--- a/debian/patches/debian-specific/document_debian_defaults
+++ b/debian/patches/debian-specific/document_debian_defaults
@@ -1,10 +1,8 @@
 Some customization of the option which are straying from the default
 only on Debian systems
 
 Some customization of the option which are straying from the default
 only on Debian systems
 

-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
+--- a/init.h
++++ b/init.h

 @@ -312,6 +312,9 @@
    ** .pp
    ** When this variable is \fIset\fP, mutt will include Delivered-To headers when
 @@ -312,6 +312,9 @@
    ** .pp
    ** When this variable is \fIset\fP, mutt will include Delivered-To headers when


@@ -15,7 +13,7 @@ Index: mutt/init.h
    */
    { "braille_friendly", DT_BOOL, R_NONE, OPTBRAILLEFRIENDLY, 0 },
    /*
    */
    { "braille_friendly", DT_BOOL, R_NONE, OPTBRAILLEFRIENDLY, 0 },
    /*

-@@ -1032,6 +1035,9 @@
+@@ -1033,6 +1036,9 @@

    ** one is not used.
    ** .pp
    ** Also see $$use_domain and $$hidden_host.
    ** one is not used.
    ** .pp
    ** Also see $$use_domain and $$hidden_host.


@@ -25,7 +23,7 @@ Index: mutt/init.h
    */
    { "ignore_linear_white_space",    DT_BOOL, R_NONE, OPTIGNORELWS, 0 },
    /*
    */
    { "ignore_linear_white_space",    DT_BOOL, R_NONE, OPTIGNORELWS, 0 },
    /*

-@@ -1554,6 +1560,9 @@
+@@ -1566,6 +1572,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.
    ** 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.


@@ -35,7 +33,7 @@ Index: mutt/init.h
    */
  #endif
    { "move",           DT_QUAD, R_NONE, OPT_MOVE, M_NO },
    */
  #endif
    { "move",           DT_QUAD, R_NONE, OPT_MOVE, M_NO },

-@@ -2570,6 +2579,10 @@
+@@ -2585,6 +2594,10 @@

    ** This variable contains the name of either a directory, or a file which
    ** contains trusted certificates for use with OpenSSL.
    ** (S/MIME only)
    ** This variable contains the name of either a directory, or a file which
    ** contains trusted certificates for use with OpenSSL.
    ** (S/MIME only)


@@ -46,7 +44,7 @@ Index: mutt/init.h
    */
    { "smime_certificates",     DT_PATH, R_NONE, UL &SmimeCertificates, 0 },
    /*
    */
    { "smime_certificates",     DT_PATH, R_NONE, UL &SmimeCertificates, 0 },
    /*

-@@ -2776,6 +2789,9 @@
+@@ -2791,6 +2804,9 @@

    ** .ts
    ** set smtp_authenticators="digest-md5:cram-md5"
    ** .te
    ** .ts
    ** set smtp_authenticators="digest-md5:cram-md5"
    ** .te


@@ -56,7 +54,7 @@ Index: mutt/init.h
    */
  # endif /* USE_SASL */
    { "smtp_pass",      DT_STR,  R_NONE, UL &SmtpPass, UL 0 },
    */
  # endif /* USE_SASL */
    { "smtp_pass",      DT_STR,  R_NONE, UL &SmtpPass, UL 0 },

-@@ -2823,6 +2839,9 @@
+@@ -2838,6 +2854,9 @@

    ** .pp
    ** You may optionally use the ``reverse-'' prefix to specify reverse sorting
    ** order (example: ``\fCset sort=reverse-date-sent\fP'').
    ** .pp
    ** You may optionally use the ``reverse-'' prefix to specify reverse sorting
    ** order (example: ``\fCset sort=reverse-date-sent\fP'').


@@ -66,7 +64,7 @@ Index: mutt/init.h
    */
    { "sort_alias",     DT_SORT|DT_SORT_ALIAS,  R_NONE, UL &SortAlias, SORT_ALIAS },
    /*
    */
    { "sort_alias",     DT_SORT|DT_SORT_ALIAS,  R_NONE, UL &SortAlias, SORT_ALIAS },
    /*

-@@ -3348,6 +3367,9 @@
+@@ -3375,6 +3394,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.
    ** 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.