diff -u mutt-1.5.20/debian/control mutt-1.5.20/debian/control --- mutt-1.5.20/debian/control +++ mutt-1.5.20/debian/control @@ -1,10 +1,11 @@ Source: mutt Section: mail Priority: standard -Maintainer: Antonio Radici +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Antonio Radici Uploaders: Christoph Berg Build-Depends: automake, debhelper (>> 7), docbook-xml, docbook-xsl, - elinks-lite | elinks, gawk, gettext, libtokyocabinet-dev, libgnutls-dev, + w3m, gawk, gettext, libtokyocabinet-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.4 diff -u mutt-1.5.20/debian/changelog mutt-1.5.20/debian/changelog --- mutt-1.5.20/debian/changelog +++ mutt-1.5.20/debian/changelog @@ -1,3 +1,11 @@ +mutt (1.5.20-8ubuntu1) maverick; urgency=low + + * Merge with Debian. Remaining changes: + + debian/control, debian/patches/debian-specific/build_doc_adjustments.diff: + Use w3m (main) instead of elinks (universe) for generating documentation. + + -- أحمد المحمودي (Ahmed El-Mahmoudy) Wed, 02 Jun 2010 16:26:08 +0300 + mutt (1.5.20-8) unstable; urgency=low * debian/control: @@ -22,6 +30,14 @@ -- Christoph Berg Tue, 01 Jun 2010 23:22:26 +0200 +mutt (1.5.20-7ubuntu1) lucid; urgency=low + + * Merge with Debian testing (lp: #526096). Remaining changes: + + debian/control, debian/patches/debian-specific/build_doc_adjustments.diff: + Use w3m (main) instead of elinks (universe) for generating documentation. + + -- Michael Bienia Mon, 22 Feb 2010 23:56:44 +0100 + mutt (1.5.20-7) unstable; urgency=low * debian/NEWS: backported a note about the new behavior with attachments @@ -66,6 +82,13 @@ -- Antonio Radici Tue, 19 Jan 2010 21:57:48 +0000 +mutt (1.5.20-5ubuntu1) lucid; urgency=low + + * debian/control, debian/patches/debian-specific/build_doc_adjustments.diff: + use w3m instead of elinks for generating documentation. + + -- Mathias Gug Wed, 20 Jan 2010 18:17:56 -0500 + mutt (1.5.20-5) unstable; urgency=low * debian/patches: diff -u mutt-1.5.20/debian/patches/debian-specific/build_doc_adjustments.diff mutt-1.5.20/debian/patches/debian-specific/build_doc_adjustments.diff --- mutt-1.5.20/debian/patches/debian-specific/build_doc_adjustments.diff +++ mutt-1.5.20/debian/patches/debian-specific/build_doc_adjustments.diff @@ -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