X Strike Force XFree86 SVN commit: r1500 - in trunk/debian: . patches
Author: branden
Date: 2004-06-01 12:38:43 -0500 (Tue, 01 Jun 2004)
New Revision: 1500
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
trunk/debian/patches/907_debian_xterm.diff
Log:
Resync patch #907 with grab of XTerm #190.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-06-01 17:09:46 UTC (rev 1499)
+++ trunk/debian/CHANGESETS 2004-06-01 17:38:43 UTC (rev 1500)
@@ -27,8 +27,8 @@
Merge Josh Triplett's clean-room reimplementation of post-#187 changes to XTerm
in XFree86 CVS. Upgrade XTerm to #190. Check for changes pulled from XFree86
-CVS and deal with them appropriately.
- 1482
+CVS and deal with them appropriately. Resync patch #907.
+ 1482, 1500
Update Czech debconf template translations (thanks, Mirsoslav Kure).
(Closes: #251681)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-06-01 17:09:46 UTC (rev 1499)
+++ trunk/debian/changelog 2004-06-01 17:38:43 UTC (rev 1500)
@@ -36,7 +36,7 @@
* Grab latest version of XTerm (#190) from Thomas Dickey's website. Check
for license contamination from XFree86 CVS, and document findings in patch
- annotation (short story: there is none).
+ annotation (short story: there is none). Resync patch #907.
+ Fix problem responding to session management events, e.g., which would
make logging out very slow (patch by Eddy De Greef, Debian #233883).
(Closes: #233883)
Modified: trunk/debian/patches/907_debian_xterm.diff
===================================================================
--- trunk/debian/patches/907_debian_xterm.diff 2004-06-01 17:09:46 UTC (rev 1499)
+++ trunk/debian/patches/907_debian_xterm.diff 2004-06-01 17:38:43 UTC (rev 1500)
@@ -24,9 +24,9 @@
This patch by Branden Robinson.
-diff -urN xc/programs/xterm~/XTerm-col.ad xc/programs/xterm/XTerm-col.ad
---- xc/programs/xterm~/XTerm-col.ad 2004-05-12 14:37:13.000000000 -0500
-+++ xc/programs/xterm/XTerm-col.ad 2004-05-12 14:53:29.000000000 -0500
+diff -u xc/programs/xterm~/XTerm-col.ad xc/programs/xterm/XTerm-col.ad
+--- xc/programs/xterm~/XTerm-col.ad 2004-06-01 12:35:07.000000000 -0500
++++ xc/programs/xterm/XTerm-col.ad 2004-06-01 12:35:25.000000000 -0500
@@ -6,9 +6,9 @@
*VT100*boldColors: on
*VT100*dynamicColors: on
@@ -90,9 +90,9 @@
+foreground gray60;\
+lines -1,0,0,0,0,-1
+#endif
-diff -urN xc/programs/xterm~/XTerm.ad xc/programs/xterm/XTerm.ad
---- xc/programs/xterm~/XTerm.ad 2004-05-12 14:37:13.000000000 -0500
-+++ xc/programs/xterm/XTerm.ad 2004-05-12 14:44:23.000000000 -0500
+diff -u xc/programs/xterm~/XTerm.ad xc/programs/xterm/XTerm.ad
+--- xc/programs/xterm~/XTerm.ad 2004-06-01 12:35:07.000000000 -0500
++++ xc/programs/xterm/XTerm.ad 2004-06-01 12:35:25.000000000 -0500
@@ -112,3 +112,7 @@
*tek4014*font2: 8x13
*tek4014*font3: 6x13
@@ -101,12 +101,12 @@
+# Debian package customizations follow.
+*backarrowKeyIsErase: true
+*ptyInitialErase: true
-diff -urN xc/programs/xterm~/termcap xc/programs/xterm/termcap
---- xc/programs/xterm~/termcap 2004-05-12 14:37:13.000000000 -0500
-+++ xc/programs/xterm/termcap 2004-05-12 14:41:02.000000000 -0500
-@@ -41,6 +41,14 @@
- :ti=\E[?1049h:te=\E[?1049l:vi=\E[?25l:ve=\E[?25h:\
- :ut:Co#8:pa#64:op=\E[39;49m:AB=\E[4%dm:AF=\E[3%dm:\
+diff -u xc/programs/xterm~/termcap xc/programs/xterm/termcap
+--- xc/programs/xterm~/termcap 2004-06-01 12:35:07.000000000 -0500
++++ xc/programs/xterm/termcap 2004-06-01 12:35:25.000000000 -0500
+@@ -43,6 +43,14 @@
+ :so=\E[7m:sr=\EM:st=\EH:te=\E[?1049l:ti=\E[?1049h:\
+ :ue=\E[24m:up=\E[A:us=\E[4m:ve=\E[?25h:vi=\E[?25l:
+# 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
@@ -119,7 +119,7 @@
# 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:
-@@ -197,5 +205,6 @@
+@@ -204,5 +212,6 @@
# is widely used for a variety of incompatible terminal emulations including
# color_xterm and rxvt.
v0|xterm|X11 terminal emulator:\
@@ -127,9 +127,9 @@
+ :tc=xterm-debian:
+# :tc=xterm-new:
# :tc=xterm-r6:
-diff -urN xc/programs/xterm~/terminfo xc/programs/xterm/terminfo
---- xc/programs/xterm~/terminfo 2004-05-12 14:37:13.000000000 -0500
-+++ xc/programs/xterm/terminfo 2004-05-12 14:42:11.000000000 -0500
+diff -u xc/programs/xterm~/terminfo xc/programs/xterm/terminfo
+--- xc/programs/xterm~/terminfo 2004-06-01 12:35:07.000000000 -0500
++++ xc/programs/xterm/terminfo 2004-06-01 12:35:25.000000000 -0500
@@ -272,6 +272,13 @@
u8=\E[?1;2c,
u9=\E[c,
@@ -144,7 +144,7 @@
#
# 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
-@@ -976,5 +983,6 @@
+@@ -973,5 +980,6 @@
# is widely used for a variety of incompatible terminal emulations including
# color_xterm and rxvt.
xterm|X11 terminal emulator,
@@ -152,10 +152,10 @@
+ use=xterm-debian,
+# use=xterm-new,
# use=xterm-r6,
-diff -urN xc/programs/xterm~/xterm.man xc/programs/xterm/xterm.man
---- xc/programs/xterm~/xterm.man 2004-05-12 14:37:13.000000000 -0500
-+++ xc/programs/xterm/xterm.man 2004-05-12 14:38:02.000000000 -0500
-@@ -3809,10 +3809,10 @@
+diff -u xc/programs/xterm~/xterm.man xc/programs/xterm/xterm.man
+--- xc/programs/xterm~/xterm.man 2004-06-01 12:35:07.000000000 -0500
++++ xc/programs/xterm/xterm.man 2004-06-01 12:35:25.000000000 -0500
+@@ -3825,10 +3825,10 @@
.SH FILES
The actual pathnames given may differ on your system.
.TP 5
Reply to: