From d24d8c5b6eca914ae10c946ef6cbd3e16511bfd7 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 6 Apr 2009 09:53:40 +0200 Subject: [PATCH] Use grml-exec-wrapper in menu of fluxbox and in idesktop --- debian/changelog | 7 +++++++ debian/control | 2 +- etc/skel/.fluxbox/menu | 24 ++++++++++++------------ etc/skel/.idesktop/aterm.lnk | 2 +- etc/skel/.idesktop/aumix.lnk | 2 +- etc/skel/.idesktop/emacs.lnk | 2 +- etc/skel/.idesktop/firefox.lnk | 2 +- etc/skel/.idesktop/grmlconfigroot.lnk | 2 +- etc/skel/.idesktop/grmlconfiguser.lnk | 2 +- etc/skel/.idesktop/irssi.lnk | 2 +- etc/skel/.idesktop/network.lnk | 2 +- etc/skel/.idesktop/pinfo.lnk | 2 +- etc/skel/.idesktop/rox.lnk | 2 +- etc/skel/.idesktop/screenshot.lnk | 2 +- etc/skel/.idesktop/unused/gimp.lnk | 2 +- etc/skel/.idesktop/unused/ooffice.lnk | 4 ++-- etc/skel/.idesktop/unused/vmware.lnk | 2 +- etc/skel/.idesktop/vim.lnk | 2 +- etc/skel/.idesktop/wireshark.lnk | 2 +- etc/skel/.idesktop/xterm-iso.lnk | 2 +- etc/skel/.idesktop/xterm.lnk | 2 +- 21 files changed, 39 insertions(+), 32 deletions(-) diff --git a/debian/changelog b/debian/changelog index 43aaecb..83173e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +grml-desktop (0.2.3) unstable; urgency=low + + * Use grml-exec-wrapper in menu of fluxbox and in idesktop. + Add grml-scripts >=1.1.18 to depends. [Closes: issue431] + + -- Michael Prokop Mon, 06 Apr 2009 09:50:08 +0200 + grml-desktop (0.2.2) unstable; urgency=low * /etc/skel/.pekwm/menu: replace /etc/X11/pekwm/deb-menu diff --git a/debian/control b/debian/control index c5e9337..0660b00 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Vcs-Browser: http://git.grml.org/?p=grml-desktop.git Package: grml-desktop Architecture: all -Depends: idesk +Depends: idesk, grml-scripts (>= 1.1.18) Suggests: fluxbox, fvwm | fvwm2 | fvwm-crystal, awesome, pekwm Conflicts: grml-etc (<< 0.9.14) Description: configuration files for the X desktop at grml diff --git a/etc/skel/.fluxbox/menu b/etc/skel/.fluxbox/menu index 9a03fd1..0860f9a 100644 --- a/etc/skel/.fluxbox/menu +++ b/etc/skel/.fluxbox/menu @@ -1,21 +1,21 @@ [begin] (Fluxbox) {} <> [exec] (xterm) {x-terminal-emulator} <> [submenu] (handy stuff) {} <> - [exec] (dillo webbrowser) {dillo} - [exec] (firefox webbrowser) {firefox} - [exec] (w3m webbrowser) {x-terminal-emulator -T "w3m" -e /usr/bin/w3m /usr/share/doc/grml-docs/startpage.html} <> - [exec] (gkrellm) {gkrellm} <> - [exec] (configure fluxbox [fluxbare]) {fluxbare} <> - [exec] (transparent terminal [aterm]) {aterm -tr} <> - [exec] (file manager [rox-filer]) {rox-filer} <> + [exec] (dillo webbrowser) {grml-exec-wrapper dillo} + [exec] (firefox webbrowser) {grml-exec-wrapper firefox} + [exec] (w3m webbrowser) {grml-exec-wrapper -p w3m x-terminal-emulator -T "w3m" -e /usr/bin/w3m /usr/share/doc/grml-docs/startpage.html} <> + [exec] (gkrellm) {grml-exec-wrapper gkrellm} <> + [exec] (configure fluxbox [fluxbare]) {grml-exec-wrapper fluxbare} <> + [exec] (transparent terminal [aterm]) {grml-exec-wrapper aterm -tr} <> + [exec] (file manager [rox-filer]) {grml-exec-wrapper rox-filer} <> [end] [submenu] (grml) {} <> - [exec] (grml info screen) {dillo /usr/share/doc/grml-docs/startpage.html} <> - [exec] (lock X) {x-terminal-emulator -T "grml-lock" -e /usr/bin/grml-lock} <> - [exec] (configure mailclient mutt) {x-terminal-emulator -T "grml-mutt" -e /usr/bin/grml-mutt} <> - [exec] (configure newsreader slrn) {x-terminal-emulator -T "grml-slrn" -e /usr/bin/grml-slrn} <> + [exec] (grml info screen) {grml-exec-wrapper dillo /usr/share/doc/grml-docs/startpage.html} <> + [exec] (lock X) {grml-exec-wrapper -p grml-lock x-terminal-emulator -T "grml-lock" -e /usr/bin/grml-lock} <> + [exec] (configure mailclient mutt) {grml-exec-wrapper -p grml-mutt x-terminal-emulator -T "grml-mutt" -e /usr/bin/grml-mutt} <> + [exec] (configure newsreader slrn) {grml-exec-wrapper -p grml-slrn x-terminal-emulator -T "grml-slrn" -e /usr/bin/grml-slrn} <> [exec] (configure network) {sudo x-terminal-emulator -T "grml-network" -e /usr/sbin/grml-network} <> - [exec] (configure and run terminalserver) {sudo x-terminal-emulator -T "grml-terminalserver" -e /usr/sbin/grml-terminalserver} <> + [exec] (configure and run terminalserver) {grml-exec-wrapper -p grml-terminalserver sudo x-terminal-emulator -T "grml-terminalserver" -e /usr/sbin/grml-terminalserver} <> [end] [submenu] (Debian) {} <> [include] (/etc/X11/fluxbox/menudefs.hook) {} <> diff --git a/etc/skel/.idesktop/aterm.lnk b/etc/skel/.idesktop/aterm.lnk index 42bf205..3bfaa0f 100644 --- a/etc/skel/.idesktop/aterm.lnk +++ b/etc/skel/.idesktop/aterm.lnk @@ -1,7 +1,7 @@ table Icon Caption: aterm ToolTip.Caption: the VT102 emulator for the X window system runnning in en_US.iso885915 mode - Command: LANG=en_US.iso885915 /usr/bin/aterm -tr + Command: LANG=en_US.iso885915 grml-exec-wrapper aterm -tr Icon: /home/grml/.idesktop/icons/l33t_TER_eterm.png X: 224 Y: 13 diff --git a/etc/skel/.idesktop/aumix.lnk b/etc/skel/.idesktop/aumix.lnk index b54eaef..54eb008 100644 --- a/etc/skel/.idesktop/aumix.lnk +++ b/etc/skel/.idesktop/aumix.lnk @@ -1,7 +1,7 @@ table Icon Caption: aumix ToolTip.Caption: adjust sound mixer settings - Command: /usr/bin/x-terminal-emulator -T "aumix" -e /usr/bin/aumix + Command: grml-exec-wrapper -p aumix x-terminal-emulator -T "aumix" -e aumix Icon: /home/grml/.idesktop/icons/l33t_AUD_kmix.png X: 18 Y: 331 diff --git a/etc/skel/.idesktop/emacs.lnk b/etc/skel/.idesktop/emacs.lnk index bff8be0..6189d50 100644 --- a/etc/skel/.idesktop/emacs.lnk +++ b/etc/skel/.idesktop/emacs.lnk @@ -1,7 +1,7 @@ table Icon Caption: emacs ToolTip.Caption: the GNU project emacs editor - Command: /usr/bin/emacs + Command: grml-exec-wrapper emacs Icon: /home/grml/.idesktop/icons/l33t_TXT_emacs.png X: 534 Y: 13 diff --git a/etc/skel/.idesktop/firefox.lnk b/etc/skel/.idesktop/firefox.lnk index 2dfd3d6..bfc60f0 100644 --- a/etc/skel/.idesktop/firefox.lnk +++ b/etc/skel/.idesktop/firefox.lnk @@ -1,7 +1,7 @@ table Icon Caption: firefox ToolTip.Caption: the mozilla browser also known as iceweasel - Command: /usr/bin/mozilla-firefox + Command: grml-exec-wrapper mozilla-firefox Icon: /home/grml/.idesktop/icons/l33t_BRO_firefox.png X: 124 Y: 13 diff --git a/etc/skel/.idesktop/grmlconfigroot.lnk b/etc/skel/.idesktop/grmlconfigroot.lnk index d9dce76..36e5740 100644 --- a/etc/skel/.idesktop/grmlconfigroot.lnk +++ b/etc/skel/.idesktop/grmlconfigroot.lnk @@ -1,7 +1,7 @@ table Icon Caption: grml-config-root ToolTip.Caption: configure system-wide settings - Command: /usr/bin/x-terminal-emulator -T "grml-config-root" -e sudo /usr/sbin/grml-config-root + Command: grml-exec-wrapper -p grml-config-root x-terminal-emulator -T "grml-config-root" -e sudo grml-config-root Icon: /home/grml/.idesktop/icons/l33t_DEV_kcontrol.png X: 318 Y: 331 diff --git a/etc/skel/.idesktop/grmlconfiguser.lnk b/etc/skel/.idesktop/grmlconfiguser.lnk index 4110c20..87951d1 100644 --- a/etc/skel/.idesktop/grmlconfiguser.lnk +++ b/etc/skel/.idesktop/grmlconfiguser.lnk @@ -1,7 +1,7 @@ table Icon Caption: grml-config-user ToolTip.Caption: configure some userspecific settings - Command: /usr/bin/x-terminal-emulator -T "grml-config-user" -e /usr/bin/grml-config-user + Command: grml-exec-wrapper -p grml-config-user x-terminal-emulator -T "grml-config-user" -e grml-config-user Icon: /home/grml/.idesktop/icons/l33t_DEV_kcontrol.png X: 318 Y: 451 diff --git a/etc/skel/.idesktop/irssi.lnk b/etc/skel/.idesktop/irssi.lnk index e549ca4..c5ffb48 100644 --- a/etc/skel/.idesktop/irssi.lnk +++ b/etc/skel/.idesktop/irssi.lnk @@ -1,7 +1,7 @@ table Icon Caption: run irssi and connect to channel #grml ToolTip.Caption: get support by developers and users of grml in the IRC channel #grml - Command: LANG=en_US.iso885915 x-terminal-emulator -T "irssi" -e /usr/bin/irssi + Command: LANG=en_US.iso885915 grml-exec-wrapper x-terminal-emulator -T "irssi" -e irssi Icon: /home/grml/.idesktop/icons/l33t_IMS_irssi.png X: 288 Y: 131 diff --git a/etc/skel/.idesktop/network.lnk b/etc/skel/.idesktop/network.lnk index 97da052..ec89b2b 100644 --- a/etc/skel/.idesktop/network.lnk +++ b/etc/skel/.idesktop/network.lnk @@ -1,7 +1,7 @@ table Icon Caption: configure network ToolTip.Caption: configure network settings using grml-network - Command: /usr/bin/x-terminal-emulator -T "grml-network" -e sudo /usr/sbin/grml-network + Command: grml-exec-wrapper x-terminal-emulator -T "grml-network" -e sudo grml-network Icon: /home/grml/.idesktop/icons/l33t_DEV_network.png X: 158 Y: 331 diff --git a/etc/skel/.idesktop/pinfo.lnk b/etc/skel/.idesktop/pinfo.lnk index 2f6c3ca..432bb63 100644 --- a/etc/skel/.idesktop/pinfo.lnk +++ b/etc/skel/.idesktop/pinfo.lnk @@ -1,7 +1,7 @@ table Icon Caption: pinfo ToolTip.Caption: curses based lynx-style info browser - Command: x-terminal-emulator -T "pinfo" -e /usr/bin/pinfo + Command: grml-exec-wrapper -p pinfo x-terminal-emulator -T "pinfo" -e pinfo Icon: /home/grml/.idesktop/icons/l33t_DES_nephros-manual.png X: 28 Y: 451 diff --git a/etc/skel/.idesktop/rox.lnk b/etc/skel/.idesktop/rox.lnk index e29ee8f..f16de90 100644 --- a/etc/skel/.idesktop/rox.lnk +++ b/etc/skel/.idesktop/rox.lnk @@ -1,7 +1,7 @@ table Icon Caption: rox ToolTip.Caption: a simple graphical file manager - Command: /usr/bin/rox ~/ + Command: grml-exec-wrapper rox ~/ Icon: /home/grml/.idesktop/icons/l33t_UNK_rox.png X: 324 Y: 13 diff --git a/etc/skel/.idesktop/screenshot.lnk b/etc/skel/.idesktop/screenshot.lnk index d05899d..4aea761 100644 --- a/etc/skel/.idesktop/screenshot.lnk +++ b/etc/skel/.idesktop/screenshot.lnk @@ -1,7 +1,7 @@ table Icon Caption: screenshot ToolTip.Caption: take a screenshot of desktop and store it in $HOME/ - Command: import -window root ~/`date +shot-%Y-%m-%d-%H%M%S.jpg` + Command: grml-exec-wrapper import -window root ~/`date +shot-%Y-%m-%d-%H%M%S.jpg` Icon: /home/grml/.idesktop/icons/l33t_DES_screenshot.png X: 158 Y: 451 diff --git a/etc/skel/.idesktop/unused/gimp.lnk b/etc/skel/.idesktop/unused/gimp.lnk index 6d96bf5..fa17d2f 100644 --- a/etc/skel/.idesktop/unused/gimp.lnk +++ b/etc/skel/.idesktop/unused/gimp.lnk @@ -1,6 +1,6 @@ table Icon Caption: gimp - Command: /usr/bin/gimp + Command: grml-exec-wrapper gimp Icon: /home/grml/.idesktop/icons/l33t_GRA_gimp.png X: 1054 Y: 573 diff --git a/etc/skel/.idesktop/unused/ooffice.lnk b/etc/skel/.idesktop/unused/ooffice.lnk index c4c07cb..19c1223 100644 --- a/etc/skel/.idesktop/unused/ooffice.lnk +++ b/etc/skel/.idesktop/unused/ooffice.lnk @@ -1,6 +1,6 @@ table Icon - Caption: OpenOffice2 - Command: /usr/bin/ooffice2 + Caption: OpenOffice + Command: grml-exec-wrapper ooffice Icon: /home/grml/.idesktop/icons/l33t_OFF_openoffice.png X: 1174 Y: 493 diff --git a/etc/skel/.idesktop/unused/vmware.lnk b/etc/skel/.idesktop/unused/vmware.lnk index 85d2094..cc4d125 100644 --- a/etc/skel/.idesktop/unused/vmware.lnk +++ b/etc/skel/.idesktop/unused/vmware.lnk @@ -1,6 +1,6 @@ table Icon Caption: vmware - Command: /usr/bin/vmware + Command: grml-exec-wrapper vmware Icon: /home/grml/.idesktop/icons/l33t_EMU_vmware.png X: 1044 Y: 433 diff --git a/etc/skel/.idesktop/vim.lnk b/etc/skel/.idesktop/vim.lnk index b1dfc84..e4ca3e3 100644 --- a/etc/skel/.idesktop/vim.lnk +++ b/etc/skel/.idesktop/vim.lnk @@ -1,7 +1,7 @@ table Icon Caption: gvim ToolTip.Caption: Vi IMproved, a programmers text editor - the graphical version - Command: /usr/bin/gvim + Command: grml-exec-wrapper gvim Icon: /home/grml/.idesktop/icons/l33t_TXT_vim.png X: 424 Y: 13 diff --git a/etc/skel/.idesktop/wireshark.lnk b/etc/skel/.idesktop/wireshark.lnk index 3e73c82..d6c9fba 100644 --- a/etc/skel/.idesktop/wireshark.lnk +++ b/etc/skel/.idesktop/wireshark.lnk @@ -1,7 +1,7 @@ table Icon Caption: wireshark ToolTip.Caption: Interactively dump and analyze network traffic (once known as ethereal) - Command: /usr/bin/sudo /usr/bin/wireshark + Command: grml-exec-wrapper sudo wireshark Icon: /home/grml/.idesktop/icons/l33t_UNK_ethereal.png X: 644 Y: 13 diff --git a/etc/skel/.idesktop/xterm-iso.lnk b/etc/skel/.idesktop/xterm-iso.lnk index d31be14..0a36c47 100644 --- a/etc/skel/.idesktop/xterm-iso.lnk +++ b/etc/skel/.idesktop/xterm-iso.lnk @@ -1,7 +1,7 @@ table Icon Caption: [iso-]xterm ToolTip.Caption: run x-terminal-emulator in iso environment - Command: /usr/bin/iso-term + Command: grml-exec-wrapper iso-term Icon: /home/grml/.idesktop/icons/l33t_TER_Eterm.png X: 28 Y: 131 diff --git a/etc/skel/.idesktop/xterm.lnk b/etc/skel/.idesktop/xterm.lnk index 364b6a0..bedde86 100644 --- a/etc/skel/.idesktop/xterm.lnk +++ b/etc/skel/.idesktop/xterm.lnk @@ -1,7 +1,7 @@ table Icon Caption: xterm ToolTip.Caption: run x-terminal-emulator - Command: /usr/bin/x-terminal-emulator + Command: grml-exec-wrapper x-terminal-emulator Icon: /home/grml/.idesktop/icons/l33t_TER_Eterm.png X: 24 Y: 13 -- 2.1.4