Merge commit '20081002' into HEAD

[ion3.git] / debian / patches / 211_add-debian-menu.diff

diff --git a/debian/patches/211_add-debian-menu.diff b/debian/patches/211_add-debian-menu.diff
index 2f87b750f181f26287dbb4e1bbd285ac0efd4371..277601c98593a71bc6eb6215068f39f16dc5df1f 100644 (file)
--- a/debian/patches/211_add-debian-menu.diff
+++ b/debian/patches/211_add-debian-menu.diff
@@ -1,6 +1,6 @@
 --- ion3.orig/etc/cfg_ioncore.lua
 +++ ion3/etc/cfg_ioncore.lua
-@@ -336,6 +336,7 @@
+@@ -335,6 +335,7 @@
      menuentry("Help",           "mod_query.query_man(_)"),
      menuentry("About Ion",      "mod_query.show_about_ion(_)"),
      submenu("Styles",           "stylemenu"),
@@ -8,13 +8,13 @@
      submenu("Session",          "sessionmenu"),
  })
  
-@@ -381,3 +381,12 @@
+@@ -380,3 +381,12 @@
  defctxmenu("WClientWin", "Client window", {
      menuentry("Kill",           "WClientWin.kill(_)"),
  })
 +
 +-- Auto-generated Debian menu definitions
-+if os.execute("test -x /usr/bin/update-menus") == 0 then
++if os and os.execute("test -x /usr/bin/update-menus") == 0 then
 +    if ioncore.is_i18n() then
 +        dopath("debian-menu-i18n")
 +    else