upstream/544794-smtp-batch.patch: mutt won't ask for a password if smtp_user and...

[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 472270413dbb5284150efcd2684025d416e124de..6bd1b54289d879d3036079be50dc5ad4d363c488 100644 (file)
--- a/debian/patches/debian-specific/build_doc_adjustments.diff
+++ b/debian/patches/debian-specific/build_doc_adjustments.diff
@@ -1,27 +1,28 @@
+Use elinks(1) to generate the HTML manual page
+
 --- a/doc/Makefile.am
 +++ b/doc/Makefile.am
-@@ -100,8 +100,9 @@ uninstall-local:
+@@ -100,9 +100,7 @@ uninstall-local:
  
  check:
- 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 > $@
+ manual.txt: manual.html
+-      -LC_ALL=C lynx -dump -nolist -with_backspaces manual.html > $@ || \
+-      LC_ALL=C w3m -dump manual.html > $@ || \
+-      LC_ALL=C elinks -dump -no-numbering -no-references manual.html | sed -e 's,\\001, ,g' > $@
++      LC_ALL=C elinks -dump -dump-charset utf8 -no-numbering -no-references $< > $@
  
-@@ -115,10 +116,10 @@ stamp-doc-rc: $(top_srcdir)/init.h maked
+ Muttrc: stamp-doc-rc
+ 
+@@ -114,10 +112,10 @@ stamp-doc-rc: $(top_srcdir)/init.h maked
        touch stamp-doc-rc
  
- manual.html: $(srcdir)/html.xsl stamp-doc-xml
+ manual.html: $(srcdir)/html.xsl $(srcdir)/mutt.xsl stamp-doc-xml $(srcdir)/mutt.css
 -      -xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml
 +      xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml
  
- stamp-doc-chunked: $(srcdir)/chunk.xsl stamp-doc-xml
+ stamp-doc-chunked: $(srcdir)/chunk.xsl $(srcdir)/mutt.xsl stamp-doc-xml $(srcdir)/mutt.css
 -      -xsltproc --nonet $(srcdir)/chunk.xsl manual.xml
 +      xsltproc --nonet $(srcdir)/chunk.xsl manual.xml
        touch stamp-doc-chunked
  
- $(HTML_DOCFILES): stamp-doc-chunked
+ $(CHUNKED_DOCFILES): stamp-doc-chunked