Merge branch 'release'

bring debian specific changes into master

diff --git a/debian/changelog b/debian/changelog
index 3c030d25a1910e996c4652074da9c87e0876da83..7cebc77d606895f58919e767a2913332d08a72e7 100644 (file)
--- 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 <bremner@debian.org>  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

diff --git a/debian/notmuch-emacs.emacsen-install b/debian/notmuch-emacs.emacsen-install
index f35ef48e66e611aea45c8c04e98ff8af3d1ba976..bcfdbb8a581b9e475014d27185dd75f717945cdf 100755 (executable)
--- 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}