Pull patch from upstream to fix multipart decoding. (Closes: #489283)

[software/mutt-debian.git] / debian / patches / debian-specific / build_doc_adjustments.diff

diff --git a/debian/patches/debian-specific/build_doc_adjustments.diff b/debian/patches/debian-specific/build_doc_adjustments.diff
index f16f8e521d959bcfafeca58cb83aebde916b3a35..5cbd7624f8c54c9037b4a6aa17aab5bbe06f6e82 100644 (file)
--- a/debian/patches/debian-specific/build_doc_adjustments.diff
+++ b/debian/patches/debian-specific/build_doc_adjustments.diff
@@ -1,11 +1,19 @@
---- mutt-1.5.11.orig/doc/Makefile.in
-+++ mutt-1.5.11/doc/Makefile.in
-@@ -111,13 +111,13 @@
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -100,8 +100,9 @@ uninstall-local:
  
  check:
- manual.txt: manual.html
--      -lynx -dump -nolist -with_backspaces $^ > $@ || w3m -dump $^ > $@
-+      /usr/bin/links.main -dump $^ > $@ || links -dump $^ > $@
+ manual.txt: manual.html db-cleanup.xsl
+-      -xsltproc --nonet -o manual-txt.html $(srcdir)/db-cleanup.xsl manual.html || cp manual.html manual-txt.html
+-      -lynx -dump -nolist -with_backspaces manual-txt.html > $@ || \
++      xsltproc --nonet -o manual-txt.html $(srcdir)/db-cleanup.xsl manual.html || cp manual.html manual-txt.html
++      links.main -dump $< > $@ || links -dump $< > $@ || \
++      lynx -dump -nolist -with_backspaces manual-txt.html > $@ || \
+       w3m -dump manual-txt.html > $@ || \
+       elinks -dump -no-numbering -no-references manual-txt.html > $@
+ 
+@@ -115,10 +116,10 @@ stamp-doc-rc: $(top_srcdir)/init.h maked
+       touch stamp-doc-rc
  
  manual.html: $(srcdir)/html.xsl stamp-doc-xml
 -      -xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml
@@ -16,4 +24,4 @@
 +      xsltproc --nonet $(srcdir)/chunk.xsl manual.xml
        touch stamp-doc-chunked
  
- manual.pdf: manual.tex
+ $(HTML_DOCFILES): stamp-doc-chunked