From: Michael Stapelberg <michael@stapelberg.de>
Date: Thu, 6 Nov 2014 18:56:32 +0000 (+0100)
Subject: merge the formerly debian-specific x-terminal-emulator patch
X-Git-Tag: 4.9~38
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=012553040974ded6a650218ab5c098738b20dfe4;p=i3%2Fi3

merge the formerly debian-specific x-terminal-emulator patch

I think instead of maintaining distribution-specific patches forever,
it’s a bit easier to have them applied upstream, especially since they
don’t break anything.

fixes #876
---

diff --git a/debian/patches/manpage-x-terminal-emulator.patch b/debian/patches/manpage-x-terminal-emulator.patch
deleted file mode 100644
index 17b8ee4c..00000000
--- a/debian/patches/manpage-x-terminal-emulator.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: list x-terminal-emulator as one of i3-sensible-terminal’s choices
-Author: Michael Stapelberg <stapelberg@debian.org>
-Origin: vendor
-Forwarded: not-needed
-Last-Update: 2011-12-28
-
----
-
-Index: i3-4.1.1/man/i3-sensible-terminal.man
-===================================================================
---- i3-4.1.1.orig/man/i3-sensible-terminal.man	2011-12-28 23:56:55.487581000 +0100
-+++ i3-4.1.1/man/i3-sensible-terminal.man	2011-12-28 23:57:06.725802633 +0100
-@@ -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
- * urxvt
- * rxvt
- * terminator
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 08d60ae0..00000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-use-x-terminal-emulator.patch
-manpage-x-terminal-emulator.patch
diff --git a/debian/patches/use-x-terminal-emulator.patch b/debian/patches/use-x-terminal-emulator.patch
deleted file mode 100644
index 96161624..00000000
--- a/debian/patches/use-x-terminal-emulator.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: i3-sensible-terminal: try x-terminal-emulator first
-Author: Michael Stapelberg <stapelberg@debian.org>
-Origin: vendor
-Forwarded: not-needed
-Last-Update: 2012-09-19
-
----
-
-Index: i3-4.3/i3-sensible-terminal
-===================================================================
---- i3-4.3.orig/i3-sensible-terminal	2012-09-19 18:08:09.000000000 +0200
-+++ i3-4.3/i3-sensible-terminal	2012-09-19 18:32:06.393883488 +0200
-@@ -4,11 +4,7 @@
- #
- # 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.
--for terminal in $TERMINAL urxvt rxvt terminator Eterm aterm xterm gnome-terminal roxterm xfce4-terminal; do
-+for terminal in $TERMINAL x-terminal-emulator urxvt rxvt terminator Eterm aterm xterm gnome-terminal roxterm xfce4-terminal; do
-     if which $terminal > /dev/null 2>&1; then
-         exec $terminal "$@"
-     fi
diff --git a/i3-sensible-terminal b/i3-sensible-terminal
index 485fc16d..d56efa70 100755
--- a/i3-sensible-terminal
+++ b/i3-sensible-terminal
@@ -5,10 +5,10 @@
 # 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.
-for terminal in $TERMINAL urxvt rxvt terminator Eterm aterm xterm gnome-terminal roxterm xfce4-terminal; do
+# We welcome patches that add distribution-specific mechanisms to find the
+# preferred terminal emulator. On Debian, there is the x-terminal-emulator
+# symlink for example.
+for terminal in $TERMINAL x-terminal-emulator urxvt rxvt terminator Eterm aterm xterm gnome-terminal roxterm xfce4-terminal; do
     if command -v $terminal > /dev/null 2>&1; then
         exec $terminal "$@"
     fi
diff --git a/man/i3-sensible-terminal.man b/man/i3-sensible-terminal.man
index 49d8831c..d1ad5198 100644
--- a/man/i3-sensible-terminal.man
+++ b/man/i3-sensible-terminal.man
@@ -22,6 +22,7 @@ is appropriate for the distribution.
 It tries to start one of the following (in that order):
 
 * $TERMINAL (this is a non-standard variable)
+* x-terminal-emulator (only present on Debian and derivatives)
 * urxvt
 * rxvt
 * terminator