X Strike Force X.Org X11 SVN commit: r952 - in branches/modular/app/xterm/debian: . patches
Author: ender
Date: 2005-12-18 11:27:28 -0500 (Sun, 18 Dec 2005)
New Revision: 952
Modified:
branches/modular/app/xterm/debian/changelog
branches/modular/app/xterm/debian/patches/900_debian_xterm.diff
branches/modular/app/xterm/debian/patches/901_xterm_manpage.diff
Log:
All the changelog from #207-1 has been added to debian/changelog.
Resynced and refreshed 900_debian_xterm.diff and 901_xterm_manpage.diff.
Added Id keywords to the above patches.
Modified: branches/modular/app/xterm/debian/changelog
===================================================================
--- branches/modular/app/xterm/debian/changelog 2005-12-18 16:21:30 UTC (rev 951)
+++ branches/modular/app/xterm/debian/changelog 2005-12-18 16:27:28 UTC (rev 952)
@@ -1,3 +1,45 @@
+xterm (207-1) experimental; urgency=low
+
+ * New upstream release (patchlevel #207). Main changes follow:
+ - Implement logic in termcap query to process multiple parameters as
+ documented in ctlseqs.ms
+ - Fix buffer size used for termcap query, which was not long enough for
+ the terminfo "colors" name.
+ - Add menu entry (alt-esc) and corresponding action (alt-sends-esc) to
+ toggle the eightBitInput resource setting.
+ - Modify computation of rows/columns on resize to avoid extending beyond
+ the given limits, e.g., if resizing in response to a "maximize" in
+ Gnome or KDE which do not use the window manager hints for this case
+ (closes: #289123).
+ - Improve error-reporting when chown/chmod of the pseudo-terminal fails.
+ - Several changes in the control sequences.
+ - Improvements in the configure script.
+ - Eliminate a retry for a better-matching bold font, to work around
+ recent font server changes.
+ - Specify weight for wide font which may be derived from normal
+ fontname.
+ - Cache the derived wide- and widebolt- fontnames.
+ - Modify resource files to make the font-resources a little more specific,
+ e.g., changing "*VT100*" to "*VT100.", to make the distinction between
+ VT100.font and VT100.utf8Fonts.font sharper, in case a packager modifies
+ one of those.
+ - Expanded comments in UXTerm.ad regarding the font resources (closes:
+ #319179).
+ - Add --enable-narrowproto configure option to accommodate Xorg "modular"
+ build.
+ - Add scrollBarBorder resource.
+ - Fix a file-descriptor leak when calling openpty().
+ - A hard reset also resets the 132/80 mode.
+ - Restore window manager hints after XtMakeResizeRequest() calls.
+ - Scroll-down is allowed to be sent while mouse tracking is enabled.
+ - Correct size-comparison in HandleInterpret() broken in changes from
+ patch #201 to allocate input buffer (closes: #334317).
+ - Upstream merged Debian patches 001 and 002 for typos in xterm.
+ - Added setuid options.
+ * Debian patches 900 and 901 resynced.
+
+ -- David Martínez Moreno <ender@debian.org> Sun, 18 Dec 2005 17:17:38 +0100
+
xterm (204-0pre1) experimental; urgency=low
* The xterm package has been splitted from the upstream X.Org tree, in
@@ -76,7 +118,7 @@
- Resolve MANIFEST.mips to fix FTBFS
- Add missing docs to xserver-xorg.docs.mipsel
- Incorporate patch from HEAD to include more radeon PCI ID's. Thanks,
- Harald Welte. Closes: #318948
+ Harald Welte. Closes: #318948.
- Make the build not fail on MANIFEST check. If there are discrepancies,
I'd rather have a mostly complete X package than a failure on some
arches. The failure diff will still be spit out, allowing us to fix the
@@ -85,7 +127,7 @@
Changes by Eugene Konev:
- Update 030_libvgahw_gcc4_volatile_fix.diff to include a complete fix.
- Closes: #318218
+ Closes: #318218.
Changes by David Martínez Moreno
Modified: branches/modular/app/xterm/debian/patches/900_debian_xterm.diff
===================================================================
--- branches/modular/app/xterm/debian/patches/900_debian_xterm.diff 2005-12-18 16:21:30 UTC (rev 951)
+++ branches/modular/app/xterm/debian/patches/900_debian_xterm.diff 2005-12-18 16:27:28 UTC (rev 952)
@@ -23,9 +23,10 @@
This patch by Branden Robinson.
-diff -ruN xc-old/programs/xterm/termcap xc/programs/xterm/termcap
---- termcap.orig 2005-07-03 16:49:15.000000000 -0400
-+++ termcap 2005-07-03 16:56:15.000000000 -0400
+Index: termcap
+===================================================================
+--- termcap.orig 2005-11-03 14:17:28.000000000 +0100
++++ termcap 2005-12-18 17:16:00.581585172 +0100
@@ -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:
@@ -49,10 +50,11 @@
+ :tc=xterm-debian:
+# :tc=xterm-new:
# :tc=xterm-r6:
-diff -ruN xc-old/programs/xterm/terminfo xc/programs/xterm/terminfo
---- terminfo.orig 2005-07-03 16:49:14.000000000 -0400
-+++ terminfo 2005-07-03 16:56:15.000000000 -0400
-@@ -300,6 +300,13 @@
+Index: terminfo
+===================================================================
+--- terminfo.orig 2005-11-03 14:17:28.000000000 +0100
++++ terminfo 2005-12-18 17:16:00.605587057 +0100
+@@ -305,6 +305,13 @@
u8=\E[?1;2c,
u9=\E[c,
vpa=\E[%i%p1%dd,
@@ -66,7 +68,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
-@@ -1003,5 +1010,6 @@
+@@ -1008,5 +1015,6 @@
# is widely used for a variety of incompatible terminal emulations including
# color_xterm and rxvt.
xterm|X11 terminal emulator,
@@ -74,10 +76,11 @@
+ use=xterm-debian,
+# use=xterm-new,
# use=xterm-r6,
-diff -ruN xc-old/programs/xterm/XTerm.ad xc/programs/xterm/XTerm.ad
---- XTerm.ad.orig 2005-07-03 16:49:14.000000000 -0400
-+++ XTerm.ad 2005-07-03 17:30:22.000000000 -0400
-@@ -117,6 +117,10 @@
+Index: XTerm.ad
+===================================================================
+--- XTerm.ad.orig 2005-11-03 14:17:27.000000000 +0100
++++ XTerm.ad 2005-12-18 17:16:00.613587685 +0100
+@@ -118,6 +118,10 @@
*tek4014*font3: 6x13
*tek4014*fontSmall: 6x10
@@ -88,9 +91,10 @@
! 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
---- XTerm-col.ad.orig 2005-07-03 16:49:14.000000000 -0400
-+++ XTerm-col.ad 2005-07-03 17:28:10.000000000 -0400
+Index: XTerm-col.ad
+===================================================================
+--- XTerm-col.ad.orig 2005-09-19 01:48:12.000000000 +0200
++++ XTerm-col.ad 2005-12-18 17:16:00.617587999 +0100
@@ -7,9 +7,9 @@
*VT100*boldColors: on
*VT100*dynamicColors: on
@@ -104,15 +108,7 @@
! - OR -
! Uncomment this for black text on a "white" background.
-@@ -53,7 +53,6 @@
- *VT100*colorUL: yellow
- *VT100*colorBD: white
-
--
- ! Disclaimer: there are no standard colors used in terminal emulation.
- !
- ! The choice for color4 and color12 is a tradeoff between contrast, depending
-@@ -106,20 +105,32 @@
+@@ -111,20 +111,32 @@
*.Form.menubar.*.foreground: gray15
*.Form.background: AntiqueWhite
Property changes on: branches/modular/app/xterm/debian/patches/900_debian_xterm.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: branches/modular/app/xterm/debian/patches/901_xterm_manpage.diff
===================================================================
--- branches/modular/app/xterm/debian/patches/901_xterm_manpage.diff 2005-12-18 16:21:30 UTC (rev 951)
+++ branches/modular/app/xterm/debian/patches/901_xterm_manpage.diff 2005-12-18 16:27:28 UTC (rev 952)
@@ -6,19 +6,20 @@
This patch by Branden Robinson and David Martínez.
-diff -ruN xterm.orig/xterm.man xterm/xterm.man
---- xterm.man.orig 2005-07-03 16:49:14.000000000 -0400
-+++ xterm.man 2005-07-03 16:56:15.000000000 -0400
-@@ -58,7 +58,7 @@
- .\" $XFree86: xc/programs/xterm/xterm.man,v 3.115 2005/07/07 00:46:15 dickey Exp $
- .\"
- .\" updated by Thomas E. Dickey for XFree86, July 1996 - July 2004.
+Index: xterm.man
+===================================================================
+--- xterm.man.orig 2005-11-14 00:10:36.000000000 +0100
++++ xterm.man 2005-12-18 17:16:39.124577218 +0100
+@@ -71,7 +71,7 @@
+ .sp
+ .in -4
+ ..
-.TH XTERM 1 __vendorversion__
+.TH XTERM 1x __vendorversion__
.SH NAME
xterm \- terminal emulator for X
.SH SYNOPSIS
-@@ -4083,10 +4083,10 @@
+@@ -4114,10 +4114,10 @@
.SH FILES
The actual pathnames given may differ on your system.
.TP 5
Property changes on: branches/modular/app/xterm/debian/patches/901_xterm_manpage.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Reply to: