From f1c23f1883dc88d61c2229f2ea59a0d236b7d6c0 Mon Sep 17 00:00:00 2001 From: Christoph Berg Date: Thu, 28 Jun 2007 21:58:47 +0200 Subject: [PATCH] mutt (1.5.16-2) unstable; urgency=low * Finally a new unstable version :) * Disable gpgme backend again, it needs two "optional" libs we do not want to pull into "standard" now, and it is still somewhat buggy. Reopens: #263443. * Use gdbm instead of bdb for the cache files. * Enable sensible_browser_position patch. --- debian/NEWS | 8 ++++ debian/changelog | 11 +++++ debian/control | 2 +- .../sensible_browser_position} | 47 +++++++++++++------ debian/patches/series | 1 + debian/rules | 14 ++++-- 6 files changed, 64 insertions(+), 19 deletions(-) rename debian/patches/{not-applied/patch-1.5.8.hr.sensible_browser_position.3 => features/sensible_browser_position} (60%) diff --git a/debian/NEWS b/debian/NEWS index 0e9aad5..1ed1c6d 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,3 +1,11 @@ +mutt (1.5.16-2) unstable; urgency=low + + User-visible changes in this version: + * The gpgme crypt backend is not yet stable enough, disabled again. + * The imap_home_namespace variable was removed upstream. + + -- Christoph Berg Thu, 28 Jun 2007 20:58:49 +0200 + mutt (1.5.14+cvs20070301-1) experimental; urgency=low We no longer unset write_bcc in /etc/Muttrc. If your MTA does not strip Bcc: diff --git a/debian/changelog b/debian/changelog index a840390..30e109f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +mutt (1.5.16-2) unstable; urgency=low + + * Finally a new unstable version :) + * Disable gpgme backend again, it needs two "optional" libs we do not want + to pull into "standard" now, and it is still somewhat buggy. + Reopens: #263443. + * Use gdbm instead of bdb for the cache files. + * Enable sensible_browser_position patch. + + -- Christoph Berg Thu, 28 Jun 2007 21:58:47 +0200 + mutt (1.5.16-1) experimental; urgency=low * New upstream version. diff --git a/debian/control b/debian/control index 51f4122..b2dc7ae 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: mail Priority: standard 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 +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 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 diff --git a/debian/patches/not-applied/patch-1.5.8.hr.sensible_browser_position.3 b/debian/patches/features/sensible_browser_position similarity index 60% rename from debian/patches/not-applied/patch-1.5.8.hr.sensible_browser_position.3 rename to debian/patches/features/sensible_browser_position index 271b810..fd34e32 100644 --- a/debian/patches/not-applied/patch-1.5.8.hr.sensible_browser_position.3 +++ b/debian/patches/features/sensible_browser_position @@ -1,8 +1,15 @@ -Anyway, here's patch-1.5.8.hr.sensible_browser_position.3: +# vi: ft=diff +This is the sensible browser position patch by Haakon Riiser. ---- mutt-1.5.8/menu.c.orig 2005-02-12 21:01:55.000000000 +0100 -+++ mutt-1.5.8/menu.c 2005-03-09 16:39:49.000000000 +0100 -@@ -841,8 +841,12 @@ + * Found in: <20050309162127.GA5656@s> + 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 +@@ -840,8 +840,12 @@ int menu_redraw (MUTTMENU *menu) int mutt_menuLoop (MUTTMENU *menu) { @@ -15,7 +22,7 @@ Anyway, here's patch-1.5.8.hr.sensible_browser_position.3: FOREVER { if (option (OPTMENUCALLER)) -@@ -1068,6 +1072,8 @@ +@@ -1073,6 +1077,8 @@ int mutt_menuLoop (MUTTMENU *menu) break; default: @@ -24,9 +31,11 @@ Anyway, here's patch-1.5.8.hr.sensible_browser_position.3: return (i); } } ---- mutt-1.5.8/browser.c.orig 2005-02-03 19:47:52.000000000 +0100 -+++ mutt-1.5.8/browser.c 2005-03-09 16:48:31.000000000 +0100 -@@ -54,6 +54,7 @@ +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 +@@ -56,6 +56,7 @@ typedef struct folder_t int num; } FOLDER; @@ -34,7 +43,7 @@ Anyway, here's patch-1.5.8.hr.sensible_browser_position.3: static char LastDir[_POSIX_PATH_MAX] = ""; static char LastDirBackup[_POSIX_PATH_MAX] = ""; -@@ -498,19 +499,38 @@ +@@ -510,19 +511,38 @@ static void init_menu (struct browser_st menu->tagged = 0; if (buffy) @@ -79,7 +88,7 @@ Anyway, here's patch-1.5.8.hr.sensible_browser_position.3: } menu->redraw = REDRAW_FULL; } -@@ -685,7 +705,6 @@ +@@ -706,7 +726,6 @@ void _mutt_select_file (char *f, size_t #endif ) { @@ -87,9 +96,11 @@ Anyway, here's patch-1.5.8.hr.sensible_browser_position.3: /* save the old directory */ strfcpy (OldLastDir, LastDir, sizeof (OldLastDir)); ---- mutt-1.5.8/mutt_menu.h.orig 2003-10-04 21:29:27.000000000 +0200 -+++ mutt-1.5.8/mutt_menu.h 2005-03-09 16:39:49.000000000 +0100 -@@ -46,6 +46,7 @@ +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 +@@ -49,6 +49,7 @@ typedef struct menu_t int offset; /* which screen row to start the index */ int pagelen; /* number of entries per screen */ int tagprefix; @@ -97,4 +108,12 @@ Anyway, here's patch-1.5.8.hr.sensible_browser_position.3: /* 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 + 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 diff --git a/debian/patches/series b/debian/patches/series index a25d67e..07dcae7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -15,6 +15,7 @@ features/maildir-mtime features/xtitles features/trash-folder features/purge-message +features/sensible_browser_position features-old/patch-1.5.4.vk.pgp_verbose_mime # Debian config diff --git a/debian/rules b/debian/rules index a8f85b4..0deaca2 100755 --- a/debian/rules +++ b/debian/rules @@ -3,14 +3,20 @@ include /usr/share/quilt/quilt.make ### -# Uncomment one of these if you're rebuilding using them instead of libdb4.X -# HCACHE_DB := gdbm +# header cache backend +# HCACHE_DB := bdb +HCACHE_DB := gdbm # HCACHE_DB := qdbm ### +# GPGME backend +# GPGME := --enable-gpgme +### # Configure arguments -hcache_db := --without-gdbm --without-qdbm +ifeq ($(HCACHE_DB),bdb) + hcache_db := --without-gdbm --without-qdbm +endif ifeq ($(HCACHE_DB),gdbm) hcache_db := --without-qdbm --without-bdb endif @@ -31,7 +37,7 @@ confflags = --prefix=/usr \ --enable-debug \ --enable-fcntl \ --enable-hcache \ - --enable-gpgme \ + $(GPGME) \ --enable-imap \ --enable-smtp \ --enable-inodesort \ -- 2.43.0