Muttrc: remove a hook for application/octet-stream, already upstream (Closes: 611405)

diff --git a/debian/changelog b/debian/changelog
index e8ed95fbaa32bfa429a9ca320a63d90ced2c8e38..5656a6d2924a1accf06daf2b61c80935fc890ac2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,9 @@ mutt (1.5.21-5) unstable; urgency=low
     + sidebar-utf8: rewrites make_sidebar_entry() to allow correct padding of
       utf-8 strings and also prevents segfaults due to overflows 
       (Closes: 584581, 603287)
     + sidebar-utf8: rewrites make_sidebar_entry() to allow correct padding of
       utf-8 strings and also prevents segfaults due to overflows 
       (Closes: 584581, 603287)

+  * debian/patches/debian-specific:
+    + Muttrc: remove a hook for application/octet-stream, already upstream
+      (Closes: 611405)

   * debian/extra/samples/sidebar.muttrc: documented the options that
     the sidebar-{sorted,dotted} patches are introducing; documentation 
     submitted by Julien Valroff (Closes: 603186)
   * debian/extra/samples/sidebar.muttrc: documented the options that
     the sidebar-{sorted,dotted} patches are introducing; documentation 
     submitted by Julien Valroff (Closes: 603186)

diff --git a/debian/patches/debian-specific/Muttrc b/debian/patches/debian-specific/Muttrc
index 5af37cc1bd6bdda53283b957d374ab64186b8bad..eb2d6cb92b188881ec8ecba13c227609827d3b1c 100644 (file)
--- a/debian/patches/debian-specific/Muttrc
+++ b/debian/patches/debian-specific/Muttrc
@@ -68,13 +68,3 @@
  ##
  ## *** DEFAULT SETTINGS FOR THE ATTACHMENTS PATCH ***
  ##
  ##
  ## *** DEFAULT SETTINGS FOR THE ATTACHMENTS PATCH ***
  ##

-@@ -96,6 +128,9 @@
- attachments   -A message/external-body
- attachments   -I message/external-body
- 
-+# enable mime lookup by extension
-+mime_lookup application/octet-stream
-+
- ##
- ## More settings
- ##