From: David Bremner <david@tethera.net>
Date: Sat, 26 Sep 2015 13:31:50 +0000 (-0300)
Subject: Merge branch 'release'
X-Git-Tag: 0.21_rc0~22
X-Git-Url: https://git.cworth.org/git?p=notmuch;a=commitdiff_plain;h=33c8777a967ece2dd4bbda7e83a4e07c195abf51;hp=02e394aed216622ac355ff15bae74403abf40417

Merge branch 'release'

bring debian specific changes into master
---

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 <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 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}