From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 11 Nov 2011 22:40:38 +0000 (+0000)
Subject: update debian/patches
X-Git-Tag: 4.1
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=56a9ce62ef8ddc84b2be77acba81ab5c23a9a398;p=i3%2Fi3

update debian/patches
---

diff --git a/debian/patches/manpage-x-terminal-emulator.patch b/debian/patches/manpage-x-terminal-emulator.patch
new file mode 100644
index 00000000..61ff0160
--- /dev/null
+++ b/debian/patches/manpage-x-terminal-emulator.patch
@@ -0,0 +1,14 @@
+## Description: Document Debian-specific x-terminal-emulator in the manpage.
+## Origin/Author: Michael Stapelberg
+Index: i3-4.1/man/i3-sensible-terminal.man
+===================================================================
+--- i3-4.1.orig/man/i3-sensible-terminal.man	2011-11-11 22:38:06.508025537 +0000
++++ i3-4.1/man/i3-sensible-terminal.man	2011-11-11 22:38:04.752994892 +0000
+@@ -22,6 +22,7 @@
+ It tries to start one of the following (in that order):
+ 
+ * $TERMINAL (this is a non-standard variable)
++* x-terminal-emulator (only on Debian)
+ * xterm
+ * urxvt
+ * rxvt
diff --git a/debian/patches/series b/debian/patches/series
index bb1d8d23..08d60ae0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-use-x-terminal-emulator
+use-x-terminal-emulator.patch
+manpage-x-terminal-emulator.patch
diff --git a/debian/patches/use-x-terminal-emulator b/debian/patches/use-x-terminal-emulator
deleted file mode 100644
index 8ad4dae6..00000000
--- a/debian/patches/use-x-terminal-emulator
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/i3-sensible-terminal.O	2011-11-11 22:03:52.414218386 +0000
-+++ b/i3-sensible-terminal	2011-11-11 22:04:38.372020210 +0000
-@@ -1,13 +1,11 @@
- #!/bin/sh
- # This script tries to exec a terminal emulator by trying some known terminal
- # emulators.
--#
--# Distributions/packagers should enhance this script with a
--# distribution-specific mechanism to find the preferred terminal emulator. On
--# Debian, there is the x-terminal-emulator symlink for example.
--# Please don't touch the first line, though:
- which $TERMINAL >/dev/null && exec $TERMINAL "$@"
- 
-+# Debian-specific: use x-terminal-emulator
-+which x-terminal-emulator >/dev/null && exec x-terminal-emulator "$@"
-+
- # Hopefully one of these is installed:
- which xterm >/dev/null && exec xterm "$@"
- which urxvt >/dev/null && exec urxvt "$@"
diff --git a/debian/patches/use-x-terminal-emulator.patch b/debian/patches/use-x-terminal-emulator.patch
new file mode 100644
index 00000000..fd515c16
--- /dev/null
+++ b/debian/patches/use-x-terminal-emulator.patch
@@ -0,0 +1,21 @@
+## Description: Use Debian-specific x-terminal-emulator in i3-sensible-terminal
+## Origin/Author: Michael Stapelberg
+--- a/i3-sensible-terminal.O	2011-11-11 22:03:52.414218386 +0000
++++ b/i3-sensible-terminal	2011-11-11 22:04:38.372020210 +0000
+@@ -1,13 +1,11 @@
+ #!/bin/sh
+ # This script tries to exec a terminal emulator by trying some known terminal
+ # emulators.
+-#
+-# Distributions/packagers should enhance this script with a
+-# distribution-specific mechanism to find the preferred terminal emulator. On
+-# Debian, there is the x-terminal-emulator symlink for example.
+-# Please don't touch the first line, though:
+ which $TERMINAL >/dev/null && exec $TERMINAL "$@"
+ 
++# Debian-specific: use x-terminal-emulator
++which x-terminal-emulator >/dev/null && exec x-terminal-emulator "$@"
++
+ # Hopefully one of these is installed:
+ which xterm >/dev/null && exec xterm "$@"
+ which urxvt >/dev/null && exec urxvt "$@"