X Strike Force X.Org X11 SVN commit: r309 - trunk/debian/patches
Author: dnusinow
Date: 2005-07-03 16:54:43 -0500 (Sun, 03 Jul 2005)
New Revision: 309
Modified:
trunk/debian/patches/907_debian_xterm.diff
Log:
- Fix patch 907 to allow it to apply without fuzz
Modified: trunk/debian/patches/907_debian_xterm.diff
===================================================================
--- trunk/debian/patches/907_debian_xterm.diff 2005-07-03 21:35:28 UTC (rev 308)
+++ trunk/debian/patches/907_debian_xterm.diff 2005-07-03 21:54:43 UTC (rev 309)
@@ -1,4 +1,4 @@
-$Id: 907_debian_xterm.diff 1881 2004-09-28 04:43:24Z branden $
+$Id$
Make Debian-specific tweaks to xterm:
* Set the default VT widget foreground and background colors to gray90 on
@@ -24,9 +24,74 @@
This patch by Branden Robinson.
-diff -durN xc/programs/xterm~/XTerm-col.ad xc/programs/xterm/XTerm-col.ad
---- xc/programs/xterm~/XTerm-col.ad 2004-09-27 20:03:57.000000000 -0500
-+++ xc/programs/xterm/XTerm-col.ad 2004-09-27 20:04:31.000000000 -0500
+diff -ruN xc-old/programs/xterm/termcap xc/programs/xterm/termcap
+--- xc-old/programs/xterm/termcap 2005-07-03 16:49:15.000000000 -0400
++++ xc/programs/xterm/termcap 2005-07-03 16:56:15.000000000 -0400
+@@ -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
++# 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:
+@@ -205,5 +213,6 @@
+ # 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:
+diff -ruN xc-old/programs/xterm/terminfo xc/programs/xterm/terminfo
+--- xc-old/programs/xterm/terminfo 2005-07-03 16:49:14.000000000 -0400
++++ xc/programs/xterm/terminfo 2005-07-03 16:56:15.000000000 -0400
+@@ -300,6 +300,13 @@
+ 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),
++ 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
+@@ -1003,5 +1010,6 @@
+ # 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,
+diff -ruN xc-old/programs/xterm/XTerm.ad xc/programs/xterm/XTerm.ad
+--- xc-old/programs/xterm/XTerm.ad 2005-07-03 16:49:14.000000000 -0400
++++ xc/programs/xterm/XTerm.ad 2005-07-03 17:30:22.000000000 -0400
+@@ -117,6 +117,10 @@
+ *tek4014*font3: 6x13
+ *tek4014*fontSmall: 6x10
+
++! Debian package customizations follow.
++*backarrowKeyIsErase: true
++*ptyInitialErase: true
++
+ ! If xterm is built with a toolbar, the widget hierarchy looks like this,
+ ! showing widget name / class names. The complete menu hierarchy is built
+ ! at startup because it is needed to make the layout work for the menubar:
+diff -ruN xc-old/programs/xterm/XTerm-col.ad xc/programs/xterm/XTerm-col.ad
+--- xc-old/programs/xterm/XTerm-col.ad 2005-07-03 16:49:14.000000000 -0400
++++ xc/programs/xterm/XTerm-col.ad 2005-07-03 17:28:10.000000000 -0400
@@ -7,9 +7,9 @@
*VT100*boldColors: on
*VT100*dynamicColors: on
@@ -38,9 +103,9 @@
+*VT100*foreground: gray90
+*VT100*background: black
- ! Uncomment this to use color for underline attribute
- !*VT100*colorULMode: on
-@@ -40,7 +40,6 @@
+ ! - OR -
+ ! Uncomment this for black text on a "white" background.
+@@ -52,7 +52,6 @@
*VT100*colorUL: yellow
*VT100*colorBD: white
@@ -48,11 +113,10 @@
! Disclaimer: there are no standard colors used in terminal emulation.
!
! The choice for color4 and color12 is a tradeoff between contrast, depending
-@@ -82,10 +81,22 @@
- !
- ! Some refinement is certainly possible (you are welcome to try) -TD
+@@ -105,20 +104,32 @@
+ *.Form.menubar.*.foreground: gray15
+ *.Form.background: AntiqueWhite
-+#if PLANES > 8
+*mainMenu*background: AntiqueWhite
+*mainMenu*foreground: gray15
+*vtMenu*background: AntiqueWhite
@@ -61,7 +125,7 @@
+*fontMenu*foreground: gray15
+*tekMenu*background: AntiqueWhite
+*tekMenu*foreground: gray15
-
++
! The following two sections take advantage of new features in version 7
-! of the Athena widget library. Comment them out if you have a shallow
-! color depth.
@@ -70,12 +134,8 @@
+! This section is commented out because Xaw has no way to dynamically size
+! the gradient. The dimension parameter may need to be adjusted depending
+! on the font used in the menu.
- !*mainMenu*backgroundPixmap: gradient:vertical?dimension=350&start=gray90&end=gray60
- !*mainMenu*foreground: gray15
- !*vtMenu*backgroundPixmap: gradient:vertical?dimension=445&start=gray90&end=gray60
-@@ -95,13 +106,14 @@
- !*tekMenu*backgroundPixmap: gradient:vertical?dimension=205&start=gray90&end=gray60
- !*tekMenu*foreground: gray15
+ !*SimpleMenu*backgroundPixmap: gradient:vertical?dimension=350&start=gray90&end=gray60
+ !*SimpleMenu*foreground: gray15
-!*VT100.scrollbar.thumb: vlines2
-!*VT100.scrollbar.width: 14
@@ -97,73 +157,11 @@
+lines 1,-1,-1,-1,-1,1;\
+foreground gray60;\
+lines -1,0,0,0,0,-1
-+#endif
-diff -durN xc/programs/xterm~/XTerm.ad xc/programs/xterm/XTerm.ad
---- xc/programs/xterm~/XTerm.ad 2004-09-27 20:03:57.000000000 -0500
-+++ xc/programs/xterm/XTerm.ad 2004-09-27 20:04:31.000000000 -0500
-@@ -116,3 +116,7 @@
- *tek4014*font2: 8x13
- *tek4014*font3: 6x13
- *tek4014*fontSmall: 6x10
-+
-+! Debian package customizations follow.
-+*backarrowKeyIsErase: true
-+*ptyInitialErase: true
-diff -durN xc/programs/xterm~/termcap xc/programs/xterm/termcap
---- xc/programs/xterm~/termcap 2004-09-27 20:03:57.000000000 -0500
-+++ xc/programs/xterm/termcap 2004-09-27 20:04:31.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
-+# 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:
-@@ -205,5 +213,6 @@
- # 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:
-diff -durN xc/programs/xterm~/terminfo xc/programs/xterm/terminfo
---- xc/programs/xterm~/terminfo 2004-09-27 20:03:57.000000000 -0500
-+++ xc/programs/xterm/terminfo 2004-09-27 20:04:31.000000000 -0500
-@@ -289,6 +289,13 @@
- 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),
-+ 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
-@@ -989,5 +996,6 @@
- # 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,
-diff -durN xc/programs/xterm~/xterm.man xc/programs/xterm/xterm.man
---- xc/programs/xterm~/xterm.man 2004-09-27 20:03:57.000000000 -0500
-+++ xc/programs/xterm/xterm.man 2004-09-27 20:04:31.000000000 -0500
-@@ -3959,10 +3959,10 @@
+ #endif
+diff -ruN xc-old/programs/xterm/xterm.man xc/programs/xterm/xterm.man
+--- xc-old/programs/xterm/xterm.man 2005-07-03 16:49:14.000000000 -0400
++++ xc/programs/xterm/xterm.man 2005-07-03 16:56:15.000000000 -0400
+@@ -4079,10 +4079,10 @@
.SH FILES
The actual pathnames given may differ on your system.
.TP 5
Reply to: