Package: mutt Version: 1.5.20-5 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu lucid ubuntu-patch
*** /tmp/tmpt0BBDj In Ubuntu, we've applied the attached patch to achieve the following: * debian/control, debian/patches/debian-specific/build_doc_adjustments.diff: use w3m instead of elinks for generating documentation. We thought you might be interested in doing the same. We're trying to move elinks out of the main repository and would like to use w3m instead. You can a find both manual pages for comparison at: * http://people.canonical.com/~mathiaz/mutt-manual/manual.elinks.html * http://people.canonical.com/~mathiaz/mutt-manual/manual.w3m.html They look the same altough the html diff is quite huge. I haven't investigate the actual differences. Another advantage is to drop one part of the debian specific patch, since upstream already supports building with w3m. Thanks, -- System Information: Debian Release: squeeze/sid APT prefers lucid-updates APT policy: (500, 'lucid-updates'), (500, 'lucid-security'), (500, 'lucid') Architecture: amd64 (x86_64) Kernel: Linux 2.6.24-25-server (SMP w/2 CPU cores) Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968) Shell: /bin/sh linked to /bin/dash
=== modified file 'debian/changelog' === modified file 'debian/control' --- debian/control 2009-12-02 22:38:00 +0000 +++ debian/control 2010-01-20 23:18:09 +0000 @@ -1,10 +1,11 @@ Source: mutt Section: mail Priority: standard -Maintainer: Christoph Berg <m...@debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com> +XSBC-Original-Maintainer: Christoph Berg <m...@debian.org> Uploaders: Antonio Radici <anto...@dyne.org> Build-Depends: automake, debhelper (>> 7), docbook-xml, docbook-xsl, - elinks-lite | elinks, gawk, gettext, libgdbm-dev, libgnutls-dev, + w3m, 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.3 === modified file 'debian/patches/debian-specific/build_doc_adjustments.diff' --- debian/patches/debian-specific/build_doc_adjustments.diff 2009-06-27 23:52:24 +0000 +++ debian/patches/debian-specific/build_doc_adjustments.diff 2010-01-20 23:18:09 +0000 @@ -2,17 +2,6 @@ --- a/doc/Makefile.am +++ b/doc/Makefile.am -@@ -100,9 +100,7 @@ uninstall-local: - - check: - 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 $< > $@ - - Muttrc: stamp-doc-rc - @@ -114,10 +112,10 @@ stamp-doc-rc: $(top_srcdir)/init.h maked touch stamp-doc-rc