From: Michael Prokop <mika@grml.org>
Date: Sun, 21 Jun 2009 10:35:41 +0000 (+0200)
Subject: Replace dillo with xlinks2 in fluxbox and pekwm
X-Git-Tag: v0.2.4^0
X-Git-Url: http://git.grml.org/?p=grml-desktop.git;a=commitdiff_plain;h=49c1b75f93ace0e4788cc9cdd4fe6e37abc53ffa

Replace dillo with xlinks2 in fluxbox and pekwm
---

diff --git a/debian/changelog b/debian/changelog
index 83173e3..03f81d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+grml-desktop (0.2.4) unstable; urgency=low
+
+  * /etc/skel/.fluxbox/menu and /etc/skel/.pekwm/menu: drop
+    dillo (not available in Debian/unstable and therefore not
+    shipped with current versions of grml) and provide menuentry
+    for xlinks2 instead. [Testing: issue681]
+
+ -- Michael Prokop <mika@grml.org>  Sun, 21 Jun 2009 12:32:01 +0200
+
 grml-desktop (0.2.3) unstable; urgency=low
 
   * Use grml-exec-wrapper in menu of fluxbox and in idesktop.
diff --git a/etc/skel/.fluxbox/menu b/etc/skel/.fluxbox/menu
index 0860f9a..612d0a4 100644
--- a/etc/skel/.fluxbox/menu
+++ b/etc/skel/.fluxbox/menu
@@ -1,7 +1,6 @@
 [begin] (Fluxbox) {} <>
     [exec] (xterm) {x-terminal-emulator} <>
     [submenu] (handy stuff) {} <>
-        [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} <>
@@ -10,7 +9,7 @@
         [exec] (file manager [rox-filer]) {grml-exec-wrapper rox-filer} <>
     [end]
     [submenu] (grml) {} <>
-        [exec] (grml info screen) {grml-exec-wrapper dillo /usr/share/doc/grml-docs/startpage.html} <>
+        [exec] (grml info screen) {grml-exec-wrapper xlinks2 -mode 640x480 /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} <>
diff --git a/etc/skel/.pekwm/menu b/etc/skel/.pekwm/menu
index 17138ed..8034c45 100644
--- a/etc/skel/.pekwm/menu
+++ b/etc/skel/.pekwm/menu
@@ -12,8 +12,8 @@ RootMenu = "Pekwm @ grml" {
 	Entry = "emacs" { Actions = "Exec emacs &" }
 	Entry = "----------" { Actions = "NoAction" }
 	Submenu = "WWW" {
-		Entry = "dillo" { Actions = "Exec dillo &" }
 		Entry = "firefox" { Actions = "Exec mozilla-firefox &" }
+		Entry = "xlinks2" { Actions = "Exec xlinks2 -mode 640x480 &" }
 		Entry = "w3m" { Actions = "Exec $TERM -title w3m -e w3m http://grml.org/ &" }
 	}
 	Submenu = "Communication" {