From: David Bremner <bremner@debian.org>
Date: Thu, 30 Jun 2011 11:29:07 +0000 (-0300)
Subject: debian: don't install zsh completion files into /usr/share/zsh
X-Git-Tag: 0.6rc1~1
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=3f777b2ac2075595c60842da0b7057a36629dc74;hp=76399e5f7340e2fefccbd294227976b06ae36e17

debian: don't install zsh completion files into /usr/share/zsh

as of version 4.3.12, perhaps earlier, the Debian zsh package now
ships /usr/share/zsh/functions/Completion/Unix/_notmuch, so we
shouldn't install that ourselves anymore.

My understanding is that letting zsh ship the completion scripts is
the standard thing to do.

The script is still shipped in /usr/share/doc/notmuch/examples
(cherry picked from commit 0a0f5f1bbe4bf256a14dee0ab2af3065a251a72c)
---

diff --git a/debian/changelog b/debian/changelog
index 75e93702..1641fb57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ notmuch (0.6~264) UNRELEASED; urgency=low
   * New snapshot, in progress
   * Fix description of notmuch-vim to mention vim, not emacs
     (Closes: #631974)
+  * Install zsh completion as an example instead of into /usr/share/zsh to
+    avoid file conflict with zsh.
 
- -- David Bremner <bremner@debian.org>  Thu, 23 Jun 2011 19:39:05 -0300
+ -- David Bremner <bremner@debian.org>  Thu, 30 Jun 2011 08:44:27 -0300
 
 notmuch (0.6~254) experimental; urgency=low
 
diff --git a/debian/notmuch.examples b/debian/notmuch.examples
new file mode 100644
index 00000000..524e0f4b
--- /dev/null
+++ b/debian/notmuch.examples
@@ -0,0 +1 @@
+completion/notmuch-completion.zsh
diff --git a/debian/notmuch.install b/debian/notmuch.install
index 5b7de1be..fff498d2 100644
--- a/debian/notmuch.install
+++ b/debian/notmuch.install
@@ -1,4 +1,3 @@
 usr/bin
 usr/share/man/man1
 etc/bash_completion.d
-usr/share/zsh