From 617b36f3d1e9ccdf4f0a44baba84a3d8ac76afcf Mon Sep 17 00:00:00 2001 From: David Bremner Date: Wed, 30 Jan 2019 07:15:59 -0400 Subject: [PATCH 1/7] emacs: use ".ps" suffix for PostScript temporary files. Joerg Jaspert [1] reported problems with evince reading unsuffixed temporary files in Debian. [1]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=920856 --- emacs/notmuch-print.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/emacs/notmuch-print.el b/emacs/notmuch-print.el index bca759fa..d9b3d449 100644 --- a/emacs/notmuch-print.el +++ b/emacs/notmuch-print.el @@ -69,7 +69,7 @@ Optional OUTPUT allows passing a list of flags to muttprint." (defun notmuch-print-ps-print/evince (msg) "Preview a message buffer using ps-print and evince." - (let ((ps-file (make-temp-file "notmuch")) + (let ((ps-file (make-temp-file "notmuch" nil ".ps")) (subject (notmuch-prettify-subject (plist-get (notmuch-show-get-prop :headers msg) :Subject)))) (rename-buffer subject t) @@ -82,7 +82,7 @@ Optional OUTPUT allows passing a list of flags to muttprint." (defun notmuch-print-muttprint/evince (msg) "Preview a message buffer using muttprint and evince." - (let ((ps-file (make-temp-file "notmuch"))) + (let ((ps-file (make-temp-file "notmuch" nil ".ps"))) (notmuch-print-run-muttprint (list "--printer" (concat "TO_FILE:" ps-file))) (notmuch-print-run-evince ps-file))) From a38853518eba567375ad7ea8bb3a5ecfb86dbd62 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Wed, 16 Jan 2019 22:11:31 -0400 Subject: [PATCH 2/7] configure: don't use special variable BASH bash, in it's wisdom, sets that variable when invoked as /bin/sh, but then doesn't act as bash, at least not to the degree we need to run scripts. --- configure | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index b2200be0..ea22587b 100755 --- a/configure +++ b/configure @@ -53,7 +53,7 @@ fi # Set several defaults (optionally specified by the user in # environment variables) -BASH=${BASH:-bash} +BASHCMD=${BASHCMD:-bash} PERL=${PERL:-perl} CC=${CC:-cc} CXX=${CXX:-c++} @@ -560,13 +560,13 @@ else fi printf "Checking for bash... " -if command -v ${BASH} > /dev/null; then +if command -v ${BASHCMD} > /dev/null; then have_bash=1 - bash_absolute=$(command -v ${BASH}) + bash_absolute=$(command -v ${BASHCMD}) printf "Yes (%s).\n" "$bash_absolute" else have_bash=0 - printf "No. (%s not found)\n" "${BASH}" + printf "No. (%s not found)\n" "${BASHCMD}" fi printf "Checking for perl... " From 80fc5d9ddaaa384a5c1d1394288564d2c012868a Mon Sep 17 00:00:00 2001 From: David Bremner Date: Wed, 16 Jan 2019 22:11:32 -0400 Subject: [PATCH 3/7] Debian: use new variable to force bash location This should no longer be needed on the official debian autobuilders, but it might help others with merged /usr build environments. --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index c8ecb1ac..d056edb6 100755 --- a/debian/rules +++ b/debian/rules @@ -6,7 +6,7 @@ python3_all = py3versions -s | xargs -n1 | xargs -t -I {} env {} dh $@ --with python2,python3,elpa override_dh_auto_configure: - BASH=/bin/bash ./configure --prefix=/usr \ + BASHCMD=/bin/bash ./configure --prefix=/usr \ --libdir=/usr/lib/$$(dpkg-architecture -q DEB_TARGET_MULTIARCH) \ --includedir=/usr/include \ --mandir=/usr/share/man \ From 679a2313edd6fe3cdda44cb2ac89dae594f1a840 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Fri, 1 Feb 2019 08:03:14 -0400 Subject: [PATCH 4/7] NEWS for bash related configuration change --- NEWS | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/NEWS b/NEWS index ca3ba99e..7de5ea7f 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,12 @@ +Notmuch 0.28.1 (2019-02-01) +=========================== + +Build System +------------ + +`configure` no longer uses the special variable BASH, as this causes +problems on systems where /bin/sh is bash. + Notmuch 0.28 (2018-10-12) ========================= From 630ee5fae42e3606321c3e7e78e4c5ff03b6e530 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Fri, 1 Feb 2019 08:05:42 -0400 Subject: [PATCH 5/7] changelog for 0.28.1-1 --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 8f37ef3a..fce3e5f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +notmuch (0.28.1-1) unstable; urgency=medium + + * New upstream bug fix release + * Bug fix: "muttprint/evince fails to show "print", thanks to + Joerg Jaspert (Closes: #920856). + + -- David Bremner Fri, 01 Feb 2019 08:05:05 -0400 + notmuch (0.28-2) unstable; urgency=medium * Override location of bash, because /usr/bin/bash might exist From 4e746cf8f697264f153be890fff5e26dc29b32ef Mon Sep 17 00:00:00 2001 From: David Bremner Date: Fri, 1 Feb 2019 08:06:38 -0400 Subject: [PATCH 6/7] update version to 0.28.1 --- bindings/python/notmuch/version.py | 2 +- version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py index 6a513a25..7cc4db18 100644 --- a/bindings/python/notmuch/version.py +++ b/bindings/python/notmuch/version.py @@ -1,3 +1,3 @@ # this file should be kept in sync with ../../../version -__VERSION__ = '0.28' +__VERSION__ = '0.28.1' SOVERSION = '5' diff --git a/version b/version index 4950f07e..48f7a71d 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.28 +0.28.1 From 32fb3c420a408ccfd20301f0c527c4259bf721cc Mon Sep 17 00:00:00 2001 From: David Bremner Date: Fri, 1 Feb 2019 08:08:13 -0400 Subject: [PATCH 7/7] bump copyright year --- doc/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/conf.py b/doc/conf.py index efbafc93..0ef72327 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -12,7 +12,7 @@ master_doc = 'index' # General information about the project. project = u'notmuch' -copyright = u'2009-2018, Carl Worth and many others' +copyright = u'2009-2019, Carl Worth and many others' location = os.path.dirname(__file__)