From: Christoph Berg Date: Wed, 21 Mar 2007 20:54:08 +0000 (+0100) Subject: mutt (1.5.14+cvs20070321-1) experimental; urgency=low X-Git-Tag: 1.5.14+cvs20070321-1 X-Git-Url: https://git.llucax.com/software/mutt-debian.git/commitdiff_plain/0f1a08eb5b6fe56944418dc42fbaa104052579f2?hp=--cc mutt (1.5.14+cvs20070321-1) experimental; urgency=low * Move source package to http://hg.debian.org/hg/pkg-mutt/debian-mutt. * debian/control: Add XS-Vcs fields. * New snapshot: + More space for the "help" string (Closes: #415277). + --buffy-size is a config option, $check_mbox_size (Closes: #379472). * Patches: + gpg.rc: upstream ships without absolute paths, our patch is much simpler now. + compressed-folders: refreshed. * Mention /etc/Muttrc defaults in documentation (Closes: #388667). * debian-ldap-query: Support middle names (Closes: #415653). --- 0f1a08eb5b6fe56944418dc42fbaa104052579f2 diff --git a/debian/changelog b/debian/changelog index b9d4f4d..bbc185b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +mutt (1.5.14+cvs20070321-1) experimental; urgency=low + + * Move source package to http://hg.debian.org/hg/pkg-mutt/debian-mutt. + * debian/control: Add XS-Vcs fields. + * New snapshot: + + More space for the "help" string (Closes: #415277). + + --buffy-size is a config option, $check_mbox_size (Closes: #379472). + * Patches: + + gpg.rc: upstream ships without absolute paths, our patch is much simpler + now. + + compressed-folders: refreshed. + * Mention /etc/Muttrc defaults in documentation (Closes: #388667). + * debian-ldap-query: Support middle names (Closes: #415653). + + -- Christoph Berg Wed, 21 Mar 2007 21:54:08 +0100 + mutt (1.5.14+cvs20070315-1) experimental; urgency=low * New upstream snapshot (now from mercurial). diff --git a/debian/control b/debian/control index 1ab0bca..51f4122 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,8 @@ Maintainer: Adeodato Simó Uploaders: Christoph Berg Build-Depends: debhelper, quilt (>= 0.40-1), autotools-dev, gawk, gettext, xsltproc, docbook-xml, docbook-xsl, links, libncurses5-dev, libsasl2-dev, libgnutls-dev, libidn11-dev, zlib1g-dev, libncursesw5-dev, libdb4.4-dev, libgpgme11-dev Standards-Version: 3.7.2 +XS-Vcs-Browser: http://hg.debian.org/hg/pkg-mutt/debian-mutt +XS-Vcs-Hg: http://hg.debian.org/hg/pkg-mutt/debian-mutt Package: mutt Architecture: any diff --git a/debian/extra/lib/debian-ldap-query b/debian/extra/lib/debian-ldap-query index c30c940..f4e3ae4 100755 --- a/debian/extra/lib/debian-ldap-query +++ b/debian/extra/lib/debian-ldap-query @@ -5,7 +5,7 @@ use strict; -my @attrs = qw(sn cn ircnick uid); +my @attrs = qw(sn mn cn ircnick uid); my $base = 'ou=users, dc=debian, dc=org'; my $server = 'db.debian.org'; my $port = 389; @@ -32,10 +32,12 @@ foreach my $search (@ARGV) { ) or die 'Failed search'; foreach my $entry ($mesg->entries) { my $uid = $entry->get_value('uid') || next; - my $fname = $entry->get_value('cn') || ''; - my $lname = $entry->get_value('sn') || ''; + my $fname = $entry->get_value('cn') || ''; + my $mname = $entry->get_value('mn') || ''; + $mname .= ' ' if $mname; + my $lname = $entry->get_value('sn') || ''; my $nick = $entry->get_value('ircnick')|| ''; - push @results, "<$uid\@debian.org>\t$fname $lname\t($nick)\n"; + push @results, "<$uid\@debian.org>\t$fname $mname$lname\t($nick)\n"; } } diff --git a/debian/patches/debian-specific/document_debian_defaults b/debian/patches/debian-specific/document_debian_defaults new file mode 100644 index 0000000..3726953 --- /dev/null +++ b/debian/patches/debian-specific/document_debian_defaults @@ -0,0 +1,54 @@ +Index: debian-mutt/init.h +=================================================================== +--- debian-mutt.orig/init.h 2007-03-21 21:58:13.000000000 +0100 ++++ debian-mutt/init.h 2007-03-21 22:10:38.000000000 +0100 +@@ -289,6 +289,9 @@ struct option_t MuttVars[] = { + ** .pp + ** When this variable is set, mutt will include Delivered-To headers when + ** bouncing messages. Postfix users may wish to unset this variable. ++ ** .pp ++ ** \fBNote:\fP On Debian systems, this option is unset by default in ++ ** /etc/Muttrc. + */ + { "braille_friendly", DT_BOOL, R_NONE, OPTBRAILLEFRIENDLY, 0 }, + /* +@@ -798,6 +801,9 @@ struct option_t MuttVars[] = { + ** Specifies the hostname to use after the ``@'' in local e-mail + ** addresses. This overrides the compile time definition obtained from + ** /etc/resolv.conf. ++ ** .pp ++ ** \fBNote:\fP On Debian systems, the default for this variable is obtained ++ ** from /etc/mailname when Mutt starts. + */ + { "ignore_linear_white_space", DT_BOOL, R_NONE, OPTIGNORELWS, 0 }, + /* +@@ -1301,6 +1307,9 @@ struct option_t MuttVars[] = { + ** system. It is used with various sets of parameters to gather the + ** list of known remailers, and to finally send a message through the + ** mixmaster chain. ++ ** .pp ++ ** \fBNote:\fP On Debian systems, this option is set by default to ++ ** ``mixmaster-filter'' in /etc/Muttrc. + */ + #endif + +@@ -2626,6 +2635,9 @@ struct option_t MuttVars[] = { + ** .pp + ** You may optionally use the reverse- prefix to specify reverse sorting + ** order (example: set sort=reverse-date-sent). ++ ** .pp ++ ** \fBNote:\fP On Debian systems, this option is set by default to ++ ** ``threads'' in /etc/Muttrc. + */ + { "sort_alias", DT_SORT|DT_SORT_ALIAS, R_NONE, UL &SortAlias, SORT_ALIAS }, + /* +@@ -3022,6 +3034,9 @@ struct option_t MuttVars[] = { + ** is set to deliver directly via SMTP (see ``$$smtp_url''), this + ** option does nothing: mutt will never write out the BCC header + ** in this case. ++ ** .pp ++ ** \fBNote:\fP On Debian systems, exim4 and postfix strip BCC headers by ++ ** default. The above warning applies to exim3 users, see /etc/Muttrc. + */ + {"xterm_icon", DT_STR, R_BOTH, UL &XtermIcon, UL "M%?n?AIL&ail?"}, + /* 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 76794cc..f73d76d 100644 --- a/debian/patches/debian-specific/dont_document_not_present_features.diff +++ b/debian/patches/debian-specific/dont_document_not_present_features.diff @@ -1,23 +1,26 @@ ---- init.h.orig -+++ init.h -@@ -80,9 +80,9 @@ - #define ISPELL "ispell" +Index: init.h +=================================================================== +--- init.h.orig 2007-03-21 21:33:20.000000000 +0100 ++++ init.h 2007-03-21 21:35:32.000000000 +0100 +@@ -19,7 +19,7 @@ + + #ifdef _MAKEDOC + # include "config.h" +-# include "makedoc-defs.h" ++/* # include "makedoc-defs.h" include only documented options for Debian */ + #else + # include "sort.h" #endif +Index: functions.h +=================================================================== +--- functions.h.orig 2007-03-21 21:35:37.000000000 +0100 ++++ functions.h 2007-03-21 21:35:51.000000000 +0100 +@@ -35,7 +35,7 @@ --/* build complete documentation */ -+/* Disable "build complete documentation" for Debian */ + #ifdef _MAKEDOC + # include "config.h" +-# include "makedoc-defs.h" ++/* # include "makedoc-defs.h" include only documented options for Debian */ + #endif --#ifdef _MAKEDOC -+#if 0 - # ifndef USE_IMAP - # define USE_IMAP - # endif -@@ -2015,7 +2015,7 @@ - ** .pp - ** Example: set certificate_file=~/.mutt/certificates - */ --# if defined _MAKEDOC || !defined(USE_SSL_GNUTLS) -+# ifndef USE_SSL_GNUTLS - { "ssl_usesystemcerts", DT_BOOL, R_NONE, OPTSSLSYSTEMCERTS, 1 }, - /* - ** .pp + struct binding_t OpGeneric[] = { /* map: generic */ diff --git a/debian/patches/features/compressed-folders b/debian/patches/features/compressed-folders index 288ab6f..cae3fb3 100644 --- a/debian/patches/features/compressed-folders +++ b/debian/patches/features/compressed-folders @@ -15,12 +15,13 @@ The home page for this patch is: $(for f in Makefile.in config.h.in configure 'Muttrc*' doc/manual.txt \ doc/manual.sgml 'doc/manual*.html' doc/muttrc.man; do echo "-x $f"; done) - 2007-03-13 myon: update for 1.5.14+tip (conflict in hook.c) + - 2007-03-20 myon: conflict in mx.c resolved (BUFFY_SIZE is gone) == END PATCH -Index: mutt/compress.c +Index: debian-mutt/compress.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ mutt/compress.c 2007-03-13 20:59:30.000000000 +0100 ++++ debian-mutt/compress.c 2007-03-21 21:28:21.000000000 +0100 @@ -0,0 +1,499 @@ +/* + * Copyright (C) 1997 Alain Penders @@ -521,10 +522,10 @@ Index: mutt/compress.c +} + +#endif /* USE_COMPRESSED */ -Index: mutt/compress.h +Index: debian-mutt/compress.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ mutt/compress.h 2007-03-13 20:59:30.000000000 +0100 ++++ debian-mutt/compress.h 2007-03-21 21:28:21.000000000 +0100 @@ -0,0 +1,27 @@ +/* + * Copyright (C) 1997 Alain Penders @@ -553,11 +554,11 @@ Index: mutt/compress.h +int mutt_test_compress_command (const char *); +int mutt_check_mailbox_compressed (CONTEXT *); +void mutt_fast_close_compressed (CONTEXT *); -Index: mutt/configure.in +Index: debian-mutt/configure.ac =================================================================== ---- mutt.orig/configure.in 2007-03-13 20:53:07.000000000 +0100 -+++ mutt/configure.in 2007-03-13 20:59:30.000000000 +0100 -@@ -807,6 +807,11 @@ AC_ARG_ENABLE(locales-fix, AC_HELP_STRIN +--- debian-mutt.orig/configure.ac 2007-03-21 21:25:18.000000000 +0100 ++++ debian-mutt/configure.ac 2007-03-21 21:28:21.000000000 +0100 +@@ -803,6 +803,11 @@ AC_ARG_ENABLE(locales-fix, AC_HELP_STRIN AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ]) fi]) @@ -569,10 +570,10 @@ Index: mutt/configure.in AC_ARG_WITH(exec-shell, AC_HELP_STRING([--with-exec-shell=SHELL], [Specify alternate shell (ONLY if /bin/sh is broken)]), [if test $withval != yes; then AC_DEFINE_UNQUOTED(EXECSHELL, "$withval", -Index: mutt/curs_main.c +Index: debian-mutt/curs_main.c =================================================================== ---- mutt.orig/curs_main.c 2007-03-13 20:53:07.000000000 +0100 -+++ mutt/curs_main.c 2007-03-13 20:59:30.000000000 +0100 +--- debian-mutt.orig/curs_main.c 2007-03-20 22:52:50.000000000 +0100 ++++ debian-mutt/curs_main.c 2007-03-21 21:28:21.000000000 +0100 @@ -1090,6 +1090,11 @@ int mutt_index_menu (void) { int check; @@ -585,11 +586,11 @@ Index: mutt/curs_main.c mutt_str_replace (&LastFolder, Context->path); oldcount = Context ? Context->msgcount : 0; -Index: mutt/doc/manual.xml.head +Index: debian-mutt/doc/manual.xml.head =================================================================== ---- mutt.orig/doc/manual.xml.head 2007-03-13 20:53:07.000000000 +0100 -+++ mutt/doc/manual.xml.head 2007-03-13 20:59:30.000000000 +0100 -@@ -4843,6 +4843,205 @@ becomes an issue as mutt will silently f +--- debian-mutt.orig/doc/manual.xml.head 2007-03-20 22:31:20.000000000 +0100 ++++ debian-mutt/doc/manual.xml.head 2007-03-21 21:28:21.000000000 +0100 +@@ -4910,6 +4910,205 @@ becomes an issue as mutt will silently f @@ -795,11 +796,11 @@ Index: mutt/doc/manual.xml.head Mutt's MIME Support -Index: mutt/doc/muttrc.man.head +Index: debian-mutt/doc/muttrc.man.head =================================================================== ---- mutt.orig/doc/muttrc.man.head 2007-03-13 20:53:07.000000000 +0100 -+++ mutt/doc/muttrc.man.head 2007-03-13 20:59:30.000000000 +0100 -@@ -316,6 +316,24 @@ specify the ID of the public key to be u +--- debian-mutt.orig/doc/muttrc.man.head 2007-03-20 22:31:20.000000000 +0100 ++++ debian-mutt/doc/muttrc.man.head 2007-03-21 21:28:21.000000000 +0100 +@@ -345,6 +345,24 @@ specify the ID of the public key to be u to a certain recipient. The meaning of "key ID" is to be taken broadly: This can be a different e-mail address, a numerical key ID, or even just an arbitrary search string. @@ -824,10 +825,10 @@ Index: mutt/doc/muttrc.man.head .TP \fBpush\fP \fIstring\fP This command adds the named \fIstring\fP to the keyboard buffer. -Index: mutt/hook.c +Index: debian-mutt/hook.c =================================================================== ---- mutt.orig/hook.c 2007-03-13 20:53:07.000000000 +0100 -+++ mutt/hook.c 2007-03-13 21:00:40.000000000 +0100 +--- debian-mutt.orig/hook.c 2007-03-20 22:31:20.000000000 +0100 ++++ debian-mutt/hook.c 2007-03-21 21:28:21.000000000 +0100 @@ -24,6 +24,10 @@ #include "mailbox.h" #include "mutt_crypt.h" @@ -856,11 +857,11 @@ Index: mutt/hook.c else if (DefaultHook && !(data & (M_CHARSETHOOK | M_ICONVHOOK | M_ACCOUNTHOOK)) && (!WithCrypto || !(data & M_CRYPTHOOK)) ) -Index: mutt/init.h +Index: debian-mutt/init.h =================================================================== ---- mutt.orig/init.h 2007-03-13 20:53:07.000000000 +0100 -+++ mutt/init.h 2007-03-13 20:59:30.000000000 +0100 -@@ -3167,6 +3167,11 @@ struct command_t Commands[] = { +--- debian-mutt.orig/init.h 2007-03-21 21:26:23.000000000 +0100 ++++ debian-mutt/init.h 2007-03-21 21:28:21.000000000 +0100 +@@ -3115,6 +3115,11 @@ struct command_t Commands[] = { { "fcc-hook", mutt_parse_hook, M_FCCHOOK }, { "fcc-save-hook", mutt_parse_hook, M_FCCHOOK | M_SAVEHOOK }, { "folder-hook", mutt_parse_hook, M_FOLDERHOOK }, @@ -872,11 +873,11 @@ Index: mutt/init.h { "group", parse_group, 0 }, { "ungroup", parse_ungroup, 0 }, { "hdr_order", parse_list, UL &HeaderOrderList }, -Index: mutt/main.c +Index: debian-mutt/main.c =================================================================== ---- mutt.orig/main.c 2007-03-13 20:53:07.000000000 +0100 -+++ mutt/main.c 2007-03-13 20:59:30.000000000 +0100 -@@ -404,6 +404,12 @@ static void show_version (void) +--- debian-mutt.orig/main.c 2007-03-20 22:52:50.000000000 +0100 ++++ debian-mutt/main.c 2007-03-21 21:28:21.000000000 +0100 +@@ -400,6 +400,12 @@ static void show_version (void) #else "-LOCALES_HACK " #endif @@ -889,10 +890,10 @@ Index: mutt/main.c #ifdef HAVE_WC_FUNCS "+HAVE_WC_FUNCS " -Index: mutt/Makefile.am +Index: debian-mutt/Makefile.am =================================================================== ---- mutt.orig/Makefile.am 2007-03-13 20:53:07.000000000 +0100 -+++ mutt/Makefile.am 2007-03-13 20:59:30.000000000 +0100 +--- debian-mutt.orig/Makefile.am 2007-03-21 21:25:18.000000000 +0100 ++++ debian-mutt/Makefile.am 2007-03-21 21:28:21.000000000 +0100 @@ -18,7 +18,7 @@ BUILT_SOURCES = keymap_defs.h patchlist. bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@ mutt_SOURCES = $(BUILT_SOURCES) \ @@ -911,10 +912,10 @@ Index: mutt/Makefile.am attach.h buffy.h charset.h copy.h crypthash.h dotlock.h functions.h gen_defs \ globals.h hash.h history.h init.h keymap.h mutt_crypt.h \ mailbox.h mapping.h md5.h mime.h mutt.h mutt_curses.h mutt_menu.h \ -Index: mutt/mbox.c +Index: debian-mutt/mbox.c =================================================================== ---- mutt.orig/mbox.c 2007-03-13 20:53:07.000000000 +0100 -+++ mutt/mbox.c 2007-03-13 20:59:30.000000000 +0100 +--- debian-mutt.orig/mbox.c 2007-03-20 22:31:20.000000000 +0100 ++++ debian-mutt/mbox.c 2007-03-21 21:28:21.000000000 +0100 @@ -29,6 +29,10 @@ #include "copy.h" #include "mutt_curses.h" @@ -939,11 +940,11 @@ Index: mutt/mbox.c mutt_unblock_signals (); mx_fastclose_mailbox (ctx); return 0; -Index: mutt/mutt.h +Index: debian-mutt/mutt.h =================================================================== ---- mutt.orig/mutt.h 2007-03-13 20:53:07.000000000 +0100 -+++ mutt/mutt.h 2007-03-13 20:59:30.000000000 +0100 -@@ -159,6 +159,11 @@ typedef enum +--- debian-mutt.orig/mutt.h 2007-03-20 22:52:50.000000000 +0100 ++++ debian-mutt/mutt.h 2007-03-21 21:28:21.000000000 +0100 +@@ -160,6 +160,11 @@ typedef enum #define M_ACCOUNTHOOK (1<<9) #define M_REPLYHOOK (1<<10) #define M_SEND2HOOK (1<<11) @@ -955,7 +956,7 @@ Index: mutt/mutt.h /* tree characters for linearize_tree and print_enriched_string */ #define M_TREE_LLCORNER 1 -@@ -882,6 +887,11 @@ typedef struct +@@ -886,6 +891,11 @@ typedef struct void *data; /* driver specific data */ #endif /* USE_IMAP */ @@ -967,10 +968,10 @@ Index: mutt/mutt.h short magic; /* mailbox type */ unsigned char rights[(RIGHTSMAX + 7)/8]; /* ACL bits */ -Index: mutt/mx.c +Index: debian-mutt/mx.c =================================================================== ---- mutt.orig/mx.c 2007-03-13 20:53:07.000000000 +0100 -+++ mutt/mx.c 2007-03-13 20:59:30.000000000 +0100 +--- debian-mutt.orig/mx.c 2007-03-21 21:25:18.000000000 +0100 ++++ debian-mutt/mx.c 2007-03-21 21:29:55.000000000 +0100 @@ -30,6 +30,10 @@ #include "keymap.h" #include "url.h" @@ -982,7 +983,7 @@ Index: mutt/mx.c #ifdef USE_IMAP #include "imap.h" #endif -@@ -454,6 +458,10 @@ int mx_get_magic (const char *path) +@@ -450,6 +454,10 @@ int mx_get_magic (const char *path) return (-1); } @@ -993,9 +994,9 @@ Index: mutt/mx.c return (magic); } -@@ -494,6 +502,13 @@ static int mx_open_mailbox_append (CONTE +@@ -489,6 +497,13 @@ static int mx_open_mailbox_append (CONTE + { struct stat sb; - mode_t omask; +#ifdef USE_COMPRESSED + /* special case for appending to compressed folders - @@ -1007,7 +1008,7 @@ Index: mutt/mx.c ctx->append = 1; #ifdef USE_IMAP -@@ -664,7 +679,12 @@ CONTEXT *mx_open_mailbox (const char *pa +@@ -652,7 +667,12 @@ CONTEXT *mx_open_mailbox (const char *pa } ctx->magic = mx_get_magic (path); @@ -1021,7 +1022,7 @@ Index: mutt/mx.c if(ctx->magic == 0) mutt_error (_("%s is not a mailbox."), path); -@@ -770,6 +790,10 @@ void mx_fastclose_mailbox (CONTEXT *ctx) +@@ -758,6 +778,10 @@ void mx_fastclose_mailbox (CONTEXT *ctx) mutt_free_header (&ctx->hdrs[i]); FREE (&ctx->hdrs); FREE (&ctx->v2r); @@ -1032,10 +1033,10 @@ Index: mutt/mx.c FREE (&ctx->path); FREE (&ctx->pattern); if (ctx->limit_pattern) -@@ -827,6 +851,12 @@ static int sync_mailbox (CONTEXT *ctx, i +@@ -810,6 +834,12 @@ static int sync_mailbox (CONTEXT *ctx, i + if (tmp && tmp->new == 0) mutt_update_mailbox (tmp); - #endif + +#ifdef USE_COMPRESSED + if (rc == 0 && ctx->compressinfo) @@ -1045,7 +1046,7 @@ Index: mutt/mx.c return rc; } -@@ -1028,6 +1058,11 @@ int mx_close_mailbox (CONTEXT *ctx, int +@@ -1011,6 +1041,11 @@ int mx_close_mailbox (CONTEXT *ctx, int !mutt_is_spool(ctx->path) && !option (OPTSAVEEMPTY)) mx_unlink_empty (ctx->path); @@ -1057,7 +1058,7 @@ Index: mutt/mx.c mx_fastclose_mailbox (ctx); return 0; -@@ -1342,6 +1377,11 @@ int mx_check_mailbox (CONTEXT *ctx, int +@@ -1320,6 +1355,11 @@ int mx_check_mailbox (CONTEXT *ctx, int { int rc; @@ -1069,10 +1070,10 @@ Index: mutt/mx.c if (ctx) { if (ctx->locked) lock = 0; -Index: mutt/mx.h +Index: debian-mutt/mx.h =================================================================== ---- mutt.orig/mx.h 2007-03-13 20:53:07.000000000 +0100 -+++ mutt/mx.h 2007-03-13 20:59:30.000000000 +0100 +--- debian-mutt.orig/mx.h 2007-03-20 22:31:20.000000000 +0100 ++++ debian-mutt/mx.h 2007-03-21 21:28:21.000000000 +0100 @@ -40,6 +40,9 @@ enum #ifdef USE_POP , M_POP @@ -1083,16 +1084,16 @@ Index: mutt/mx.h }; WHERE short DefaultMagic INITVAL (M_MBOX); -Index: mutt/PATCHES +Index: debian-mutt/PATCHES =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ mutt/PATCHES 2007-03-13 20:59:30.000000000 +0100 ++++ debian-mutt/PATCHES 2007-03-21 21:28:21.000000000 +0100 @@ -0,0 +1 @@ +patch-1.5.14.rr.compressed.1 -Index: mutt/po/de.po +Index: debian-mutt/po/de.po =================================================================== ---- mutt.orig/po/de.po 2007-03-13 20:53:07.000000000 +0100 -+++ mutt/po/de.po 2007-03-13 20:59:30.000000000 +0100 +--- debian-mutt.orig/po/de.po 2007-03-20 22:31:20.000000000 +0100 ++++ debian-mutt/po/de.po 2007-03-21 21:28:21.000000000 +0100 @@ -1266,6 +1266,48 @@ msgstr "Prüfung des Absenders fehlgeschl msgid "Failed to figure out sender" msgstr "Kann Absender nicht ermitteln" @@ -1172,10 +1173,10 @@ Index: mutt/po/de.po #. this means ctx->changed or ctx->deleted was set, but no #. * messages were found to be changed or deleted. This should #. * never happen, is we presume it is a bug in mutt. -Index: mutt/po/POTFILES.in +Index: debian-mutt/po/POTFILES.in =================================================================== ---- mutt.orig/po/POTFILES.in 2007-03-13 20:53:07.000000000 +0100 -+++ mutt/po/POTFILES.in 2007-03-13 20:59:30.000000000 +0100 +--- debian-mutt.orig/po/POTFILES.in 2007-03-20 22:31:20.000000000 +0100 ++++ debian-mutt/po/POTFILES.in 2007-03-21 21:28:21.000000000 +0100 @@ -8,6 +8,7 @@ charset.c color.c commands.c @@ -1184,10 +1185,10 @@ Index: mutt/po/POTFILES.in crypt-gpgme.c crypt.c cryptglue.c -Index: mutt/status.c +Index: debian-mutt/status.c =================================================================== ---- mutt.orig/status.c 2007-03-13 20:53:07.000000000 +0100 -+++ mutt/status.c 2007-03-13 20:59:30.000000000 +0100 +--- debian-mutt.orig/status.c 2007-03-20 22:31:20.000000000 +0100 ++++ debian-mutt/status.c 2007-03-21 21:28:21.000000000 +0100 @@ -97,6 +97,14 @@ status_format_str (char *buf, size_t buf case 'f': diff --git a/debian/patches/misc/doc-fix-reldate.h-location b/debian/patches/misc/doc-fix-reldate.h-location deleted file mode 100644 index ab2d846..0000000 --- a/debian/patches/misc/doc-fix-reldate.h-location +++ /dev/null @@ -1,15 +0,0 @@ -Index: trunk/doc/Makefile.in -=================================================================== ---- trunk.orig/doc/Makefile.in 2007-03-15 15:47:11.000000000 +0100 -+++ trunk/doc/Makefile.in 2007-03-15 15:48:18.000000000 +0100 -@@ -483,8 +483,8 @@ mutt.1: $(srcdir)/mutt.man - - stamp-doc-xml: ../makedoc$(EXEEXT) $(top_srcdir)/init.h manual.xml.head \ - $(top_srcdir)/functions.h $(top_srcdir)/OPS* manual.xml.tail \ -- $(top_srcdir)/VERSION ../reldate.h -- ( date=`cut -d\" -f2 ../reldate.h`; \ -+ $(top_srcdir)/VERSION ../../reldate.h -+ ( date=`cut -d\" -f2 ../../reldate.h`; \ - sed -e "s/@VERSION\@/`cat $(top_srcdir)/VERSION` ($$date)/" $(srcdir)/manual.xml.head ;\ - $(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -s ;\ - perl $(srcdir)/gen-map-doc $(top_srcdir)/functions.h $(top_srcdir)/OPS* < $(srcdir)/manual.xml.tail \ diff --git a/debian/patches/misc/gpg.rc-paths b/debian/patches/misc/gpg.rc-paths index dd6dbb6..a095085 100644 --- a/debian/patches/misc/gpg.rc-paths +++ b/debian/patches/misc/gpg.rc-paths @@ -1,63 +1,18 @@ -Index: mutt/contrib/gpg.rc +Index: debian-mutt/contrib/gpg.rc =================================================================== ---- mutt.orig/contrib/gpg.rc 2007-03-01 23:29:39.667501960 +0100 -+++ mutt/contrib/gpg.rc 2007-03-01 23:31:40.669106920 +0100 -@@ -31,44 +31,44 @@ - # breaking PGP/MIME. - - # decode application/pgp --set pgp_decode_command="/usr/bin/gpg --status-fd=2 %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f" -+set pgp_decode_command="gpg --status-fd=2 %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f" - - # verify a pgp/mime signature --set pgp_verify_command="/usr/bin/gpg --status-fd=2 --no-verbose --quiet --batch --output - --verify %s %f" -+set pgp_verify_command="gpg --status-fd=2 --no-verbose --quiet --batch --output - --verify %s %f" - - # decrypt a pgp/mime attachment --set pgp_decrypt_command="/usr/bin/gpg --status-fd=2 %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f" -+set pgp_decrypt_command="gpg --status-fd=2 %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f" - - # create a pgp/mime signed attachment - # set pgp_sign_command="/usr/bin/gpg-2comp --comment '' --no-verbose --batch --output - %?p?--passphrase-fd 0? --armor --detach-sign --textmode %?a?-u %a? %f" --set pgp_sign_command="/usr/bin/gpg --no-verbose --batch --quiet --output - %?p?--passphrase-fd 0? --armor --detach-sign --textmode %?a?-u %a? %f" -+set pgp_sign_command="gpg --no-verbose --batch --quiet --output - %?p?--passphrase-fd 0? --armor --detach-sign --textmode %?a?-u %a? %f" - - # create a application/pgp signed (old-style) message - # set pgp_clearsign_command="/usr/bin/gpg-2comp --comment '' --no-verbose --batch --output - %?p?--passphrase-fd 0? --armor --textmode --clearsign %?a?-u %a? %f" --set pgp_clearsign_command="/usr/bin/gpg --no-verbose --batch --quiet --output - %?p?--passphrase-fd 0? --armor --textmode --clearsign %?a?-u %a? %f" -+set pgp_clearsign_command="gpg --no-verbose --batch --quiet --output - %?p?--passphrase-fd 0? --armor --textmode --clearsign %?a?-u %a? %f" +--- debian-mutt.orig/contrib/gpg.rc 2007-03-20 22:20:31.000000000 +0100 ++++ debian-mutt/contrib/gpg.rc 2007-03-20 22:25:55.000000000 +0100 +@@ -49,11 +49,11 @@ set pgp_clearsign_command="gpg --no-verb # create a pgp/mime encrypted attachment --# set pgp_encrypt_only_command="pgpewrap gpg-2comp -v --batch --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f" --set pgp_encrypt_only_command="pgpewrap /usr/bin/gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f" -+# set pgp_encrypt_only_command="/usr/lib/mutt/pgpewrap gpg-2comp -v --batch --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f" + # set pgp_encrypt_only_command="pgpewrap gpg-2comp -v --batch --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f" +-set pgp_encrypt_only_command="pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f" +set pgp_encrypt_only_command="/usr/lib/mutt/pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f" # create a pgp/mime encrypted and signed attachment --# set pgp_encrypt_sign_command="pgpewrap gpg-2comp %?p?--passphrase-fd 0? -v --batch --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f" --set pgp_encrypt_sign_command="pgpewrap /usr/bin/gpg %?p?--passphrase-fd 0? --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f" -+# set pgp_encrypt_sign_command="/usr/lib/mutt/pgpewrap gpg-2comp %?p?--passphrase-fd 0? -v --batch --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f" + # set pgp_encrypt_sign_command="pgpewrap gpg-2comp %?p?--passphrase-fd 0? -v --batch --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f" +-set pgp_encrypt_sign_command="pgpewrap gpg %?p?--passphrase-fd 0? --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f" +set pgp_encrypt_sign_command="/usr/lib/mutt/pgpewrap gpg %?p?--passphrase-fd 0? --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f" # import a key into the public key ring --set pgp_import_command="/usr/bin/gpg --no-verbose --import %f" -+set pgp_import_command="gpg --no-verbose --import %f" - - # export a key from the public key ring --set pgp_export_command="/usr/bin/gpg --no-verbose --export --armor %r" -+set pgp_export_command="gpg --no-verbose --export --armor %r" - - # verify a key --set pgp_verify_key_command="/usr/bin/gpg --verbose --batch --fingerprint --check-sigs %r" -+set pgp_verify_key_command="gpg --verbose --batch --fingerprint --check-sigs %r" - - # read in the public key ring --set pgp_list_pubring_command="/usr/bin/gpg --no-verbose --batch --quiet --with-colons --list-keys %r" -+set pgp_list_pubring_command="gpg --no-verbose --batch --quiet --with-colons --list-keys %r" - - # read in the secret key ring --set pgp_list_secring_command="/usr/bin/gpg --no-verbose --batch --quiet --with-colons --list-secret-keys %r" -+set pgp_list_secring_command="gpg --no-verbose --batch --quiet --with-colons --list-secret-keys %r" - - # fetch keys - # set pgp_getkeys_command="pkspxycwrap %r" + set pgp_import_command="gpg --no-verbose --import %f" diff --git a/debian/patches/series b/debian/patches/series index 2bce73d..a25d67e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,7 +8,6 @@ debian-specific/Md.sasl2_needs_md5.diff -p0 debian-specific/dont_rebuild_po_files.diff -p0 debian-specific/build_doc_adjustments.diff -p0 debian-specific/sort-patchlist -misc/doc-fix-reldate.h-location # features features/ifdef @@ -24,6 +23,7 @@ debian-specific/Md.etc_mailname_gethostbyname.diff -p0 debian-specific/use_usr_bin_editor.diff -p0 debian-specific/correct_docdir_in_man_page.diff -p0 debian-specific/dont_document_not_present_features.diff -p0 +debian-specific/document_debian_defaults debian-specific/assumed_charset-compat misc/define-pgp_getkeys_command.diff -p0 misc/gpg.rc-paths diff --git a/debian/rules b/debian/rules index 34b3edb..a8f85b4 100755 --- a/debian/rules +++ b/debian/rules @@ -69,11 +69,11 @@ configure: $(objdir)/configure-stamp $(objdir)/configure-stamp: $(QUILT_STAMPFN) dh_testdir - ln -sf /usr/share/misc/config.sub . - ln -sf /usr/share/misc/config.guess . + #ln -sf /usr/share/misc/config.sub . + #ln -sf /usr/share/misc/config.guess . # do not rebuild these files - touch configure.in aclocal.m4 Makefile.in configure config.h.in + touch configure.ac aclocal.m4 Makefile.in configure config.h.in -mkdir $(objdir) cd $(objdir) && \ @@ -146,7 +146,7 @@ clean: unpatch # please dpkg-source rm -f po/*.gmo - rm -f config.guess config.sub + #rm -f config.guess config.sub touch PATCHES # remove build tree