Re: xterm: Changes to 'debian-unstable'
Hi Sven,
can you check if the change I've made makes sense? (And if we need to
keep the xterm-debian definition for backwards-compatibility reasons?)
Thanks,
Julien
On Tue, Aug 30, 2011 at 19:52:32 +0000, Julien Cristau wrote:
> debian/changelog | 4 +
> debian/patches/900_debian_xterm.diff | 73 +++++------------------------------
> debian/rules | 1
> 3 files changed, 15 insertions(+), 63 deletions(-)
>
> New commits:
> commit 05f4a917b7891f2d73e80d1d73fc91055edf7c4e
> Author: Julien Cristau <jcristau@debian.org>
> Date: Tue Aug 30 21:51:36 2011 +0200
>
> Fix up 900_debian_xterm.diff's changes to termcap and terminfo
>
> Update 900_debian_xterm.diff to only edit the new xterm+kbs fragment in
> both terminfo and termcap instead of adding an xterm-debian variant to
> change the backspace key behaviour.
>
> diff --git a/debian/changelog b/debian/changelog
> index c6588a1..121ffe9 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -10,6 +10,9 @@ xterm (273-1) UNRELEASED; urgency=low
> + fix regression in command-line parsing introduced in patch #271 changes
> for Debian #629358 (closes: #637910)
> * Don't use dh_testroot in clean.
> + * Update 900_debian_xterm.diff to only edit the new xterm+kbs fragment in
> + both terminfo and termcap instead of adding an xterm-debian variant to
> + change the backspace key behaviour.
>
> -- Julien Cristau <jcristau@debian.org> Sun, 28 Aug 2011 18:00:26 +0200
>
> diff --git a/debian/patches/900_debian_xterm.diff b/debian/patches/900_debian_xterm.diff
> index f108321..3efc259 100644
> --- a/debian/patches/900_debian_xterm.diff
> +++ b/debian/patches/900_debian_xterm.diff
> @@ -25,73 +25,22 @@ Index: xterm/termcap
> ===================================================================
> --- xterm.orig/termcap
> +++ xterm/termcap
> -@@ -71,6 +71,14 @@ xb|xterm-basic|modern xterm common:\
> - :so=\E[7m:sr=\EM:st=\EH:te=\E[?1049l:ti=\E[?1049h:\
> - :ue=\E[24m:up=\E[A:us=\E[4m:ve=\E[?12l\E[?25h:vi=\E[?25l:vs=\E[?12;25h:
> -
> -+# xterm-debian is identical to xterm-new except that it more strictly
> -+# conforms to DEC VT220 behavior in the case of the backspace key; this is
> -+# mandated by Section 9.8 of the Debian Policy Manual. Also see
> -+# <http://vt100.net/docs/vt220-rm/>.
> -+xd|xterm-debian|Debian xterm (VT220-conformant backspace):\
> -+ :kb=^?:\
> -+ :tc=xterm-new:
> -+
> - # The xterm-new description has all of the features, but is not completely
> - # compatible with vt220. If you are using a Sun or PC keyboard, set the
> - # sunKeyboard resource to true:
> -@@ -233,5 +241,6 @@ x0|xterm-xfree86|xterm terminal emulator
> - # is widely used for a variety of incompatible terminal emulations including
> - # color_xterm and rxvt.
> - v0|xterm|X11 terminal emulator:\
> -- :tc=xterm-new:
> -+ :tc=xterm-debian:
> -+# :tc=xterm-new:
> - # :tc=xterm-r6:
> +@@ -240,4 +240,4 @@ v0|xterm|X11 terminal emulator:\
> + # This fragment is for people who cannot agree on what the backspace key
> + # should send.
> + xterm+kbs|fragment for backspace key:\
> +- :kb=^H:
> ++ :kb=^?:
> Index: xterm/terminfo
> ===================================================================
> --- xterm.orig/terminfo
> +++ xterm/terminfo
> -@@ -981,6 +981,13 @@ xterm-basic|modern xterm terminal emulat
> - u8=\E[?1;2c,
> - u9=\E[c,
> - vpa=\E[%i%p1%dd,
> -+# xterm-debian is identical to xterm-new except that it more strictly
> -+# conforms to DEC VT220 behavior in the case of the backspace key; this is
> -+# mandated by the Section 9.8 of the Debian Policy Manual. Also see
> -+# <http://vt100.net/docs/vt220-rm/>.
> -+xterm-debian|Debian xterm (VT220-conformant backspace),
> +@@ -1970,4 +1970,4 @@ xterm|X11 terminal emulator,
> + # This fragment is for people who cannot agree on what the backspace key
> + # should send.
> + xterm+kbs|fragment for backspace key,
> +- kbs=^H,
> + kbs=\177,
> -+ use=xterm-new,
> - #
> - # The xterm-new description has all of the features, but is not completely
> - # compatible with vt220. If you are using a Sun or PC keyboard, set the
> -@@ -1419,7 +1426,7 @@ xterm-16color|xterm with 16 colors,
> - setaf=\E[%?%p1%{8}%<%t%p1%{30}%+%e%p1%{82}%+%;%dm,
> - setb=%p1%{8}%/%{6}%*%{4}%+\E[%d%p1%{8}%m%Pa%?%ga%{1}%=%t4%e%ga%{3}%=%t6%e%ga%{4}%=%t1%e%ga%{6}%=%t3%e%ga%d%;m,
> - setf=%p1%{8}%/%{6}%*%{3}%+\E[%d%p1%{8}%m%Pa%?%ga%{1}%=%t4%e%ga%{3}%=%t6%e%ga%{4}%=%t1%e%ga%{6}%=%t3%e%ga%d%;m,
> -- use=xterm-new,
> -+ use=xterm-debian,
> - #
> - # This uses RGB values 0..1000
> - #
> -@@ -1434,7 +1441,7 @@ xterm-256color|xterm with 256 colors,
> - setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m,
> - setb@,
> - setf@,
> -- use=xterm-new,
> -+ use=xterm-debian,
> - xterm-88color|xterm with 88 colors,
> - colors#88,
> - pairs#7744,
> -@@ -1961,5 +1968,6 @@ xterm-r5|xterm R5 version,
> - # is widely used for a variety of incompatible terminal emulations including
> - # color_xterm and rxvt.
> - xterm|X11 terminal emulator,
> -- use=xterm-new,
> -+ use=xterm-debian,
> -+# use=xterm-new,
> - # use=xterm-r6,
> Index: xterm/XTerm.ad
> ===================================================================
> --- xterm.orig/XTerm.ad
>
Reply to: