* Refresh patches.
[ Adeodato Simó ]
* Move the packaging back to Bazaar, adjust X-VCS-* accordingly.
+ [ Christoph Berg ]
+ * Call autoreconf at build time, drop the autotools-update patch.
+ * Refresh patches.
+
* New upstream snapshot:
+ fix segfaults with single byte 8-bit characters in index_format.
(Closes: #420598)
+ properly render subject headers with encoded linefeeds.
(Closes: #264014)
- -- Christoph Berg <myon@debian.org> Sat, 08 Sep 2007 20:26:31 +0200
+ -- Christoph Berg <myon@debian.org> Sat, 08 Sep 2007 21:43:39 +0200
mutt (1.5.16-3) unstable; urgency=medium
Priority: standard
Maintainer: Adeodato Simó <dato@net.com.org.es>
Uploaders: Christoph Berg <myon@debian.org>
-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, libgdbm-dev
+Build-Depends: debhelper, quilt (>= 0.40-1), automake, gawk, gettext, xsltproc, docbook-xml, docbook-xsl, links, libncurses5-dev, libsasl2-dev, libgnutls-dev, libidn11-dev, zlib1g-dev, libncursesw5-dev, libgdbm-dev
Standards-Version: 3.7.2
XS-Vcs-Bzr: http://bzr.debian.org/pkg-mutt/unstable
+++ /dev/null
---- configure.orig
-+++ configure
-@@ -14291,6 +14291,7 @@
- _ACEOF
-
- need_sasl=yes
-+ need_md5=yes
- fi
-
- fi;
-Index: doc/Makefile.in
-===================================================================
---- doc/Makefile.in.orig 2007-05-17 14:47:01.000000000 +0200
-+++ doc/Makefile.in 2007-05-17 14:58:34.000000000 +0200
-@@ -435,15 +435,16 @@ uninstall-local:
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -81,13 +81,14 @@ uninstall-local:
check:
manual.txt: manual.html
-- -lynx -dump -nolist -with_backspaces $^ > $@ || \
-+ /usr/bin/links.main -dump $^ > $@ || links -dump $^ > $@ || \
-+ lynx -dump -nolist -with_backspaces $^ > $@ || \
- w3m -dump $^ > $@ || \
- elinks -dump -no-numbering -no-references $^ > $@
+- -lynx -dump -nolist -with_backspaces $^ > $@ || w3m -dump $^ > $@
++ links.main -dump $^ > $@ || links -dump $^ > $@ || \
++ lynx -dump -nolist -with_backspaces $^ > $@ || w3m -dump $^ > $@
manual.html: $(srcdir)/html.xsl stamp-doc-xml
- -xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml
+++ /dev/null
---- po/Makefile.in.in.orig
-+++ po/Makefile.in.in
-@@ -85,7 +85,7 @@
- # otherwise packages like GCC can not be built if only parts of the source
- # have been downloaded.
-
--$(srcdir)/$(PACKAGE).pot: $(POTFILES) $(srcdir)/POTFILES.in
-+$(srcdir)/$(PACKAGE).pot: #$(POTFILES) $(srcdir)/POTFILES.in
- rm -f $@
- $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
- --add-comments --keyword=_ --keyword=N_ \
- 2007-06-14 myon: remove hunks for Muttrc*
== END PATCH
-Index: debian-mutt/compress.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ debian-mutt/compress.c 2007-06-14 10:57:02.000000000 +0200
+--- /dev/null
++++ b/compress.c
@@ -0,0 +1,499 @@
+/*
+ * Copyright (C) 1997 Alain Penders <Alain@Finale-Dev.com>
+}
+
+#endif /* USE_COMPRESSED */
-Index: debian-mutt/compress.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ debian-mutt/compress.h 2007-06-14 10:57:02.000000000 +0200
+--- /dev/null
++++ b/compress.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 1997 Alain Penders <Alain@Finale-Dev.com>
+int mutt_test_compress_command (const char *);
+int mutt_check_mailbox_compressed (CONTEXT *);
+void mutt_fast_close_compressed (CONTEXT *);
-Index: debian-mutt/config.h.in
-===================================================================
---- debian-mutt.orig/config.h.in 2007-06-14 10:54:19.000000000 +0200
-+++ debian-mutt/config.h.in 2007-06-14 10:57:02.000000000 +0200
-@@ -513,6 +513,9 @@
- /* Define to enable Sun mailtool attachments support. */
- #undef SUN_ATTACHMENT
-
-+/* Define to enable compressed mailboxes support */
-+#undef USE_COMPRESSED
-+
- /* Define to use dotlocking for mailboxes. */
- #undef USE_DOTLOCK
-
-Index: debian-mutt/configure
-===================================================================
---- debian-mutt.orig/configure 2007-06-14 10:54:19.000000000 +0200
-+++ debian-mutt/configure 2007-06-14 10:57:02.000000000 +0200
-@@ -1371,6 +1371,7 @@ Optional Features:
- --enable-hcache Enable header caching
- --disable-iconv Disable iconv support
- --disable-nls Do not use Native Language Support
-+ --enable-compressed Enable compressed folders support
-
- Optional Packages:
- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
-@@ -15105,6 +15106,17 @@ _ACEOF
- fi
-
-
-+# Check whether --enable-compressed or --disable-compressed was given.
-+if test "${enable_compressed+set}" = set; then
-+ enableval="$enable_compressed"; if test x$enableval = xyes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define USE_COMPRESSED 1
-+_ACEOF
-+
-+ fi
-+fi
-+
-
- # Check whether --with-exec-shell was given.
- if test "${with_exec_shell+set}" = set; then
-Index: debian-mutt/configure.ac
-===================================================================
---- debian-mutt.orig/configure.ac 2007-06-14 10:54:19.000000000 +0200
-+++ debian-mutt/configure.ac 2007-06-14 10:57:02.000000000 +0200
-@@ -785,6 +785,11 @@ AC_ARG_ENABLE(locales-fix, AC_HELP_STRIN
+--- a/configure.ac
++++ b/configure.ac
+@@ -804,6 +804,11 @@ AC_ARG_ENABLE(locales-fix, AC_HELP_STRIN
AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ])
fi])
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: debian-mutt/curs_main.c
-===================================================================
---- debian-mutt.orig/curs_main.c 2007-06-14 10:54:19.000000000 +0200
-+++ debian-mutt/curs_main.c 2007-06-14 10:57:02.000000000 +0200
-@@ -1111,6 +1111,11 @@ int mutt_index_menu (void)
+--- a/curs_main.c
++++ b/curs_main.c
+@@ -1116,6 +1116,11 @@ int mutt_index_menu (void)
{
int check;
mutt_str_replace (&LastFolder, Context->path);
oldcount = Context ? Context->msgcount : 0;
-Index: debian-mutt/doc/manual.xml.head
-===================================================================
---- debian-mutt.orig/doc/manual.xml.head 2007-06-14 10:54:19.000000000 +0200
-+++ debian-mutt/doc/manual.xml.head 2007-06-14 10:57:02.000000000 +0200
-@@ -4910,6 +4910,205 @@ becomes an issue as mutt will silently f
+--- a/doc/manual.xml.head
++++ b/doc/manual.xml.head
+@@ -4932,6 +4932,205 @@ becomes an issue as mutt will silently f
</chapter>
<chapter id="mimesupport">
<title>Mutt's MIME Support</title>
-Index: debian-mutt/doc/muttrc.man.head
-===================================================================
---- debian-mutt.orig/doc/muttrc.man.head 2007-06-14 10:54:19.000000000 +0200
-+++ debian-mutt/doc/muttrc.man.head 2007-06-14 10:57:02.000000000 +0200
+--- a/doc/muttrc.man.head
++++ b/doc/muttrc.man.head
@@ -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,
.TP
\fBpush\fP \fIstring\fP
This command adds the named \fIstring\fP to the keyboard buffer.
-Index: debian-mutt/hook.c
-===================================================================
---- debian-mutt.orig/hook.c 2007-06-14 10:54:19.000000000 +0200
-+++ debian-mutt/hook.c 2007-06-14 10:57:02.000000000 +0200
+--- a/hook.c
++++ b/hook.c
@@ -24,6 +24,10 @@
#include "mailbox.h"
#include "mutt_crypt.h"
else if (DefaultHook && !(data & (M_CHARSETHOOK | M_ICONVHOOK | M_ACCOUNTHOOK))
&& (!WithCrypto || !(data & M_CRYPTHOOK))
)
-Index: debian-mutt/init.h
-===================================================================
---- debian-mutt.orig/init.h 2007-06-14 10:54:19.000000000 +0200
-+++ debian-mutt/init.h 2007-06-14 10:57:02.000000000 +0200
-@@ -3129,6 +3129,11 @@ struct command_t Commands[] = {
+--- a/init.h
++++ b/init.h
+@@ -3172,6 +3172,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 },
{ "group", parse_group, 0 },
{ "ungroup", parse_ungroup, 0 },
{ "hdr_order", parse_list, UL &HeaderOrderList },
-Index: debian-mutt/main.c
-===================================================================
---- debian-mutt.orig/main.c 2007-06-14 10:54:19.000000000 +0200
-+++ debian-mutt/main.c 2007-06-14 10:57:02.000000000 +0200
-@@ -401,6 +401,12 @@ static void show_version (void)
+--- a/main.c
++++ b/main.c
+@@ -400,6 +400,12 @@ static void show_version (void)
#else
"-LOCALES_HACK "
#endif
#ifdef HAVE_WC_FUNCS
"+HAVE_WC_FUNCS "
-Index: debian-mutt/Makefile.am
-===================================================================
---- debian-mutt.orig/Makefile.am 2007-06-14 10:54:19.000000000 +0200
-+++ debian-mutt/Makefile.am 2007-06-14 10:57:02.000000000 +0200
+--- a/Makefile.am
++++ b/Makefile.am
@@ -18,7 +18,7 @@ BUILT_SOURCES = keymap_defs.h patchlist.
bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@
mutt_SOURCES = $(BUILT_SOURCES) \
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: debian-mutt/Makefile.in
-===================================================================
---- debian-mutt.orig/Makefile.in 2007-06-14 10:54:19.000000000 +0200
-+++ debian-mutt/Makefile.in 2007-06-14 10:57:02.000000000 +0200
-@@ -74,7 +74,7 @@ am_mutt_OBJECTS = $(am__objects_1) addrb
- attach.$(OBJEXT) base64.$(OBJEXT) browser.$(OBJEXT) \
- buffy.$(OBJEXT) color.$(OBJEXT) crypt.$(OBJEXT) \
- cryptglue.$(OBJEXT) commands.$(OBJEXT) complete.$(OBJEXT) \
-- compose.$(OBJEXT) copy.$(OBJEXT) curs_lib.$(OBJEXT) \
-+ compose.$(OBJEXT) compress.$(OBJEXT) copy.$(OBJEXT) curs_lib.$(OBJEXT) \
- curs_main.$(OBJEXT) date.$(OBJEXT) edit.$(OBJEXT) \
- enter.$(OBJEXT) flags.$(OBJEXT) init.$(OBJEXT) \
- filter.$(OBJEXT) from.$(OBJEXT) getdomain.$(OBJEXT) \
-@@ -302,7 +302,7 @@ bin_SCRIPTS = muttbug flea @SMIMEAUX_TAR
- BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h hcversion.h
- mutt_SOURCES = $(BUILT_SOURCES) \
- addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c \
-- crypt.c cryptglue.c \
-+ crypt.c cryptglue.c compress.c \
- commands.c complete.c compose.c copy.c curs_lib.c curs_main.c date.c \
- edit.c enter.c flags.c init.c filter.c from.c \
- getdomain.c group.c \
-@@ -335,7 +335,7 @@ EXTRA_mutt_SOURCES = account.c md5c.c mu
- utf8.c wcwidth.c
-
- EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO UPDATING \
-- configure account.h \
-+ configure account.h compress.h \
- 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 \
-@@ -507,6 +507,7 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/commands.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/complete.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compose.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compress.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/copy.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crypt-gpgme.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crypt-mod-pgp-classic.Po@am__quote@
-Index: debian-mutt/mbox.c
-===================================================================
---- debian-mutt.orig/mbox.c 2007-06-14 10:54:19.000000000 +0200
-+++ debian-mutt/mbox.c 2007-06-14 10:57:02.000000000 +0200
+--- a/mbox.c
++++ b/mbox.c
@@ -29,6 +29,10 @@
#include "copy.h"
#include "mutt_curses.h"
mutt_unblock_signals ();
mx_fastclose_mailbox (ctx);
return 0;
-Index: debian-mutt/mutt.h
-===================================================================
---- debian-mutt.orig/mutt.h 2007-06-14 10:54:19.000000000 +0200
-+++ debian-mutt/mutt.h 2007-06-14 10:57:02.000000000 +0200
+--- a/mutt.h
++++ b/mutt.h
@@ -160,6 +160,11 @@ typedef enum
#define M_ACCOUNTHOOK (1<<9)
#define M_REPLYHOOK (1<<10)
/* tree characters for linearize_tree and print_enriched_string */
#define M_TREE_LLCORNER 1
-@@ -885,6 +890,11 @@ typedef struct _context
+@@ -889,6 +894,11 @@ typedef struct _context
int flagged; /* how many flagged messages */
int msgnotreadyet; /* which msg "new" in pager, -1 if none */
short magic; /* mailbox type */
unsigned char rights[(RIGHTSMAX + 7)/8]; /* ACL bits */
-Index: debian-mutt/mx.c
-===================================================================
---- debian-mutt.orig/mx.c 2007-06-14 10:54:19.000000000 +0200
-+++ debian-mutt/mx.c 2007-06-14 10:57:02.000000000 +0200
+--- a/mx.c
++++ b/mx.c
@@ -30,6 +30,10 @@
#include "keymap.h"
#include "url.h"
return rc;
}
-@@ -1006,6 +1036,11 @@ int mx_close_mailbox (CONTEXT *ctx, int
+@@ -1063,6 +1093,11 @@ int mx_close_mailbox (CONTEXT *ctx, int
!mutt_is_spool(ctx->path) && !option (OPTSAVEEMPTY))
mx_unlink_empty (ctx->path);
mx_fastclose_mailbox (ctx);
return 0;
-@@ -1315,6 +1350,11 @@ int mx_check_mailbox (CONTEXT *ctx, int
+@@ -1378,6 +1413,11 @@ int mx_check_mailbox (CONTEXT *ctx, int
{
int rc;
if (ctx)
{
if (ctx->locked) lock = 0;
-Index: debian-mutt/mx.h
-===================================================================
---- debian-mutt.orig/mx.h 2007-06-14 10:54:19.000000000 +0200
-+++ debian-mutt/mx.h 2007-06-14 10:57:02.000000000 +0200
+--- a/mx.h
++++ b/mx.h
@@ -40,6 +40,9 @@ enum
#ifdef USE_POP
, M_POP
};
WHERE short DefaultMagic INITVAL (M_MBOX);
-Index: debian-mutt/PATCHES
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ debian-mutt/PATCHES 2007-06-14 10:57:02.000000000 +0200
-@@ -0,0 +1 @@
+--- a/PATCHES
++++ b/PATCHES
+@@ -5,3 +5,4 @@ patch-1.5.13.nt+ab.xtitles.4
+ patch-1.5.6.dw.maildir-mtime.1
+ patch-1.5.13.cd.ifdef.2
+ patch-1.5.8.hr.sensible_browser_position.3
+patch-1.5.16.rr.compressed.1
-Index: debian-mutt/po/de.po
-===================================================================
---- debian-mutt.orig/po/de.po 2007-06-14 10:54:19.000000000 +0200
-+++ debian-mutt/po/de.po 2007-06-14 10:57:02.000000000 +0200
-@@ -1279,6 +1279,48 @@ msgstr "Prüfung des Absenders fehlgeschl
+--- a/po/de.po
++++ b/po/de.po
+@@ -3,7 +3,7 @@ msgstr ""
+ "Project-Id-Version: 1.5.14\n"
+ "Report-Msgid-Bugs-To: \n"
+ "POT-Creation-Date: 2007-02-23 09:18-0800\n"
+-"PO-Revision-Date: 2007-02-25 12:33+0100\n"
++"PO-Revision-Date: 2007-09-08 20:55+0200\n"
+ "Last-Translator: Roland Rosenfeld <roland@spinnaker.de>\n"
+ "Language-Team: German <mutt-po@mutt.org>\n"
+ "MIME-Version: 1.0\n"
+@@ -1266,6 +1266,48 @@ msgstr "Prüfung des Absenders fehlgeschl
msgid "Failed to figure out sender"
msgstr "Kann Absender nicht ermitteln"
#: crypt.c:69
#, c-format
msgid " (current time: %c)"
-@@ -1948,6 +1990,10 @@ msgstr "Hilfe für %s"
- msgid "Bad history file format (line %d)"
- msgstr "Falsches Format der Datei früherer Eingaben (Zeile %d)"
+@@ -1926,6 +1968,10 @@ msgstr ""
+ msgid "Help for %s"
+ msgstr "Hilfe für %s"
+#: hook.c:96
+msgid "badly formatted command string"
+msgstr "Hook enthält nicht die Muster %f und %t"
+
- #: hook.c:251
+ #: hook.c:246
#, c-format
msgid "unhook: Can't do unhook * from within a hook."
-@@ -3452,18 +3498,10 @@ msgstr "Lese %s..."
+@@ -3428,18 +3474,10 @@ msgstr "Lese %s..."
msgid "Mailbox is corrupt!"
msgstr "Mailbox fehlerhaft!"
#. 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: debian-mutt/po/POTFILES.in
-===================================================================
---- debian-mutt.orig/po/POTFILES.in 2007-06-14 10:54:19.000000000 +0200
-+++ debian-mutt/po/POTFILES.in 2007-06-14 10:57:02.000000000 +0200
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
@@ -8,6 +8,7 @@ charset.c
color.c
commands.c
crypt-gpgme.c
crypt.c
cryptglue.c
-Index: debian-mutt/status.c
-===================================================================
---- debian-mutt.orig/status.c 2007-06-14 10:54:19.000000000 +0200
-+++ debian-mutt/status.c 2007-06-14 10:57:02.000000000 +0200
-@@ -99,6 +99,14 @@ status_format_str (char *buf, size_t buf
+--- a/status.c
++++ b/status.c
+@@ -97,6 +97,14 @@ status_format_str (char *buf, size_t buf
case 'f':
snprintf (fmt, sizeof(fmt), "%%%ss", prefix);
- 2007-04-03 myon: resolved conflict in browser.c
== END PATCH
-Index: debian-mutt/buffy.c
-===================================================================
---- debian-mutt.orig/buffy.c 2007-04-03 19:17:22.000000000 +0200
-+++ debian-mutt/buffy.c 2007-04-03 19:20:31.000000000 +0200
+--- a/buffy.c
++++ b/buffy.c
@@ -226,6 +226,7 @@ int mutt_parse_mailboxes (BUFFER *path,
(*tmp)->new = 0;
(*tmp)->notified = 1;
}
}
closedir (dirp);
-Index: debian-mutt/init.h
-===================================================================
---- debian-mutt.orig/init.h 2007-04-03 19:20:27.000000000 +0200
-+++ debian-mutt/init.h 2007-04-03 19:20:31.000000000 +0200
+--- a/init.h
++++ b/init.h
@@ -1086,6 +1086,16 @@ struct option_t MuttVars[] = {
** \fBDON'T CHANGE THIS SETTING UNLESS YOU ARE REALLY SURE WHAT YOU ARE
** DOING!\fP
#ifdef USE_HCACHE
{ "header_cache", DT_PATH, R_NONE, UL &HeaderCache, 0 },
/*
-Index: debian-mutt/mutt.h
-===================================================================
---- debian-mutt.orig/mutt.h 2007-04-03 19:20:27.000000000 +0200
-+++ debian-mutt/mutt.h 2007-04-03 19:20:31.000000000 +0200
-@@ -400,6 +400,7 @@ enum
+--- a/mutt.h
++++ b/mutt.h
+@@ -395,6 +395,7 @@ enum
OPTINCLUDEONLYFIRST,
OPTKEEPFLAGGED,
OPTMAILCAPSANITIZE,
OPTMAILDIRTRASH,
OPTMARKERS,
OPTMARKOLD,
-Index: debian-mutt/PATCHES
-===================================================================
---- debian-mutt.orig/PATCHES 2007-04-03 19:20:27.000000000 +0200
-+++ debian-mutt/PATCHES 2007-04-03 19:20:31.000000000 +0200
-@@ -1,2 +1,3 @@
+--- a/PATCHES
++++ b/PATCHES
+@@ -1 +1,2 @@
+patch-1.5.6.dw.maildir-mtime.1
patch-1.5.13.cd.ifdef.2
- patch-1.5.14.rr.compressed.1
-Index: debian-mutt/browser.c
-===================================================================
---- debian-mutt.orig/browser.c 2007-04-03 19:20:17.000000000 +0200
-+++ debian-mutt/browser.c 2007-04-03 19:24:32.000000000 +0200
+--- a/browser.c
++++ b/browser.c
@@ -32,6 +32,7 @@
#ifdef USE_IMAP
#include "imap.h"
}
closedir (dp);
browser_sort (state);
-@@ -442,14 +448,15 @@ static int examine_mailboxes (MUTTMENU *
+@@ -438,14 +444,15 @@ static int examine_mailboxes (MUTTMENU *
+ #ifdef USE_IMAP
if (mx_is_imap (tmp->path))
{
- imap_mailbox_state (tmp->path, &mbox);
-- add_folder (menu, state, tmp->path, NULL, mbox.new);
+- add_folder (menu, state, tmp->path, NULL, tmp->new);
+ tmp->new = mbox.new;
+ add_folder (menu, state, tmp->path, NULL, tmp);
continue;
continue;
}
#endif
-@@ -463,7 +469,7 @@ static int examine_mailboxes (MUTTMENU *
+@@ -459,7 +466,7 @@ static int examine_mailboxes (MUTTMENU *
strfcpy (buffer, NONULL(tmp->path), sizeof (buffer));
mutt_pretty_mailbox (buffer);
}
while ((tmp = tmp->next));
browser_sort (state);
-Index: debian-mutt/buffy.h
-===================================================================
---- debian-mutt.orig/buffy.h 2007-04-03 19:17:22.000000000 +0200
-+++ debian-mutt/buffy.h 2007-04-03 19:20:31.000000000 +0200
+--- a/buffy.h
++++ b/buffy.h
@@ -25,6 +25,7 @@ typedef struct buffy_t
char *path;
long size;
http://lists.df7cb.de/mutt/message/20050309.162127.a244a894.en.html
== END PATCH
-Index: debian-mutt/menu.c
-===================================================================
---- debian-mutt.orig/menu.c 2007-03-24 18:45:30.000000000 +0100
-+++ debian-mutt/menu.c 2007-06-28 21:48:47.000000000 +0200
+--- a/menu.c
++++ b/menu.c
@@ -840,8 +840,12 @@ int menu_redraw (MUTTMENU *menu)
int mutt_menuLoop (MUTTMENU *menu)
return (i);
}
}
-Index: debian-mutt/browser.c
-===================================================================
---- debian-mutt.orig/browser.c 2007-06-28 21:41:27.000000000 +0200
-+++ debian-mutt/browser.c 2007-06-28 21:48:47.000000000 +0200
+--- a/browser.c
++++ b/browser.c
@@ -56,6 +56,7 @@ typedef struct folder_t
int num;
} FOLDER;
static char LastDir[_POSIX_PATH_MAX] = "";
static char LastDirBackup[_POSIX_PATH_MAX] = "";
-@@ -510,19 +511,38 @@ static void init_menu (struct browser_st
+@@ -506,19 +507,38 @@ static void init_menu (struct browser_st
menu->tagged = 0;
if (buffy)
}
menu->redraw = REDRAW_FULL;
}
-@@ -706,7 +726,6 @@ void _mutt_select_file (char *f, size_t
+@@ -694,7 +714,6 @@ void _mutt_select_file (char *f, size_t
#endif
)
{
/* save the old directory */
strfcpy (OldLastDir, LastDir, sizeof (OldLastDir));
-Index: debian-mutt/mutt_menu.h
-===================================================================
---- debian-mutt.orig/mutt_menu.h 2007-03-20 20:42:04.000000000 +0100
-+++ debian-mutt/mutt_menu.h 2007-06-28 21:48:47.000000000 +0200
+--- a/mutt_menu.h
++++ b/mutt_menu.h
@@ -49,6 +49,7 @@ typedef struct menu_t
int offset; /* which screen row to start the index */
int pagelen; /* number of entries per screen */
/* Setting dialog != NULL overrides normal menu behaviour.
* In dialog mode menubar is hidden and prompt keys are checked before
-Index: debian-mutt/PATCHES
-===================================================================
---- debian-mutt.orig/PATCHES 2007-06-28 21:49:06.000000000 +0200
-+++ debian-mutt/PATCHES 2007-06-28 21:49:20.000000000 +0200
-@@ -4,3 +4,4 @@ patch-1.5.13.nt+ab.xtitles.4
+--- a/PATCHES
++++ b/PATCHES
+@@ -3,3 +3,4 @@ patch-1.5.13.cd.purge_message.3.4
+ patch-1.5.13.nt+ab.xtitles.4
patch-1.5.6.dw.maildir-mtime.1
patch-1.5.13.cd.ifdef.2
- patch-1.5.16.rr.compressed.1
+patch-1.5.8.hr.sensible_browser_position.3
- Fixed indentation of "appended" in mutt.h.
== END PATCH
-Index: debian-mutt/commands.c
-===================================================================
---- debian-mutt.orig/commands.c 2007-04-12 19:06:45.000000000 +0200
-+++ debian-mutt/commands.c 2007-05-16 23:09:20.000000000 +0200
+--- a/commands.c
++++ b/commands.c
@@ -688,6 +688,7 @@ int _mutt_save_message (HEADER *h, CONTE
if (option (OPTDELETEUNTAG))
mutt_set_flag (Context, h, M_TAG, 0);
return 0;
}
-Index: debian-mutt/flags.c
-===================================================================
---- debian-mutt.orig/flags.c 2007-05-16 23:08:46.000000000 +0200
-+++ debian-mutt/flags.c 2007-05-16 23:43:45.000000000 +0200
-@@ -69,7 +69,13 @@ void _mutt_set_flag (CONTEXT *ctx, HEADE
+--- a/flags.c
++++ b/flags.c
+@@ -66,7 +66,13 @@ void _mutt_set_flag (CONTEXT *ctx, HEADE
+ else if (h->deleted)
{
h->deleted = 0;
- update = 1;
- if (upd_ctx) ctx->deleted--;
+ if (upd_ctx)
+ {
#ifdef USE_IMAP
/* see my comment above */
if (ctx->magic == M_IMAP)
-@@ -91,6 +97,17 @@ void _mutt_set_flag (CONTEXT *ctx, HEADE
+@@ -88,6 +94,17 @@ void _mutt_set_flag (CONTEXT *ctx, HEADE
}
break;
case M_NEW:
if (!mutt_bit_isset(ctx->rights,M_ACL_SEEN))
-Index: debian-mutt/globals.h
-===================================================================
---- debian-mutt.orig/globals.h 2007-05-16 23:09:10.000000000 +0200
-+++ debian-mutt/globals.h 2007-05-16 23:09:20.000000000 +0200
+--- a/globals.h
++++ b/globals.h
@@ -142,6 +142,7 @@ WHERE char *StChars;
WHERE char *Status;
WHERE char *Tempdir;
WHERE char *Username;
WHERE char *Visual;
WHERE char *XtermTitle;
-Index: debian-mutt/imap/message.c
-===================================================================
---- debian-mutt.orig/imap/message.c 2007-05-16 23:08:46.000000000 +0200
-+++ debian-mutt/imap/message.c 2007-05-16 23:09:20.000000000 +0200
-@@ -816,6 +816,7 @@ int imap_copy_messages (CONTEXT* ctx, HE
+--- a/imap/message.c
++++ b/imap/message.c
+@@ -820,6 +820,7 @@ int imap_copy_messages (CONTEXT* ctx, HE
if (ctx->hdrs[n]->tagged)
{
mutt_set_flag (ctx, ctx->hdrs[n], M_DELETE, 1);
if (option (OPTDELETEUNTAG))
mutt_set_flag (ctx, ctx->hdrs[n], M_TAG, 0);
}
-@@ -823,6 +824,7 @@ int imap_copy_messages (CONTEXT* ctx, HE
+@@ -827,6 +828,7 @@ int imap_copy_messages (CONTEXT* ctx, HE
else
{
mutt_set_flag (ctx, h, M_DELETE, 1);
if (option (OPTDELETEUNTAG))
mutt_set_flag (ctx, h, M_TAG, 0);
}
-Index: debian-mutt/init.h
-===================================================================
---- debian-mutt.orig/init.h 2007-05-16 23:09:10.000000000 +0200
-+++ debian-mutt/init.h 2007-05-16 23:09:20.000000000 +0200
-@@ -2873,6 +2873,16 @@ struct option_t MuttVars[] = {
+--- a/init.h
++++ b/init.h
+@@ -2862,6 +2862,16 @@ struct option_t MuttVars[] = {
** by \fIyou\fP. The sixth character is used to indicate when a mail
** was sent to a mailing-list you subscribe to (default: L).
*/
#ifdef USE_SOCKET
{ "tunnel", DT_STR, R_NONE, UL &Tunnel, UL 0 },
/*
-Index: debian-mutt/mutt.h
-===================================================================
---- debian-mutt.orig/mutt.h 2007-05-16 23:09:10.000000000 +0200
-+++ debian-mutt/mutt.h 2007-05-16 23:09:20.000000000 +0200
-@@ -206,6 +206,7 @@ enum
+--- a/mutt.h
++++ b/mutt.h
+@@ -201,6 +201,7 @@ enum
M_DELETE,
M_UNDELETE,
M_DELETED,
M_FLAG,
M_TAG,
M_UNTAG,
-@@ -718,6 +719,7 @@ typedef struct header
+@@ -710,6 +711,7 @@ typedef struct header
unsigned int mime : 1; /* has a MIME-Version header? */
unsigned int flagged : 1; /* marked important? */
unsigned int tagged : 1;
unsigned int deleted : 1;
unsigned int changed : 1;
unsigned int attach_del : 1; /* has an attachment marked for deletion */
-@@ -889,6 +891,7 @@ typedef struct _context
+@@ -881,6 +883,7 @@ typedef struct _context
int new; /* how many new messages? */
int unread; /* how many unread messages? */
int deleted; /* how many deleted messages */
int flagged; /* how many flagged messages */
int msgnotreadyet; /* which msg "new" in pager, -1 if none */
-Index: debian-mutt/muttlib.c
-===================================================================
---- debian-mutt.orig/muttlib.c 2007-05-16 23:08:47.000000000 +0200
-+++ debian-mutt/muttlib.c 2007-05-16 23:09:20.000000000 +0200
-@@ -1384,7 +1384,9 @@ int mutt_save_confirm (const char *s, st
+--- a/muttlib.c
++++ b/muttlib.c
+@@ -1380,7 +1380,9 @@ int mutt_save_confirm (const char *s, st
if (magic > 0 && !mx_access (s, W_OK))
{
{
snprintf (tmp, sizeof (tmp), _("Append messages to %s?"), s);
if ((rc = mutt_yesorno (tmp, M_YES)) == M_NO)
-Index: debian-mutt/mx.c
-===================================================================
---- debian-mutt.orig/mx.c 2007-05-16 23:09:10.000000000 +0200
-+++ debian-mutt/mx.c 2007-05-16 23:09:20.000000000 +0200
-@@ -838,6 +838,53 @@ static int sync_mailbox (CONTEXT *ctx, i
+--- a/mx.c
++++ b/mx.c
+@@ -808,6 +808,53 @@ static int sync_mailbox (CONTEXT *ctx, i
return rc;
}
/* save changes and close mailbox */
int mx_close_mailbox (CONTEXT *ctx, int *index_hint)
{
-@@ -973,6 +1020,7 @@ int mx_close_mailbox (CONTEXT *ctx, int
+@@ -943,6 +990,7 @@ int mx_close_mailbox (CONTEXT *ctx, int
if (mutt_append_message (&f, ctx, ctx->hdrs[i], 0, CH_UPDATE_LEN) == 0)
{
mutt_set_flag (ctx, ctx->hdrs[i], M_DELETE, 1);
}
else
{
-@@ -994,6 +1042,14 @@ int mx_close_mailbox (CONTEXT *ctx, int
+@@ -964,6 +1012,14 @@ int mx_close_mailbox (CONTEXT *ctx, int
return 0;
}
#ifdef USE_IMAP
/* allow IMAP to preserve the deleted flag across sessions */
if (ctx->magic == M_IMAP)
-@@ -1194,6 +1250,12 @@ int mx_sync_mailbox (CONTEXT *ctx, int *
+@@ -1159,6 +1215,12 @@ int mx_sync_mailbox (CONTEXT *ctx, int *
msgcount = ctx->msgcount;
deleted = ctx->deleted;
#ifdef USE_IMAP
if (ctx->magic == M_IMAP)
rc = imap_sync_mailbox (ctx, purge, index_hint);
-Index: debian-mutt/postpone.c
-===================================================================
---- debian-mutt.orig/postpone.c 2007-04-12 19:06:45.000000000 +0200
-+++ debian-mutt/postpone.c 2007-05-16 23:09:20.000000000 +0200
+--- a/postpone.c
++++ b/postpone.c
@@ -279,6 +279,9 @@ int mutt_get_postponed (CONTEXT *ctx, HE
/* finished with this message, so delete it. */
mutt_set_flag (PostContext, h, M_DELETE, 1);
/* update the count for the status display */
PostCount = PostContext->msgcount - PostContext->deleted;
-Index: debian-mutt/PATCHES
-===================================================================
---- debian-mutt.orig/PATCHES 2007-05-16 23:09:10.000000000 +0200
-+++ debian-mutt/PATCHES 2007-05-16 23:09:20.000000000 +0200
+--- a/PATCHES
++++ b/PATCHES
@@ -1,3 +1,4 @@
+patch-1.5.13.cd.trash_folder.3.4
patch-1.5.13.nt+ab.xtitles.4
--- /dev/null
+Index: debian-mutt-sidebar/configure.ac
+===================================================================
+--- debian-mutt-sidebar.orig/configure.ac 2007-08-11 16:42:36.000000000 +0200
++++ debian-mutt-sidebar/configure.ac 2007-08-11 16:42:49.000000000 +0200
+@@ -9,6 +9,7 @@ AM_CONFIG_HEADER([config.h])
+
+ mutt_cv_version=`cat $srcdir/VERSION`
+ AM_INIT_AUTOMAKE(mutt, $mutt_cv_version)
++AM_MAINTAINER_MODE
+ AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ['$(top_srcdir)/VERSION'])
+
+ AC_GNU_SOURCE
+++ /dev/null
-Index: debian-mutt/Makefile.in
-===================================================================
---- debian-mutt.orig/Makefile.in 2007-06-14 10:47:56.000000000 +0200
-+++ debian-mutt/Makefile.in 2007-06-14 10:51:17.000000000 +0200
-@@ -73,10 +73,10 @@ am__objects_1 = patchlist.$(OBJEXT)
- am_mutt_OBJECTS = $(am__objects_1) addrbook.$(OBJEXT) alias.$(OBJEXT) \
- attach.$(OBJEXT) base64.$(OBJEXT) browser.$(OBJEXT) \
- buffy.$(OBJEXT) color.$(OBJEXT) crypt.$(OBJEXT) \
-- cryptglue.$(OBJEXT) commands.$(OBJEXT) complete.$(OBJEXT) \
-- compose.$(OBJEXT) compress.$(OBJEXT) copy.$(OBJEXT) curs_lib.$(OBJEXT) \
-- curs_main.$(OBJEXT) date.$(OBJEXT) edit.$(OBJEXT) \
-- enter.$(OBJEXT) flags.$(OBJEXT) init.$(OBJEXT) \
-+ cryptglue.$(OBJEXT) compress.$(OBJEXT) commands.$(OBJEXT) \
-+ complete.$(OBJEXT) compose.$(OBJEXT) copy.$(OBJEXT) \
-+ curs_lib.$(OBJEXT) curs_main.$(OBJEXT) date.$(OBJEXT) \
-+ edit.$(OBJEXT) enter.$(OBJEXT) flags.$(OBJEXT) init.$(OBJEXT) \
- filter.$(OBJEXT) from.$(OBJEXT) getdomain.$(OBJEXT) \
- group.$(OBJEXT) handler.$(OBJEXT) hash.$(OBJEXT) \
- hdrline.$(OBJEXT) headers.$(OBJEXT) help.$(OBJEXT) \
-Index: debian-mutt/config.h.in
-===================================================================
---- debian-mutt.orig/config.h.in 2007-06-14 10:47:56.000000000 +0200
-+++ debian-mutt/config.h.in 2007-06-14 10:51:11.000000000 +0200
-@@ -513,7 +513,7 @@
- /* Define to enable Sun mailtool attachments support. */
- #undef SUN_ATTACHMENT
-
--/* Define to enable compressed mailboxes support */
-+/* Define to support compressed folders. */
- #undef USE_COMPRESSED
-
- /* Define to use dotlocking for mailboxes. */
-Index: debian-mutt/configure
-===================================================================
---- debian-mutt.orig/configure 2007-06-14 10:47:56.000000000 +0200
-+++ debian-mutt/configure 2007-06-14 10:51:11.000000000 +0200
-@@ -1367,11 +1367,11 @@ Optional Features:
- --enable-nfs-fix Work around an NFS with broken attributes caching
- --enable-mailtool Enable Sun mailtool attachments support
- --enable-locales-fix The result of isprint() is unreliable
-+ --enable-compressed Enable compressed folders support
- --enable-exact-address Enable regeneration of email addresses
- --enable-hcache Enable header caching
- --disable-iconv Disable iconv support
- --disable-nls Do not use Native Language Support
-- --enable-compressed Enable compressed folders support
-
- Optional Packages:
- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
-@@ -15106,9 +15106,9 @@ _ACEOF
- fi
-
-
--# Check whether --enable-compressed or --disable-compressed was given.
-+# Check whether --enable-compressed was given.
- if test "${enable_compressed+set}" = set; then
-- enableval="$enable_compressed"; if test x$enableval = xyes; then
-+ enableval=$enable_compressed; if test x$enableval = xyes; then
-
- cat >>confdefs.h <<\_ACEOF
- #define USE_COMPRESSED 1
-@@ -15118,6 +15118,7 @@ _ACEOF
- fi
-
-
-+
- # Check whether --with-exec-shell was given.
- if test "${with_exec_shell+set}" = set; then
- withval=$with_exec_shell; if test $withval != yes; then
-# compressed folders need an autotools rerun
-features/compressed-folders
-features/compressed-folders.debian
-
# build system patches
-misc/autotools-update.diff
-debian-specific/Md.sasl2_needs_md5.diff -p0
-debian-specific/dont_rebuild_po_files.diff -p0
-debian-specific/build_doc_adjustments.diff -p0
+misc/am-maintainer-mode
+debian-specific/build_doc_adjustments.diff
debian-specific/sort-patchlist
# features
features/purge-message
features/sensible_browser_position
features-old/patch-1.5.4.vk.pgp_verbose_mime
+features/compressed-folders
+features/compressed-folders.debian
# Debian config
debian-specific/Muttrc
misc/gpg.rc-paths
# unapplied patches for custom packages
-# not-applied/patch-1.5.8.hr.sensible_browser_position.3
# not-applied/chdir
# not-applied/indexcolor
# not-applied/w3mface
$(objdir)/configure-stamp: $(QUILT_STAMPFN)
dh_testdir
- #ln -sf /usr/share/misc/config.sub .
- #ln -sf /usr/share/misc/config.guess .
-
- # do not rebuild these files
- touch configure.ac aclocal.m4 Makefile.in configure config.h.in
-
+ autoreconf --install --include=m4
-mkdir $(objdir)
cd $(objdir) && \
env CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
# please dpkg-source
rm -f po/*.gmo
- #rm -f config.guess config.sub
touch PATCHES
# remove build tree
rm -rf $(objdir)
+ # remove autotool-generated files so they don't show up in the diff.gz
+ rm -f configure config.h.in
+ rm -f Makefile.in contrib/Makefile.in imap/Makefile.in doc/Makefile.in m4/Makefile.in
+
dh_clean
.PHONY: configure build build-arch build-indep clean install binary binary-arch binary-indep patch
projects / software / mutt-debian.git / commitdiff