debian-specific/566076-build_doc_adjustments.patch: use w3m to build the manual ...

diff --git a/debian/changelog b/debian/changelog
index d32b091e5c109927f15528cb202a5db638565d5c..881d87e396efe2ce613c21210588bb84f6503355 100644 (file)
--- 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 670dc230486558d2aeffa63854de151193ef3a6a..32444e4dde9ba66cc45761222f25aac24ade9cd5 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: standard
 Maintainer: Antonio Radici <antonio@dyne.org>
 Uploaders: Christoph Berg <myon@debian.org>
 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 6bd1b54289d879d3036079be50dc5ad4d363c488..39438d971973b4781c34c062693259fe6a63071b 100644 (file)
--- 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 35e8a26d961949ca5f42ed0b4821521f4741d0c2..2b59bf4cf3ad699f5ea1b528eac845353611ad23 100644 (file)
--- 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