From e0fe492429aa15be0fe92b431b66506f2906c892 Mon Sep 17 00:00:00 2001 From: Antonio Radici Date: Sat, 1 Jan 2011 19:06:25 +0000 Subject: [PATCH] debian-specific/566076-build_doc_adjustments.patch: use w3m to build the manual (Closes: 566076) --- debian/changelog | 2 ++ debian/control | 2 +- ...stments.diff => 566076-build_doc_adjustments.patch} | 10 +++++----- debian/patches/series | 1 + 4 files changed, 9 insertions(+), 6 deletions(-) rename debian/patches/debian-specific/{build_doc_adjustments.diff => 566076-build_doc_adjustments.patch} (70%) diff --git a/debian/changelog b/debian/changelog index d32b091..881d87e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ mutt (1.5.21-2) UNRELEASED; urgency=low messages (Closes: 578087, 578583) + upstream/603288-split-fetches.patch: split FETCH's into smaller chunks, workaround for Exchange 2010 (Closes: 603288) + + debian-specific/566076-build_doc_adjustments.patch: use w3m to build the + manual (Closes: 566076) * debian/extra/lib/mailto-mutt: replaced by a wrapper, added the reason to NEWS.Debian (Closes: 576313) diff --git a/debian/control b/debian/control index 670dc23..32444e4 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: standard Maintainer: Antonio Radici Uploaders: Christoph Berg Build-Depends: automake, debhelper (>> 7), docbook-xml, docbook-xsl, - elinks-lite | elinks, gawk, gettext, libgnutls-dev, + w3m, gawk, gettext, libgnutls-dev, libgpgme11-dev, libidn11-dev, libkrb5-dev, libncurses5-dev, libncursesw5-dev, libsasl2-dev, pkg-config, quilt, xsltproc, zlib1g-dev, libtokyocabinet-dev [!hurd-i386], libgdbm-dev [hurd-i386] diff --git a/debian/patches/debian-specific/build_doc_adjustments.diff b/debian/patches/debian-specific/566076-build_doc_adjustments.patch similarity index 70% rename from debian/patches/debian-specific/build_doc_adjustments.diff rename to debian/patches/debian-specific/566076-build_doc_adjustments.patch index 6bd1b54..39438d9 100644 --- a/debian/patches/debian-specific/build_doc_adjustments.diff +++ b/debian/patches/debian-specific/566076-build_doc_adjustments.patch @@ -1,19 +1,19 @@ -Use elinks(1) to generate the HTML manual page +Use w3m to build the txt manual --- a/doc/Makefile.am +++ b/doc/Makefile.am -@@ -100,9 +100,7 @@ uninstall-local: +@@ -102,9 +102,7 @@ check: manual.txt: manual.html -- -LC_ALL=C lynx -dump -nolist -with_backspaces manual.html > $@ || \ +- -LC_ALL=C lynx -dump -nolist -with_backspaces -display_charset=us-ascii 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 $< > $@ ++ LC_ALL=C w3m -dump -O UTF-8 manual.html > $@ Muttrc: stamp-doc-rc -@@ -114,10 +112,10 @@ stamp-doc-rc: $(top_srcdir)/init.h maked +@@ -116,10 +114,10 @@ touch stamp-doc-rc manual.html: $(srcdir)/html.xsl $(srcdir)/mutt.xsl stamp-doc-xml $(srcdir)/mutt.css diff --git a/debian/patches/series b/debian/patches/series index 35e8a26..2b59bf4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -21,6 +21,7 @@ debian-specific/dont_document_not_present_features.diff debian-specific/document_debian_defaults debian-specific/assumed_charset-compat debian-specific/467432-write_bcc.patch +debian-specific/566076-build_doc_adjustments.patch misc/define-pgp_getkeys_command.diff misc/gpg.rc-paths misc/smime.rc -- 2.43.0