From e84a51e5c465c5bd73ef47322e10924da5e3ecea Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sat, 26 Sep 2015 09:22:11 -0300 Subject: [PATCH 1/2] debian: fix linking in emacsen-install script When upgrading emacs, the install file can (apparently) be called with the lisp files already linked into the flavour specific directories. In this case we should not fail. --- debian/notmuch-emacs.emacsen-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/notmuch-emacs.emacsen-install b/debian/notmuch-emacs.emacsen-install index f35ef48e..bcfdbb8a 100755 --- a/debian/notmuch-emacs.emacsen-install +++ b/debian/notmuch-emacs.emacsen-install @@ -31,7 +31,7 @@ echo install/${PACKAGE}: byte-compiling for ${FLAVOR} # Create symlinks to the .el files (see section 6E in debian-emacs # polcy). This makes complation easy, and also allows find-function # and find-library to work properly. -(cd ${elc_dir} && cp -s ${el_dir}/*.el .) +(cd ${elc_dir} && ln -sf ${el_dir}/*.el .) # Byte compile them (cd ${elc_dir} From 754d84edad2534099b53c15cc5b443a672621622 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sat, 26 Sep 2015 09:27:34 -0300 Subject: [PATCH 2/2] debian: changelog stanza for 0.20.2-2 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3c030d25..7cebc77d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +notmuch (0.20.2-2) unstable; urgency=medium + + * Fix linking in emacsen-install script. The previous version can + break an emacs upgrade. + + -- David Bremner Sat, 26 Sep 2015 09:26:41 -0300 + notmuch (0.20.2-1) unstable; urgency=medium * Bug fix: "notmuch-tree does not mark messages as read", thanks to