From 57dfa08c90608b82597b77862a69f6ed083c772c Mon Sep 17 00:00:00 2001 From: Christoph Berg Date: Sat, 20 Jun 2009 15:05:41 +0200 Subject: [PATCH] Use elinks-lite (with an alternative Build-Dependency on elinks) for rendering the manual. Thanks to Ahmed El-Mahmoudy for the suggestion. (Closes: 533445) --- debian/changelog | 5 ++++- debian/control | 8 ++++---- .../debian-specific/build_doc_adjustments.diff | 15 ++++++++------- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index b849d8f..d29f619 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,8 +21,11 @@ mutt (1.5.20-2) unstable; urgency=low [ Christoph Berg ] * Remove maildir-mtime patch, upstream has a different implementation (though with different results; Closes: 533471) + * Use elinks-lite (with an alternative Build-Dependency on elinks) for + rendering the manual. Thanks to Ahmed El-Mahmoudy for the suggestion. + (Closes: 533445) - -- Christoph Berg Sat, 20 Jun 2009 13:55:09 +0200 + -- Christoph Berg Sat, 20 Jun 2009 15:00:50 +0200 mutt (1.5.20-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 360ccdd..e678a22 100644 --- a/debian/control +++ b/debian/control @@ -3,10 +3,10 @@ Section: mail Priority: standard Maintainer: Christoph Berg Uploaders: Adeodato Simó , Antonio Radici -Build-Depends: debhelper (>> 7), quilt, automake, gawk, gettext, xsltproc, - docbook-xml, docbook-xsl, links, libncurses5-dev, libsasl2-dev, libgnutls-dev, - libidn11-dev, zlib1g-dev, libncursesw5-dev, libgdbm-dev, libkrb5-dev, pkg-config, - libgpgme11-dev +Build-Depends: automake, debhelper (>> 7), docbook-xml, docbook-xsl, + elinks-lite | elinks, gawk, gettext, libgdbm-dev, libgnutls-dev, + libgpgme11-dev, libidn11-dev, libkrb5-dev, libncurses5-dev, libncursesw5-dev, + libsasl2-dev, pkg-config, quilt, xsltproc, zlib1g-dev Standards-Version: 3.8.2 Vcs-Git: git://git.debian.org/git/pkg-mutt/mutt.git Vcs-Browser: http://git.debian.org/?p=pkg-mutt/mutt.git diff --git a/debian/patches/debian-specific/build_doc_adjustments.diff b/debian/patches/debian-specific/build_doc_adjustments.diff index 71424b0..6bd1b54 100644 --- a/debian/patches/debian-specific/build_doc_adjustments.diff +++ b/debian/patches/debian-specific/build_doc_adjustments.diff @@ -1,18 +1,19 @@ -Use links(1) to generate the HTML manual page +Use elinks(1) to generate the HTML manual page --- a/doc/Makefile.am +++ b/doc/Makefile.am -@@ -100,7 +100,8 @@ +@@ -100,9 +100,7 @@ uninstall-local: check: manual.txt: manual.html - -LC_ALL=C lynx -dump -nolist -with_backspaces manual.html > $@ || \ -+ links.main -dump $< > $@ || links -dump $< > $@ || \ -+ 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 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 $< > $@ -@@ -114,10 +115,10 @@ + 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 $(srcdir)/mutt.xsl stamp-doc-xml $(srcdir)/mutt.css -- 2.43.0