Control: reopen -1
Control: found -1 systemd/208-6
Control: retitle -1 systemd: install zsh completion to the correct place
Hi systemd maintainers,
On Sun, Apr 27, 2014 at 7:21 PM, Debian Bug Tracking System
<ow...@bugs.debian.org> wrote:
> Changes:
> systemd (208-1) experimental; urgency=medium
> .
> [ Michael Biebl ]
> * Install zsh completion files. (Closes: #717540)
Unfortunately, this change is not enough. Systemd's configure uses
${datadir}/zsh/site-functions by default as install location, thus
they end up on /usr/share/zsh/site-functions. Zsh only loads
site-functions subdir from /usr/local/share/..., not from
/usr/share/..., since site-* is meant for local administrators, and
local administrators should not install things to /usr/share/...
As mentioned earlier in the bug report, the zsh maintainer's blessed
way is to install to /usr/share/zsh/vendor-completions. Please find
attached a patch that installs to this location.
PS: thanks for all the work on systemd!
--
Saludos,
Felipe Sateler
From ad8780d694707d0c46215a12a53ecf74c8653d6e Mon Sep 17 00:00:00 2001
From: Felipe Sateler <fsate...@debian.org>
Date: Sat, 26 Jul 2014 14:02:13 -0400
Subject: [PATCH] Install zsh completion to /usr/share/zsh/vendor-completions
Closes: #717540
The upstream default is ${datadir}/zsh/site-functions. Unfortunately,
since prefix is /usr, then datadir=/usr/share. Zsh does not read
functions from /usr/share/site-functions (it reads from /usr/local/...).
The debian zsh packages have provided /usr/share/vendor-completions for
packages not from src:zsh providing zsh completions. So lets use that.
---
debian/changelog | 4 ++++
debian/rules | 3 ++-
debian/systemd.install | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9538ff8..24357b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,10 @@ systemd (208-7) UNRELEASED; urgency=medium
to check that libsystemd-login-dev has correct contents and dependencies.
Drop "isolation-machine" requirement.
+ [ Felipe Sateler ]
+ * Install zsh completions to /usr/share/zsh/vendor-completions.
+ (Closes: #717540)
+
-- Michael Biebl <bi...@debian.org> Thu, 17 Jul 2014 00:48:14 +0200
systemd (208-6) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index 794a81a..169065c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,7 @@ CONFFLAGS = \
--with-firmware-path=/lib/firmware \
--with-debug-shell=/bin/bash \
--with-telinit=/lib/sysvinit/telinit \
+ --with-zshcompletiondir=/usr/share/zsh/vendor-completions \
--enable-tcpwrap \
--disable-coredump \
--disable-efi \
@@ -89,7 +90,7 @@ override_dh_install:
rm -f debian/install/*/etc/init.d/README
rm -f debian/install/*/usr/share/man/man8/kernel-install.8
rm -f debian/install/*/usr/bin/kernel-install
- rm -f debian/install/*/usr/share/zsh/site-functions/_kernel-install
+ rm -f debian/install/*/usr/share/zsh/vendor-completions/_kernel-install
rm -f debian/install/*/usr/share/bash-completion/completions/kernel-install
rm -rf debian/install/*/usr/lib/kernel/install.d
rm -rf debian/install/*/etc/rpm/
diff --git a/debian/systemd.install b/debian/systemd.install
index a199a76..6ee8449 100644
--- a/debian/systemd.install
+++ b/debian/systemd.install
@@ -32,7 +32,7 @@ usr/share/man/man5/
usr/share/man/man7/
usr/share/man/man8/
usr/share/bash-completion/
-usr/share/zsh/site-functions/
+usr/share/zsh/vendor-completions/
usr/share/dbus-1/
usr/share/doc/
usr/share/pkgconfig/systemd.pc
--
2.0.1
