doc update: clarify what attach_charset does (Closes: 502628)

diff --git a/debian/changelog b/debian/changelog
index 8ac83c20bed8afda80902a5022ce3656e29bc29e..e7218bb85703bfd6eacad1a801918fa552655d0d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,8 @@ mutt (1.5.19-4) unstable; urgency=low
     + sasl, mutt segfaults on reconnect to IMAPS server (Closes: 524420)
   * patches/upstream/350957-postponed-to-bcc.patch
     + display bcc for postponed message if there is no To (Closes: 350957)
     + sasl, mutt segfaults on reconnect to IMAPS server (Closes: 524420)
   * patches/upstream/350957-postponed-to-bcc.patch
     + display bcc for postponed message if there is no To (Closes: 350957)

+  * patches/upstream/502628-attach_charset-doc.patch
+    + doc update: clarify what attach_charset does (Closes: 502628)

 
  -- Antonio Radici <antonio@dyne.org>  Tue, 26 May 2009 23:42:51 +0100
 
 
  -- Antonio Radici <antonio@dyne.org>  Tue, 26 May 2009 23:42:51 +0100
 

diff --git a/debian/patches/series b/debian/patches/series
index c758e72e0f8bae01b155ef39021962faf79d6528..5e4b601b0926a7236c5c9146f98b1d0218e82dc4 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -35,6 +35,7 @@ upstream/493719-segfault-imap-close.patch
 upstream/514960-certificate-insecure-algorithm.patch
 upstream/524420-segfault-reconnect-sasl.patch
 upstream/350957-postponed-to-bcc.patch
 upstream/514960-certificate-insecure-algorithm.patch
 upstream/524420-segfault-reconnect-sasl.patch
 upstream/350957-postponed-to-bcc.patch

+upstream/502628-attach_charset-doc.patch

 
 misc/hyphen-as-minus.patch
 misc/manpage-typos.patch
 
 misc/hyphen-as-minus.patch
 misc/manpage-typos.patch

diff --git a/debian/patches/upstream/502628-attach_charset-doc.patch b/debian/patches/upstream/502628-attach_charset-doc.patch
new file mode 100644 (file)
index 0000000..cffdbbe
--- /dev/null
+++ b/debian/patches/upstream/502628-attach_charset-doc.patch
@@ -0,0 +1,17 @@
+clarify what attach_charset does, see http://bugs.mutt.org/3165
+and http://bugs.debian.org/502628
+
+--- a/init.h
++++ b/init.h
+@@ -197,7 +197,10 @@
+   /*
+   ** .pp
+   ** This variable is a colon-separated list of character encoding
+-  ** schemes for text file attachments.
++  ** schemes for text file attachments. Mutt uses this setting to guess
++  ** which encoding files being attached are encoded in to convert them to
++  ** a proper character set given in $$send_charset.
++  ** .pp
+   ** If \fIunset\fP, the value of $$charset will be used instead.
+   ** For example, the following configuration would work for Japanese
+   ** text handling: