Drop /etc/X11/windowlab/windowlab.menurc

diff --git a/debian/changelog b/debian/changelog
index 9c83d66..0eef0f0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-etc (1.1.18) unstable; urgency=low
+
+  * Drop /etc/X11/windowlab/windowlab.menurc as windowlab
+    was removed from Debian and grml-live as well.
+
+ -- Michael Prokop <mika@grml.org>  Sun, 02 Aug 2009 11:09:48 +0200
+
 grml-etc (1.1.17) unstable; urgency=low
 
   * Redesign /etc/init.d/grml-reboot:

diff --git a/debian/postrm b/debian/postrm
index 2d2a53e..65322a1 100755 (executable)
--- a/debian/postrm
+++ b/debian/postrm
@@ -13,7 +13,6 @@ TO_UNDIVERT2="ssh"
 TO_UNDIVERT3="kismet.conf"
 TO_UNDIVERT4="wlan-ng.conf"
 TO_UNDIVERT5="smb.conf"
-TO_UNDIVERT6="windowlab.menurc"
 
 undivert_gen() {
     DEXT=${3:-original}
@@ -48,9 +47,6 @@ case "$1" in
         for cmd in $TO_UNDIVERT5; do
                 undivert_gen $cmd /etc/samba
         done
-        for cmd in $TO_UNDIVERT6; do
-                undivert_gen $cmd /etc/X11/windowlab
-        done
 
        # make sure the ssh init script even exists if something is failing...
        if ls /etc/init.d/ssh* 1>/dev/null 2>&1 ; then

diff --git a/debian/preinst b/debian/preinst
index 20e4b94..013cd6c 100755 (executable)
--- a/debian/preinst
+++ b/debian/preinst
@@ -13,7 +13,6 @@ TO_DIVERT1="login.config mgetty.config"
 TO_DIVERT2="ssh"
 TO_DIVERT3="kismet.conf"
 TO_DIVERT4="wlan-ng.conf"
-TO_DIVERT5="windowlab.menurc"
 
 divert_gen() {
     DEXT=${3:-original}
@@ -55,10 +54,6 @@ case "$1" in
             divert_gen $cmd /etc/pcmcia
         done
 
-        for cmd in $TO_DIVERT5; do
-            divert_gen $cmd /etc/X11/windowlab
-        done
-
         # did I mention that dpkg-divert sucks?
         if [ -n "$2" ] ; then
            if dpkg --compare-versions "${2}" lt 0.8 ; then

diff --git a/etc/X11/windowlab/windowlab.menurc b/etc/X11/windowlab/windowlab.menurc
deleted file mode 100644 (file)
index 4a79da0..0000000
--- a/etc/X11/windowlab/windowlab.menurc
+++ /dev/null
@@ -1,8 +0,0 @@
-# make sure each line ends in LF not CRLF!
-xterm:x-terminal-emulator
-gvim:gvim
-firefox:mozilla-firefox
-grml-info:grml-info
-Edit menu:sudo gvim /etc/X10/windowlab/windowlab.menurc
-About:windowlab -about | xmessage -file -
-Quit:skill windowlab