[mutt] 02/02: debian-specific/document_debian_defaults.patch updated to remove an incorrect reference to a default variable (Closes: 741166).

[Antonio Radici]

This is an automated email from the git hooks/post-receive script.

antonio pushed a commit to branch master
in repository mutt.

commit 8cddcc43b2baffbe2de2167588ce98d86595c7f8
Author: Antonio Radici <antonio at debian.org>
Date:   Sun Aug 28 19:51:02 2016 +0100

    debian-specific/document_debian_defaults.patch updated to remove an incorrect reference to a default variable (Closes: 741166).
---
 debian/changelog                                           |  2 ++
 .../patches/debian-specific/document_debian_defaults.patch | 14 ++------------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 117a62f..cda868c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ mutt (1.7.0-1) UNRELEASED; urgency=medium
       incorrectly dropped (Closes: 823971).
     + 835421-pop-digest-md5.patch to incorrectly handle pop DIGEST-MD5 auth
       (Closes: 835421).
+    + debian-specific/document_debian_defaults.patch updated to remove an
+      incorrect reference to a default variable (Closes: 741166).
 
  -- Antonio Radici <antonio at debian.org>  Sun, 28 Aug 2016 15:10:08 +0100
 
diff --git a/debian/patches/debian-specific/document_debian_defaults.patch b/debian/patches/debian-specific/document_debian_defaults.patch
index 597b259..442563a 100644
--- a/debian/patches/debian-specific/document_debian_defaults.patch
+++ b/debian/patches/debian-specific/document_debian_defaults.patch
@@ -51,17 +51,7 @@ from the default only on Debian systems.
    */
    { "smime_certificates",	DT_PATH, R_NONE, UL &SmimeCertificates, 0 },
    /*
-@@ -3440,6 +3453,9 @@
-   ** .ts
-   ** set smtp_authenticators="digest-md5:cram-md5"
-   ** .te
-+  ** .pp
-+  ** \fBNote:\fP On Debian systems, this variable defaults to the example
-+  ** mentioned. This file is managed by the ``ca-certificates'' package.
-   */
- # endif /* USE_SASL */
-   { "smtp_pass", 	DT_STR,  R_NONE, UL &SmtpPass, UL 0 },
-@@ -3487,6 +3503,9 @@
+@@ -3487,6 +3500,9 @@
    ** .pp
    ** You may optionally use the ``reverse-'' prefix to specify reverse sorting
    ** order (example: ``\fCset sort=reverse-date-sent\fP'').
@@ -71,7 +61,7 @@ from the default only on Debian systems.
    */
    { "sort_alias",	DT_SORT|DT_SORT_ALIAS,	R_NONE,	UL &SortAlias, SORT_ALIAS },
    /*
-@@ -4092,6 +4111,9 @@
+@@ -4092,6 +4108,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.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mutt/mutt.git