From: David Bremner Date: Sat, 25 Oct 2014 09:38:18 +0000 (+0200) Subject: Merge tag '0.18.2_rc1' X-Git-Tag: 0.19_rc1~41 X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=ce44657c9e4919b1e4bbbbbe37dbd72257d40736;hp=-c Merge tag '0.18.2_rc1' notmuch 0.18.2~rc1 release Conflicts: NEWS debian/changelog --- ce44657c9e4919b1e4bbbbbe37dbd72257d40736 diff --combined NEWS index 63fdaa71,546882be..a6736c4c --- a/NEWS +++ b/NEWS @@@ -1,64 -1,11 +1,72 @@@ +Notmuch 0.19 (UNRELEASED) +========================= + +Emacs Interface +--------------- + +Use the `j` key to access saved searches from anywhere in notmuch + + `j` is now globally bound to `notmuch-jump`, which provides fast, + interactive keyboard shortcuts to saved searches. For example, + with the default saved searches `j i` from anywhere in notmuch will + bring up the inbox. + +Expanded default saved search settings + + The default saved searches now include several more common searches, + as well as shortcut keys for `notmuch-jump`. + +Library changes +--------------- + +Add return status to notmuch_database_close and +notmuch_database_destroy + +nmbug +----- + +The Perl script has been translated to Python; you'll need Python 2.7 +or anything from the 3.x line. Most of the user-facing interface is +the same, but `nmbug help` is not `nmbug --help`, and the following nmbug +commands have slightly different interfaces: `archive`, `commit`, +`fetch`, `log`, `pull`, `push`, and `status`. For details on the +new interface for a given command, run `nmbug COMMAND --help`. + +nmbug-status +------------ + +`nmbug-status` can now optionally load header and footer templates +from the config file. Use something like: + + { + "meta": { + "header": "\n\n...", + "footer": "", + ... + }, + ... + }, + +Python Bindings +--------------- + +Add support for `notmuch_query_add_tag_exclude` + +Build System +------------ + +The notmuch binaries and libraries are now build with debugging symbols +by default. Users concerned with disk space should change the +defaults when configuring or use the strip(1) command. + + Notmuch 0.18.2 (2014-10-25) + =========================== + + Test Suite + ---------- + + Portability and bug fixes for test suite to improve compatibility with Emacs 24.4, gdb 7.8, and the ppc64el architecture. + Notmuch 0.18.1 (2014-06-25) =========================== diff --combined debian/changelog index 7f58b9f6,d2dd25e1..4f9dd8f2 --- a/debian/changelog +++ b/debian/changelog @@@ -1,10 -1,9 +1,16 @@@ +notmuch (0.19-1) UNRELEASED; urgency=low + + * New upstream version + * Bump libnotmuch SONAME because of API changes + + -- David Bremner Tue, 16 Sep 2014 21:02:17 +0200 + + notmuch (0.18.2~rc1-1) experimental; urgency=medium + + * Test suite bug and portability fix release. + + -- David Bremner Sat, 25 Oct 2014 10:48:16 +0200 + notmuch (0.18.1-2) unstable; urgency=medium * Update build-deps to use emacs24 on buildd (Closes: #756085) diff --combined debian/control index 6298deb2,50de2ff7..5e4947d7 --- a/debian/control +++ b/debian/control @@@ -15,11 -15,12 +15,12 @@@ Build-Depends libz-dev, python-all (>= 2.6.6-3~), python3-all (>= 3.1.2-7~), + dh-python, python-sphinx (>= 1.0), ruby, ruby-dev (>>1:1.9.3~), emacs24-nox | emacs24 (>=24~) | emacs24-lucid (>=24~) | emacs23-nox | emacs23 (>=23~) | emacs23-lucid (>=23~), - gdb [!s390x !ia64 !armel !arm64], + gdb [!s390x !ia64 !armel], dtach (>= 0.8), bash-completion (>=1.9.0~) Standards-Version: 3.9.4 @@@ -29,7 -30,7 +30,7 @@@ Vcs-Browser: http://git.notmuchmail.org Package: notmuch Architecture: any -Depends: libnotmuch3 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Depends: libnotmuch4 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Recommends: notmuch-emacs | notmuch-vim | notmuch-mutt | alot, gnupg-agent Description: thread-based email index, search and tagging Notmuch is a system for indexing, searching, reading, and tagging @@@ -39,7 -40,7 +40,7 @@@ . This package contains the notmuch command-line interface -Package: libnotmuch3 +Package: libnotmuch4 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@@ -56,7 -57,7 +57,7 @@@ Description: thread-based email index, Package: libnotmuch-dev Section: libdevel Architecture: any -Depends: ${misc:Depends}, libnotmuch3 (= ${binary:Version}) +Depends: ${misc:Depends}, libnotmuch4 (= ${binary:Version}) Description: thread-based email index, search and tagging (development) Notmuch is a system for indexing, searching, reading, and tagging large collections of email messages in maildir or mh format. It uses @@@ -69,7 -70,7 +70,7 @@@ Package: python-notmuch Architecture: all Section: python -Depends: ${misc:Depends}, ${python:Depends}, libnotmuch3 (>= ${source:Version}) +Depends: ${misc:Depends}, ${python:Depends}, libnotmuch4 (>= ${source:Version}) Description: python interface to the notmuch mail search and index library Notmuch is a system for indexing, searching, reading, and tagging large collections of email messages in maildir or mh format. It uses @@@ -82,7 -83,7 +83,7 @@@ Package: python3-notmuch Architecture: all Section: python -Depends: ${misc:Depends}, ${python3:Depends}, libnotmuch3 (>= ${source:Version}) +Depends: ${misc:Depends}, ${python3:Depends}, libnotmuch4 (>= ${source:Version}) Description: Python 3 interface to the notmuch mail search and index library Notmuch is a system for indexing, searching, reading, and tagging large collections of email messages in maildir or mh format. It uses @@@ -162,7 -163,7 +163,7 @@@ Package: notmuch-db Architecture: any Section: debug Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, libnotmuch3 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libnotmuch4 (= ${binary:Version}) Description: thread-based email index, search and tagging - debugging symbols Notmuch is a system for indexing, searching, reading, and tagging large collections of email messages in maildir or mh format. It uses diff --combined test/T310-emacs.sh index c3024021,af6b2126..d72799b4 --- a/test/T310-emacs.sh +++ b/test/T310-emacs.sh @@@ -483,7 -483,7 +483,7 @@@ test_expect_equal_file OUTPUT EXPECTE test_begin_subtest "Reply within emacs to an html-only message" add_message '[content-type]="text/html"' \ '[body]="Hi,
This is an HTML test message.

OK?"' -test_emacs "(let ((message-hidden-headers '()) (mm-text-html-renderer 'html2text)) +test_emacs "(let ((message-hidden-headers '())) (notmuch-show \"id:${gen_msg_id}\") (notmuch-show-reply) (test-output))" @@@ -877,7 -877,8 +877,8 @@@ exit EOF chmod a+x notmuch_fail test_emacs "(let ((notmuch-command \"$PWD/notmuch_fail\")) - (with-current-buffer \"*Messages*\" (erase-buffer)) + (with-current-buffer \"*Messages*\" + (let ((inhibit-read-only t)) (erase-buffer))) (with-current-buffer (get-buffer-create \"*Notmuch errors*\") (erase-buffer)) (notmuch-search \"tag:inbox\") @@@ -909,7 -910,8 +910,8 @@@ exit EOF chmod a+x notmuch_fail test_emacs "(let ((notmuch-command \"$PWD/notmuch_fail\")) - (with-current-buffer \"*Messages*\" (erase-buffer)) + (with-current-buffer \"*Messages*\" + (let ((inhibit-read-only t)) (erase-buffer))) (with-current-buffer (get-buffer-create \"*Notmuch errors*\") (erase-buffer)) (notmuch-search \"tag:inbox\") diff --combined test/test-lib.sh index b9b8fe8c,72559cce..53db9caa --- a/test/test-lib.sh +++ b/test/test-lib.sh @@@ -690,6 -690,7 +690,7 @@@ notmuch_json_show_sanitize ( sed \ -e 's|"id": "[^"]*",|"id": "XXXXX",|g' \ -e 's|"Date": "Fri, 05 Jan 2001 [^"]*0000"|"Date": "GENERATED_DATE"|g' \ + -e 's|"filename": "signature.asc",||g' \ -e 's|"filename": "/[^"]*",|"filename": "YYYYY",|g' \ -e 's|"timestamp": 97.......|"timestamp": 42|g' } @@@ -1138,7 -1139,7 +1139,7 @@@ test_emacs () rm -f OUTPUT touch OUTPUT - ${TEST_EMACSCLIENT} --socket-name="$EMACS_SERVER" --eval "(progn $@)" + ${TEST_EMACSCLIENT} --socket-name="$EMACS_SERVER" --eval "(notmuch-test-progn $@)" } test_python() {