[svn-inject] Applying Debian modifications to trunk

[ion3.git] / debian / patches / 202_fix-menus.diff

diff --git a/debian/patches/202_fix-menus.diff b/debian/patches/202_fix-menus.diff
new file mode 100755 (executable)
index 0000000..968ffa4
--- /dev/null
+++ b/debian/patches/202_fix-menus.diff
@@ -0,0 +1,44 @@
+#! /bin/sh -e
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
+    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
+    *)  
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1;;
+esac 
+exit 0
+@DPATCH@
+diff -Nur ion3-20060524.orig/etc/cfg_ioncore.lua ion3-20060524/etc/cfg_ioncore.lua
+--- ion3-20060524.orig/etc/cfg_ioncore.lua     2006-05-24 18:23:26.000000000 +0200
++++ ion3-20060524/etc/cfg_ioncore.lua  2006-07-29 11:14:57.000000000 +0200
+@@ -276,22 +276,20 @@
+ defmenu("mainmenu", {
+     submenu("Programs",         "appmenu"),
+     menuentry("Lock screen",    "ioncore.exec_on(_, 'xlock')"),
++    menuentry("Lock screen",                                                                                                                                  
++              "ioncore.exec_on(_, ioncore.lookup_script('ion-lock'))"),                                                                                       
+     menuentry("Help",           "mod_query.query_man(_)"),
+     menuentry("About Ion",      "mod_query.show_about_ion(_)"),
+     submenu("Styles",           "stylemenu"),
++    submenu("Debian",           "Debian"),
+     submenu("Session",          "sessionmenu"),
+ })
+ 
+ 
+ -- Application menu
+ defmenu("appmenu", {
+-    menuentry("XTerm",          "ioncore.exec_on(_, 'xterm')"),
+-    menuentry("W3M",            "ioncore.exec_on(_, ':w3m -v')"),
+-    menuentry("Rxvt",           "ioncore.exec_on(_, 'rxvt')"),
+-    menuentry("Opera",          "ioncore.exec_on(_, 'opera')"),
+-    menuentry("Links",          "ioncore.exec_on(_, ':links')"),
+-    menuentry("Konqueror",      "ioncore.exec_on(_, 'konqueror')"),
+-    menuentry("Dillo",          "ioncore.exec_on(_, 'dillo')"),
++    menuentry("Terminal",       "ioncore.exec_on(_, 'x-terminal-emulator')"),                                                                                 
++    menuentry("Browser",        "ioncore.exec_on(_, 'sensible-browser')"),                                                                                    
+     menuentry("Run...",         "mod_query.query_exec(_)"),
+ })