From: Antonio Radici Date: Sun, 24 May 2009 17:17:35 +0000 (+0100) Subject: adding descriptions to the patches missing it X-Git-Tag: debian/1.5.19-3~3 X-Git-Url: https://git.llucax.com/software/mutt-debian.git/commitdiff_plain/fe66e2b32214dc0b461d5e60db9acf39f6c2f7be adding descriptions to the patches missing it --- diff --git a/debian/changelog b/debian/changelog index 6d03cc6..8deb7f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,13 +6,15 @@ mutt (1.5.19-3) unstable; urgency=low + Section: debug for mutt-dbg + debhelper dependency updated to support dh_lintian + Standards-Version bumped to 3.8.1 - * debian/patches, the following patches were refreshed against upstream/1.5.19: - + features/{ifdef,maildir-mtime,xtitles,trash-folder,purge-message} - + features-old/patch-1.5.4.vk.pgp_verbose_mime - + debian-specific/{Md.etc_mailname_gethostbyname.diff,correct_docdir_in_manpage.diff, - assumed_charset-compat} - + mutt-patched/* - * debian/patches/mutt-patched/sidebar: added the new sidebar patch for 1.5.19 + * debian/patches + + added a small description to all patches missing it + + the following patches were refreshed against upstream/1.5.19: + * features/{ifdef,maildir-mtime,xtitles,trash-folder,purge-message} + * features-old/patch-1.5.4.vk.pgp_verbose_mime + * debian-specific/{Md.etc_mailname_gethostbyname.diff,correct_docdir_in_manpage.diff, + assumed_charset-compat} + * mutt-patched/* + + mutt-patched/sidebar: added the new sidebar patch for 1.5.19 * debian/rules: re-enabled building of mutt-patched for 1.5.19 -- Antonio Radici Sun, 24 May 2009 17:24:18 +0100 diff --git a/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.diff b/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.diff index 6220c0f..0e8dcf8 100644 --- a/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.diff +++ b/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.diff @@ -1,3 +1,6 @@ +If /etc/mailname is present, the hostname inside the file will be +used, rather than calling gethostbyname() on the actual hostname + --- a/init.c +++ b/init.c @@ -47,6 +47,7 @@ diff --git a/debian/patches/debian-specific/build_doc_adjustments.diff b/debian/patches/debian-specific/build_doc_adjustments.diff index 6a5159f..eab7b4c 100644 --- a/debian/patches/debian-specific/build_doc_adjustments.diff +++ b/debian/patches/debian-specific/build_doc_adjustments.diff @@ -1,3 +1,5 @@ +Use links(1) to generate the HTML manual page + --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -98,7 +98,8 @@ uninstall-local: diff --git a/debian/patches/debian-specific/correct_docdir_in_man_page.diff b/debian/patches/debian-specific/correct_docdir_in_man_page.diff index a6e5f16..0021a8d 100644 --- a/debian/patches/debian-specific/correct_docdir_in_man_page.diff +++ b/debian/patches/debian-specific/correct_docdir_in_man_page.diff @@ -1,3 +1,5 @@ +Fix the link so it points to the correct docdir and gzipped manuall + --- a/doc/mutt.man +++ b/doc/mutt.man @@ -185,7 +185,7 @@ diff --git a/debian/patches/debian-specific/document_debian_defaults b/debian/patches/debian-specific/document_debian_defaults index a2efe86..523c928 100644 --- a/debian/patches/debian-specific/document_debian_defaults +++ b/debian/patches/debian-specific/document_debian_defaults @@ -1,3 +1,6 @@ +Some customization of the option which are straying from the default +only on Debian systems + --- a/init.h +++ b/init.h @@ -304,6 +304,9 @@ struct option_t MuttVars[] = { diff --git a/debian/patches/debian-specific/dont_document_not_present_features.diff b/debian/patches/debian-specific/dont_document_not_present_features.diff index 59844ee..a453ec3 100644 --- a/debian/patches/debian-specific/dont_document_not_present_features.diff +++ b/debian/patches/debian-specific/dont_document_not_present_features.diff @@ -1,3 +1,6 @@ +As the patch says, this will add an include so only documented options +for Debian will be used + --- a/init.h +++ b/init.h @@ -19,7 +19,7 @@ diff --git a/debian/patches/debian-specific/sort-patchlist b/debian/patches/debian-specific/sort-patchlist index a2fd47f..3aedea5 100644 --- a/debian/patches/debian-specific/sort-patchlist +++ b/debian/patches/debian-specific/sort-patchlist @@ -1,3 +1,5 @@ +This patch will allow mutt -v to return a sorted list of patches + Index: trunk/patchlist.sh =================================================================== --- trunk.orig/patchlist.sh 2007-03-15 15:50:14.000000000 +0100 diff --git a/debian/patches/debian-specific/use_usr_bin_editor.diff b/debian/patches/debian-specific/use_usr_bin_editor.diff index 13baea5..c5a475b 100644 --- a/debian/patches/debian-specific/use_usr_bin_editor.diff +++ b/debian/patches/debian-specific/use_usr_bin_editor.diff @@ -1,3 +1,6 @@ +Even if EDITOR is not set, mutt will always use /usr/bin/editor (which +is set by update-alternatives), rather than falling back to vi + --- a/init.c +++ b/init.c @@ -3114,7 +3114,7 @@ void mutt_init (int skip_sys_rc, LIST *c diff --git a/debian/patches/features-old/patch-1.5.4.vk.pgp_verbose_mime b/debian/patches/features-old/patch-1.5.4.vk.pgp_verbose_mime index a953b60..de5a7ac 100644 --- a/debian/patches/features-old/patch-1.5.4.vk.pgp_verbose_mime +++ b/debian/patches/features-old/patch-1.5.4.vk.pgp_verbose_mime @@ -1,3 +1,5 @@ +Enable pgp_mime_signature_filename and pgp_mime_signature_description + --- a/globals.h +++ b/globals.h @@ -241,6 +241,8 @@ diff --git a/debian/patches/features/compressed-folders.debian b/debian/patches/features/compressed-folders.debian index c077697..91ce929 100644 --- a/debian/patches/features/compressed-folders.debian +++ b/debian/patches/features/compressed-folders.debian @@ -1,3 +1,5 @@ +to enable the use of compressed folders + --- a/config-debian.h +++ b/config-debian.h @@ -0,0 +1,4 @@ diff --git a/debian/patches/misc/am-maintainer-mode b/debian/patches/misc/am-maintainer-mode index 19b9d83..7a6024d 100644 --- a/debian/patches/misc/am-maintainer-mode +++ b/debian/patches/misc/am-maintainer-mode @@ -1,3 +1,6 @@ +Adds AM_MAINTAINER_MODE to configure.ac so the timestamp of the +automake files won't be updated + Index: debian-mutt-sidebar/configure.ac =================================================================== --- debian-mutt-sidebar.orig/configure.ac 2007-08-11 16:42:36.000000000 +0200 diff --git a/debian/patches/misc/define-pgp_getkeys_command.diff b/debian/patches/misc/define-pgp_getkeys_command.diff index b26727b..17f503c 100644 --- a/debian/patches/misc/define-pgp_getkeys_command.diff +++ b/debian/patches/misc/define-pgp_getkeys_command.diff @@ -1,3 +1,5 @@ +disabling pgp_getkeys_command until upstream fixes it + --- a/contrib/gpg.rc +++ b/contrib/gpg.rc @@ -72,6 +72,8 @@ set pgp_list_secring_command="gpg --no-v diff --git a/debian/patches/misc/gpg.rc-paths b/debian/patches/misc/gpg.rc-paths index a095085..b27b7a6 100644 --- a/debian/patches/misc/gpg.rc-paths +++ b/debian/patches/misc/gpg.rc-paths @@ -1,3 +1,5 @@ +use the correct path of pgpewrap + Index: debian-mutt/contrib/gpg.rc =================================================================== --- debian-mutt.orig/contrib/gpg.rc 2007-03-20 22:20:31.000000000 +0100 diff --git a/debian/patches/misc/smime.rc b/debian/patches/misc/smime.rc index d7ac791..f22c872 100644 --- a/debian/patches/misc/smime.rc +++ b/debian/patches/misc/smime.rc @@ -1,3 +1,6 @@ +add CA's provided by ca-certificates to the ones distributed by +the default installation of mutt + --- a/contrib/smime.rc +++ b/contrib/smime.rc @@ -4,33 +4,34 @@ diff --git a/debian/patches/mutt-patched/sidebar b/debian/patches/mutt-patched/sidebar index e142670..be531bc 100644 --- a/debian/patches/mutt-patched/sidebar +++ b/debian/patches/mutt-patched/sidebar @@ -1,3 +1,34 @@ +This is the sidebar patch. + +When enabled, mutt will show a list of mailboxes with (new) message counts in a +separate column on the left side of the screen. + +As this feature is still considered to be unstable, this patch is only applied +in the "mutt-patched" package. + +* Configuration variables: + + sidebar_delim (string, default "|") + + This specifies the delimiter between the sidebar (if visible) and + other screens. + + sidebar_visible (boolean, default no) + + This specifies whether or not to show sidebar (left-side list of folders). + + sidebar_width (integer, default 0) +- + The width of the sidebar. + +* Patch source: + - http://www.lunar-linux.org/index.php?page=mutt-sidebar + - http://lunar-linux.org/~tchan/mutt/patch-1.5.19.sidebar.20090522.txt + +* Changes made: + - 2008-08-02 myon: Refreshed patch using quilt push -f to remove hunks we do + not need (Makefile.in). + --- a/buffy.c +++ b/buffy.c @@ -261,7 +261,7 @@ diff --git a/debian/patches/mutt.org b/debian/patches/mutt.org index ee38563..571f303 100644 --- a/debian/patches/mutt.org +++ b/debian/patches/mutt.org @@ -1,3 +1,5 @@ +Dummy patch to serve as marker separating patches for mutt-patched + --- /dev/null +++ b/.mutt.org @@ -0,0 +1 @@