Move zsh completion; add xfce4-session to zsh completion

diff --git a/debian/changelog b/debian/changelog
index b4e0788..0ef291b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+grml-x (0.4.5) unstable; urgency=low
+
+  * Move zsh completion file to /usr/share/grml/zsh/completion/grml/_grml-x
+    as introduced by grml-etc-core 0.3.73.
+  * Add xfce4-session to zsh completion.
+
+ -- Michael Prokop <mika@grml.org>  Wed, 22 Jul 2009 22:46:56 +0200
+
 grml-x (0.4.4) unstable; urgency=low
 
   * Add Option "AutoAddDevices" "off", as we do not want to depend on

diff --git a/debian/control b/debian/control
index 4b1a43d..80beb0a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Michael Prokop <mika@grml.org>
 Build-Depends: debhelper (>= 5)
 Build-Depends-Indep: asciidoc, xsltproc, docbook-xsl
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
 Homepage: http://git.grml.org/?p=grml-x.git
 Vcs-git: git://git.grml.org/grml-x.git
 Vcs-Browser: http://git.grml.org/?p=grml-x.git

diff --git a/debian/rules b/debian/rules
index fc8db49..99ea7b3 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -31,12 +31,12 @@ install: build
        dh_testdir
        dh_testroot
        dh_clean -k
-       dh_installdirs etc/init.d usr/bin
+       dh_installdirs etc/init.d usr/bin usr/share/grml
 
        # Add here commands to install the package into debian/grml-x.
-       install -m 755 grml-x     debian/grml-x/usr/bin/grml-x
-       cp -r etc/X11/ debian/grml-x/etc/
-       cp -r etc/zsh/ debian/grml-x/etc/
+       install -m 755 grml-x debian/grml-x/usr/bin/grml-x
+       cp -r etc/X11/        debian/grml-x/etc/
+       cp -r usr_share_grml/ debian/grml-x/usr/share/grml/
 
 # Build architecture-dependent files here.
 binary-arch: build install

diff --git a/etc/zsh/completion.d/_grml-x b/usr_share_grml/zsh/completion/grml/_grml-x
similarity index 95%
rename from etc/zsh/completion.d/_grml-x
rename to usr_share_grml/zsh/completion/grml/_grml-x
index 6f01c8b..295a221 100644 (file)
--- a/etc/zsh/completion.d/_grml-x
+++ b/usr_share_grml/zsh/completion/grml/_grml-x
@@ -1,5 +1,5 @@
 #compdef grml-x
-# Filename:      /etc/zsh/completion.d/grml-x
+# Filename:      /usr/share/grml/zsh/completion/grml/_grml-x
 # Purpose:       completion for command grml-x for zsh (z shell)
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
@@ -14,7 +14,7 @@ wms=()
 for wm in awesome blackbox dwm evilwm fluxbox fvwm fvwm2 fvwm-crystal      \
           gnome-session gnomesession icewm ion2 ion3 jwm larswm openbox    \
          particleman pekwm pwm3 ratpoison startkde twm w9wm windowlab wmi \
-         wmii wm-ng xfce4 xfwm4 xmonad ; do
+         wmii wm-ng xfce4 xfce4-session xfwm4 xmonad ; do
     [[ -x /usr/bin/$wm ]] && wms+=$wm
 done