debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-28 13:44:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'release'

Browse source 
Final 0.24.1 release
This commit is contained in:
David Bremner 2017-04-01 09:36:34 -03:00
commit 33e5802195
7 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
NEWS
View file

@ -1,4 +1,4 @@
Notmuch 0.24.1 (UNRELEASED) Notmuch 0.24.1 (2017-04-01)
=========================== ===========================
General General
@ -17,6 +17,12 @@ Fix several memory leaks in `notmuch show`.
Update NEWS for 0.24 to mention schema changes. Update NEWS for 0.24 to mention schema changes.
Fix bug in dump header.
The previous version of the dump header failed to mention the
inclusion of tags. This fix bumps the version number of the dump
format to 3. There are no other changes to the format.
Library Changes Library Changes
--------------- ---------------

13
debian/changelog vendored
View file

@ -1,8 +1,11 @@
notmuch (0.24.1-1) UNRELEASED; urgency=medium notmuch (0.24.1-1) experimental; urgency=medium
* Restore Xapian wildcard queries to from: and subject: * Restore Xapian wildcard queries to from: and subject:
* Handle empty queries for from: and subject:
* Memory leaks in notmuch show fixed
* Fix bug notmuch dump header generation
-- David Bremner <bremner@debian.org> Sat, 25 Mar 2017 11:21:34 -0300 -- David Bremner <bremner@debian.org> Sat, 01 Apr 2017 09:17:47 -0300
notmuch (0.24-1) experimental; urgency=medium notmuch (0.24-1) experimental; urgency=medium
@ -33,6 +36,12 @@ notmuch (0.24~rc0-1) experimental; urgency=medium
-- David Bremner <bremner@debian.org> Sun, 05 Mar 2017 19:32:08 -0400 -- David Bremner <bremner@debian.org> Sun, 05 Mar 2017 19:32:08 -0400
notmuch (0.23.7-2) unstable; urgency=medium
* Cherry pick 06adc276, fix use after free in libnotmuch4
-- David Bremner <bremner@debian.org> Sun, 19 Mar 2017 09:38:17 -0300
notmuch (0.23.7-1) unstable; urgency=medium notmuch (0.23.7-1) unstable; urgency=medium
* Move test suite $GNUPGHOME to /tmp to avoid problems with long build paths. * Move test suite $GNUPGHOME to /tmp to avoid problems with long build paths.

2
doc/man1/notmuch-dump.rst
View file

@ -95,7 +95,7 @@ Supported options for **dump** include
The default is to include all available types of data. The The default is to include all available types of data. The
option can be specified multiple times to select some subset. As option can be specified multiple times to select some subset. As
of version 2 of the dump format, there is a header line of the of version 3 of the dump format, there is a header line of the
following form following form
| |

2
notmuch-client.h
View file

@ -469,7 +469,7 @@ typedef enum dump_includes {
#define DUMP_INCLUDE_DEFAULT (DUMP_INCLUDE_TAGS | DUMP_INCLUDE_CONFIG | DUMP_INCLUDE_PROPERTIES) #define DUMP_INCLUDE_DEFAULT (DUMP_INCLUDE_TAGS | DUMP_INCLUDE_CONFIG | DUMP_INCLUDE_PROPERTIES)
#define NOTMUCH_DUMP_VERSION 2 #define NOTMUCH_DUMP_VERSION 3
int int
notmuch_database_dump (notmuch_database_t *notmuch, notmuch_database_dump (notmuch_database_t *notmuch,

2
notmuch-dump.c
View file

@ -84,7 +84,7 @@ print_dump_header (gzFile output, int output_format, int include)
sep = ","; sep = ",";
} }
if (include & DUMP_INCLUDE_TAGS) { if (include & DUMP_INCLUDE_TAGS) {
gzprintf (output, "%sproperties", sep); gzprintf (output, "%stags", sep);
} }
gzputs (output, "\n"); gzputs (output, "\n");
} }

3
test/T240-dump-restore.sh
View file

@ -4,9 +4,8 @@ test_description="\"notmuch dump\" and \"notmuch restore\""
NOTMUCH_NEW > /dev/null NOTMUCH_NEW > /dev/null
test_begin_subtest "dump header" test_begin_subtest "dump header"
test_subtest_known_broken
cat <<EOF > EXPECTED cat <<EOF > EXPECTED
#notmuch-dump batch-tag:2 config,properties,tags #notmuch-dump batch-tag:3 config,properties,tags
EOF EOF
notmuch dump > OUTPUT notmuch dump > OUTPUT
test_expect_equal_file EXPECTED OUTPUT test_expect_equal_file EXPECTED OUTPUT

2
test/T590-libconfig.sh
View file

@ -112,7 +112,7 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
EOF EOF
notmuch dump --include=config >OUTPUT notmuch dump --include=config >OUTPUT
cat <<'EOF' >EXPECTED cat <<'EOF' >EXPECTED
#notmuch-dump batch-tag:2 config #notmuch-dump batch-tag:3 config
#@ aaabefore beforeval #@ aaabefore beforeval
#@ key%20with%20spaces value,%20with,%20spaces%21 #@ key%20with%20spaces value,%20with,%20spaces%21
#@ testkey1 testvalue1 #@ testkey1 testvalue1