From: Ben Hutchings <ben@decadent.org.uk>
Date: Mon, 6 Aug 2007 22:46:38 +0000 (+0000)
Subject: Merged all changes to use x-terminal-emulator into 206_use-xterm.diff.
X-Git-Tag: 20070720-2~6
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=4caa969e86b611255dddf085563d32e5e0e8f323;p=ion3.git

Merged all changes to use x-terminal-emulator into 206_use-xterm.diff.
Merged menu change to use ion-lock into 205_ion-lock.diff
Moved all Debian menu changes into new 211_add-debian-menu.diff.
---

diff --git a/debian/patches/202_fix-menus.diff b/debian/patches/202_fix-menus.diff
deleted file mode 100755
index c762b1f..0000000
--- a/debian/patches/202_fix-menus.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- ion3.orig/etc/cfg_ioncore.lua
-+++ ion3/etc/cfg_ioncore.lua
-@@ -330,11 +330,13 @@
- -- Main menu
- defmenu("mainmenu", {
-     menuentry("Run...",         "mod_query.query_exec(_)"),
--    menuentry("Terminal",       "ioncore.exec_on(_, XTERM or 'xterm')"),
-+    menuentry("Terminal",       "ioncore.exec_on(_, 'x-terminal-emulator')"),
--    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"),
- })
- 
diff --git a/debian/patches/204_fix-bindings.diff b/debian/patches/204_fix-bindings.diff
deleted file mode 100755
index 5028e05..0000000
--- a/debian/patches/204_fix-bindings.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ion3.orig/etc/cfg_ioncore.lua
-+++ ion3/etc/cfg_ioncore.lua
-@@ -153,7 +153,7 @@
-     kpress(META.."F1", "ioncore.exec_on(_, ':man ion3')"),
- 
-     bdoc("Run a terminal emulator."),
--    kpress(ALTMETA.."F2", "ioncore.exec_on(_, XTERM or 'xterm')"),
-+    kpress(ALTMETA.."F2", "ioncore.exec_on(_, XTERM or 'x-terminal-emulator')"),
-     
-     bdoc("Query for command line to execute."),
-     kpress(ALTMETA.."F3", "mod_query.query_exec(_)"),
diff --git a/debian/patches/205_ion-lock.diff b/debian/patches/205_ion-lock.diff
index 6d2dfaf..fce52f9 100755
--- a/debian/patches/205_ion-lock.diff
+++ b/debian/patches/205_ion-lock.diff
@@ -1,3 +1,15 @@
+--- ion3.orig/etc/cfg_ioncore.lua
++++ ion3/etc/cfg_ioncore.lua
+@@ -331,7 +331,8 @@
+ defmenu("mainmenu", {
+     menuentry("Run...",         "mod_query.query_exec(_)"),
+     menuentry("Terminal",       "ioncore.exec_on(_, XTERM or 'xterm')"),
+-    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"),
 --- ion3.orig/utils/Makefile
 +++ ion3/utils/Makefile
 @@ -11,7 +11,7 @@
diff --git a/debian/patches/206_use-x-terminal-emulator.diff b/debian/patches/206_use-x-terminal-emulator.diff
new file mode 100644
index 0000000..afaab3f
--- /dev/null
+++ b/debian/patches/206_use-x-terminal-emulator.diff
@@ -0,0 +1,30 @@
+--- ion3.orig/etc/cfg_ioncore.lua
++++ ion3/etc/cfg_ioncore.lua
+@@ -153,7 +153,7 @@
+     kpress(META.."F1", "ioncore.exec_on(_, ':man ion3')"),
+ 
+     bdoc("Run a terminal emulator."),
+-    kpress(ALTMETA.."F2", "ioncore.exec_on(_, XTERM or 'xterm')"),
++    kpress(ALTMETA.."F2", "ioncore.exec_on(_, XTERM or 'x-terminal-emulator')"),
+     
+     bdoc("Query for command line to execute."),
+     kpress(ALTMETA.."F3", "mod_query.query_exec(_)"),
+@@ -330,7 +330,7 @@
+ -- Main menu
+ defmenu("mainmenu", {
+     menuentry("Run...",         "mod_query.query_exec(_)"),
+-    menuentry("Terminal",       "ioncore.exec_on(_, XTERM or 'xterm')"),
++    menuentry("Terminal",       "ioncore.exec_on(_, XTERM or 'x-terminal-emulator')"),
+     menuentry("Lock screen",
+               "ioncore.exec_on(_, ioncore.lookup_script('ion-lock'))"),
+     menuentry("Help",           "mod_query.query_man(_)"),
+--- ion3.orig/utils/ion-runinxterm
++++ ion3/utils/ion-runinxterm
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-test "$XTERMCMD" || XTERMCMD="xterm"
++test "$XTERMCMD" || XTERMCMD="x-terminal-emulator"
+ 
+ title=""
+ wait=""
diff --git a/debian/patches/206_use-xterm.diff b/debian/patches/206_use-xterm.diff
deleted file mode 100755
index 1583fd3..0000000
--- a/debian/patches/206_use-xterm.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- ion3.orig/utils/ion-runinxterm
-+++ ion3/utils/ion-runinxterm
-@@ -1,6 +1,6 @@
- #!/bin/sh
- 
--test "$XTERMCMD" || XTERMCMD="xterm"
-+test "$XTERMCMD" || XTERMCMD="x-terminal-emulator"
- 
- title=""
- wait=""
diff --git a/debian/patches/211_add-debian-menu.diff b/debian/patches/211_add-debian-menu.diff
new file mode 100644
index 0000000..2f87b75
--- /dev/null
+++ b/debian/patches/211_add-debian-menu.diff
@@ -0,0 +1,23 @@
+--- ion3.orig/etc/cfg_ioncore.lua
++++ ion3/etc/cfg_ioncore.lua
+@@ -336,6 +336,7 @@
+     menuentry("Help",           "mod_query.query_man(_)"),
+     menuentry("About Ion",      "mod_query.show_about_ion(_)"),
+     submenu("Styles",           "stylemenu"),
++    submenu("Debian",           "Debian"),
+     submenu("Session",          "sessionmenu"),
+ })
+ 
+@@ -381,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 ioncore.is_i18n() then
++        dopath("debian-menu-i18n")
++    else
++        dopath("debian-menu")
++    end
++end
diff --git a/debian/patches/extra/debian-menu.cfg b/debian/patches/extra/debian-menu.cfg
deleted file mode 100644
index 03b5007..0000000
--- a/debian/patches/extra/debian-menu.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-
--- Auto-generated Debian menu definitions
-if os.execute("test -x /usr/bin/update-menus") == 0 then
-    if ioncore.is_i18n() then
-        dopath("debian-menu-i18n")
-    else
-        dopath("debian-menu")
-    end
-end
diff --git a/debian/patches/series b/debian/patches/series
index 2ad6a6e..b4e6be9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,6 @@
 201_build-config.diff
-202_fix-menus.diff
-204_fix-bindings.diff
 205_ion-lock.diff
-206_use-xterm.diff
+206_use-x-terminal-emulator.diff
 209_use-etc-default.diff
 210_use-cfg_debian_ext.diff
+211_add-debian-menu.diff
diff --git a/debian/rules b/debian/rules
index ade1b18..b0a50e1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -141,8 +141,6 @@ binary-arch: build-arch install-arch
 	install -m644 debian/ion3.menu-method.i18n \
 		$(INSTDIR)/etc/menu-methods/ion3-i18n
 
-	cat $(CURDIR)/debian/patches/extra/debian-menu.cfg >> $(INSTDIR)/etc/X11/ion3/cfg_ioncore.lua
-
 	dh_installdebconf -a
 #	dh_installlogrotate -a
 #	dh_installemacsen -a