From: Ben Hutchings <ben@decadent.org.uk>
Date: Sun, 2 Nov 2008 12:34:09 +0000 (+0000)
Subject: Updated patches for ion-3ds-20070318.
X-Git-Tag: 20070318-1~7
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=dbe4d0f02712235e3dd719662ac84c6b5d56a0e7;p=ion3.git
Updated patches for ion-3ds-20070318.
---
diff --git a/debian/changelog b/debian/changelog
index dda936b..4fe0345 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ion3 (20070318-1) unstable; urgency=low
+
+ * New maintainer - closes: #414378
+ * New upstream release - closes: #413469
+
+ --
+
ion3 (20070203-1) experimental; urgency=low
* New upstream release.
diff --git a/debian/patches/201_fix-paths.diff b/debian/patches/201_fix-paths.diff
index d9e744e..6c886d7 100755
--- a/debian/patches/201_fix-paths.diff
+++ b/debian/patches/201_fix-paths.diff
@@ -76,16 +76,16 @@ diff -Nur ion-3ds-20060519.orig/system.mk ion-3ds-20060519/system.mk
##
-@@ -107,7 +107,7 @@
+@@ -104,7 +104,7 @@
# asprintf and vasprintf in the c library. (gnu libc has.)
# If HAS_SYSTEM_ASPRINTF is not defined, an implementation
# in sprintf_2.2/ is used.
-#HAS_SYSTEM_ASPRINTF=1
+HAS_SYSTEM_ASPRINTF=1
-
# If you're on an archaic system (such as relatively recent *BSD releases)
-@@ -144,14 +144,14 @@
+ # without even dummy multibyte/widechar and localisation support, you may
+@@ -140,14 +140,14 @@
#C89_SOURCE=-ansi
diff --git a/debian/patches/202_fix-menus.diff b/debian/patches/202_fix-menus.diff
index 968ffa4..6961ec8 100755
--- a/debian/patches/202_fix-menus.diff
+++ b/debian/patches/202_fix-menus.diff
@@ -15,9 +15,12 @@ exit 0
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 @@
+@@ -330,11 +330,14 @@
+ -- Main menu
defmenu("mainmenu", {
- submenu("Programs", "appmenu"),
+ 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'))"),
@@ -28,17 +31,3 @@ diff -Nur ion3-20060524.orig/etc/cfg_ioncore.lua ion3-20060524/etc/cfg_ioncore.l
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(_)"),
- })
diff --git a/debian/patches/204_fix-bindings.diff b/debian/patches/204_fix-bindings.diff
index 935cfe2..9678a35 100755
--- a/debian/patches/204_fix-bindings.diff
+++ b/debian/patches/204_fix-bindings.diff
@@ -17,7 +17,7 @@ exit 0
diff -Nur ion3-20061223.orig/etc/cfg_ioncore.lua ion3-20061223/etc/cfg_ioncore.lua
--- ion3-20061223.orig/etc/cfg_ioncore.lua 2006-12-23 15:59:43.000000000 +0100
+++ ion3-20061223/etc/cfg_ioncore.lua 2006-12-23 16:39:46.000000000 +0100
-@@ -145,7 +145,7 @@
+@@ -153,7 +153,7 @@
kpress(META.."F1", "ioncore.exec_on(_, ':man ion3')"),
bdoc("Run a terminal emulator."),
diff --git a/debian/patches/206_use-xterm.diff b/debian/patches/206_use-xterm.diff
index 0f85ca4..117f005 100755
--- a/debian/patches/206_use-xterm.diff
+++ b/debian/patches/206_use-xterm.diff
@@ -23,5 +23,5 @@ diff -Nur ion-3ds-20041104.orig/utils/ion-runinxterm ion-3ds-20041104/utils/ion-
-test "$XTERMCMD" || XTERMCMD="xterm"
+test "$XTERMCMD" || XTERMCMD="x-terminal-emulator"
- if test $# -lt 1; then
- echo error
+ title=""
+ wait=""
diff --git a/debian/patches/207_bindings-manpage.diff b/debian/patches/207_bindings-manpage.diff
index 5eee61e..38b3941 100755
--- a/debian/patches/207_bindings-manpage.diff
+++ b/debian/patches/207_bindings-manpage.diff
@@ -17,7 +17,7 @@ exit 0
diff -Nur ion3-20061020.orig/man/ion3.cs.in ion3-20061020/man/ion3.cs.in
--- ion3-20061020.orig/man/ion3.cs.in 2006-10-20 17:43:37.000000000 +0200
+++ ion3-20061020/man/ion3.cs.in 2006-10-23 20:42:12.000000000 +0200
-@@ -81,6 +81,10 @@
+@@ -77,6 +77,10 @@
.SS Globální pøiøazení
@@ -31,7 +31,7 @@ diff -Nur ion3-20061020.orig/man/ion3.cs.in ion3-20061020/man/ion3.cs.in
diff -Nur ion3-20061020.orig/man/ion3.fi.in ion3-20061020/man/ion3.fi.in
--- ion3-20061020.orig/man/ion3.fi.in 2006-10-20 17:43:36.000000000 +0200
+++ ion3-20061020/man/ion3.fi.in 2006-10-23 20:42:12.000000000 +0200
-@@ -84,6 +84,10 @@
+@@ -80,6 +80,10 @@
.SS Yleisesti saatavilla olevat sidonnat
@@ -45,7 +45,7 @@ diff -Nur ion3-20061020.orig/man/ion3.fi.in ion3-20061020/man/ion3.fi.in
diff -Nur ion3-20061020.orig/man/ion3.in ion3-20061020/man/ion3.in
--- ion3-20061020.orig/man/ion3.in 2006-10-20 17:43:36.000000000 +0200
+++ ion3-20061020/man/ion3.in 2006-10-23 20:42:12.000000000 +0200
-@@ -82,6 +82,10 @@
+@@ -77,6 +77,10 @@
.SS Globally available bindings
@@ -59,7 +59,7 @@ diff -Nur ion3-20061020.orig/man/ion3.in ion3-20061020/man/ion3.in
diff -Nur ion3-20061020.orig/man/pwm3.cs.in ion3-20061020/man/pwm3.cs.in
--- ion3-20061020.orig/man/pwm3.cs.in 2006-10-20 17:43:36.000000000 +0200
+++ ion3-20061020/man/pwm3.cs.in 2006-10-23 20:42:12.000000000 +0200
-@@ -56,6 +56,10 @@
+@@ -52,6 +52,10 @@
.SS Globální pøiøazení
@@ -70,7 +70,7 @@ diff -Nur ion3-20061020.orig/man/pwm3.cs.in ion3-20061020/man/pwm3.cs.in
BINDINGS:WScreen
.".SS Pøiøazení pro práci s rámy, obrazovkami a jejich potomky
-@@ -64,10 +68,6 @@
+@@ -60,10 +64,6 @@
.SS Pøiøazení pro práci s rámy a jejich potomky
@@ -84,7 +84,7 @@ diff -Nur ion3-20061020.orig/man/pwm3.cs.in ion3-20061020/man/pwm3.cs.in
diff -Nur ion3-20061020.orig/man/pwm3.fi.in ion3-20061020/man/pwm3.fi.in
--- ion3-20061020.orig/man/pwm3.fi.in 2006-10-20 17:43:36.000000000 +0200
+++ ion3-20061020/man/pwm3.fi.in 2006-10-23 20:42:12.000000000 +0200
-@@ -57,6 +57,10 @@
+@@ -51,6 +51,10 @@
.SS Yleisesti saatavilla olevat sidonnat
@@ -95,7 +95,7 @@ diff -Nur ion3-20061020.orig/man/pwm3.fi.in ion3-20061020/man/pwm3.fi.in
BINDINGS:WScreen
.\".SS Kehyksiä ja näyttöjä, sekä niiden lapsia käsittelevät sidonnat
-@@ -65,10 +69,6 @@
+@@ -59,10 +63,6 @@
.SS Kehyksiä, sekä niiden lapsia käsittelevät sidonnat
@@ -109,7 +109,7 @@ diff -Nur ion3-20061020.orig/man/pwm3.fi.in ion3-20061020/man/pwm3.fi.in
diff -Nur ion3-20061020.orig/man/pwm3.in ion3-20061020/man/pwm3.in
--- ion3-20061020.orig/man/pwm3.in 2006-10-20 17:43:36.000000000 +0200
+++ ion3-20061020/man/pwm3.in 2006-10-23 20:42:12.000000000 +0200
-@@ -57,6 +57,10 @@
+@@ -52,6 +52,10 @@
.SS Globally available bindings
@@ -120,7 +120,7 @@ diff -Nur ion3-20061020.orig/man/pwm3.in ion3-20061020/man/pwm3.in
BINDINGS:WScreen
.".SS Bindings operating on both frames and screens and their children
-@@ -65,10 +69,6 @@
+@@ -60,10 +64,6 @@
.SS Bindings operating on frames and their children
diff --git a/debian/patches/209_use-etc-default.diff b/debian/patches/209_use-etc-default.diff
index 190bc8b..09d40ab 100755
--- a/debian/patches/209_use-etc-default.diff
+++ b/debian/patches/209_use-etc-default.diff
@@ -17,9 +17,9 @@ exit 0
diff -Nur ion3-20060317.orig/etc/cfg_ion.lua ion3-20060317/etc/cfg_ion.lua
--- ion3-20060317.orig/etc/cfg_ion.lua 2006-03-17 20:43:04.000000000 +0100
+++ ion3-20060317/etc/cfg_ion.lua 2006-03-17 22:16:02.000000000 +0100
-@@ -12,6 +12,9 @@
- --META="Mod1+"
- --ALTMETA=""
+@@ -15,6 +15,9 @@
+ -- Terminal emulator
+ --XTERM="xterm"
+-- Debian sets the META and ALTMETA keys in /etc/default/ion3.
+dopath("cfg_debian")