document the fact that -- is mandatory with -a, closes 530661

diff --git a/debian/changelog b/debian/changelog
index 68da9960d568851780be4c5640517dd104cbc546..a2cfc9534ba8aed6cebf4a7d0592e2863f70402e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ mutt (1.5.19-4) unstable; urgency=low
     + added pkg-config to Build-Depends
   * patches/debian-specific/529838-gnutls-autoconf.patch:
     + uses pkg-config to detect gnutls rather than libgnutls-config (Closes: 529838)
+  * patches/upstream/530661-mandatory-doubledash.patch
+    + document the mandatory usage of -- with the -a option (Closes: 530661)
 
  -- Antonio Radici <antonio@dyne.org>  Tue, 26 May 2009 23:42:51 +0100
 

diff --git a/debian/patches/misc/hyphen-as-minus.patch b/debian/patches/misc/hyphen-as-minus.patch
index 235d3e0691243e6c4bd5b700428ccf18980bca94..6dba3c47ae2365eb2e90d9c9f15261f35efbd559 100644 (file)
--- a/debian/patches/misc/hyphen-as-minus.patch
+++ b/debian/patches/misc/hyphen-as-minus.patch
@@ -113,7 +113,7 @@ signs and lintian will not complain
  .SH DESCRIPTION
  .PP
  Mutt is a small but very powerful text based program for reading and sending electronic
-@@ -132,12 +132,12 @@
+@@ -134,12 +134,12 @@
  Start Mutt with a listing of all mailboxes specified by the \fImailboxes\fP
  command.
  .IP "-z"

diff --git a/debian/patches/series b/debian/patches/series
index 1ca01f4042b6e56664a5bbedecf34aa4b409cd21..f1f7a210b66ddc1eaf4ae0eca56fc64ac6b2cdf7 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -29,6 +29,7 @@ misc/smime.rc
 
 upstream/500016-temp-cache-fix.patch
 upstream/508988-inode-sort.patch
+upstream/530661-mandatory-doubledash.patch
 
 misc/hyphen-as-minus.patch
 misc/smime_keys-manpage.patch

diff --git a/debian/patches/upstream/530661-mandatory-doubledash.patch b/debian/patches/upstream/530661-mandatory-doubledash.patch
new file mode 100644 (file)
index 0000000..a7cb468
--- /dev/null
+++ b/debian/patches/upstream/530661-mandatory-doubledash.patch
@@ -0,0 +1,49 @@
+This patch is taken up from upstream http://bugs.mutt.org/3235
+The new way getopt is called broke the possibility to use
+"mutt -a attachfile recipient"
+now -- is mandatory to separate file and recipient, even if only
+a single file is attached, this patch fixes the documentation
+to make -- mandatory
+
+--- a/doc/mutt.man
++++ b/doc/mutt.man
+@@ -82,8 +82,10 @@
+ An expanded version of the given alias is passed to stdout.
+ .IP "-a \fIfile\fP [...]"
+ Attach a file to your message using MIME.
+-To attach multiple files, separating filenames and recipient addresses with
+-"\-\-" is mandatory, e.g. \fBmutt \-a img.jpg *.png \-\- addr1 addr2\fP.
++When attaching single or multiple files, separating filenames and recipient addresses with
++"\-\-" is mandatory, e.g. \fBmutt -a image.jpg \-\- addr1\fP or
++\fBmutt \-a img.jpg *.png \-\- addr1 addr2\fP.
++The \-a option must be placed at the end of command line options.
+ .IP "-b \fIaddress\fP"
+ Specify a blind-carbon-copy (BCC) recipient
+ .IP "-c \fIaddress\fP"
+--- a/doc/manual.xml.head
++++ b/doc/manual.xml.head
+@@ -6995,9 +6995,6 @@
+ <arg choice="opt"><option>-F</option>
+ <replaceable>muttrc</replaceable>
+ </arg>
+-<arg choice="opt"><option>-a</option>
+-<replaceable>file</replaceable>
+-</arg>
+ <arg choice="opt"><option>-c</option>
+ <replaceable>address</replaceable>
+ </arg>
+@@ -7011,9 +7008,12 @@
+ <arg choice="opt" rep="repeat">
+ <replaceable>file</replaceable>
+ </arg>
+-<arg choice="plain">--</arg>
++<arg choice="opt"><option>-a</option>
++<replaceable>file</replaceable>
++<arg choice="opt" rep="repeat"/>
++--
+ </arg>
+-<arg choice="plain">
++<arg choice="plain" rep="repeat">
+ <replaceable>address</replaceable>
+ </arg>
+ <arg choice="opt" rep="repeat">