X Strike Force X.Org X11 SVN commit: r1449 - in branches/modular/app: . xterm-210 xterm-210/debian xterm-210/debian/patches
Author: dnusinow
Date: 2006-03-13 21:50:33 -0500 (Mon, 13 Mar 2006)
New Revision: 1449
Added:
branches/modular/app/xterm-210/debian/
Removed:
branches/modular/app/xterm-210/debian/patches/001_stolen_from_HEAD.diff
branches/modular/app/xterm/
Modified:
branches/modular/app/xterm-210/debian/changelog
branches/modular/app/xterm-210/debian/patches/900_debian_xterm.diff
branches/modular/app/xterm-210/debian/patches/901_xterm_manpage.diff
branches/modular/app/xterm-210/debian/patches/series
Log:
Remove old xterm and update packaging for 210
Copied: branches/modular/app/xterm-210/debian (from rev 1448, branches/modular/app/xterm/debian)
Modified: branches/modular/app/xterm-210/debian/changelog
===================================================================
--- branches/modular/app/xterm/debian/changelog 2006-03-14 02:24:58 UTC (rev 1448)
+++ branches/modular/app/xterm-210/debian/changelog 2006-03-14 02:50:33 UTC (rev 1449)
@@ -1,3 +1,20 @@
+xterm (210-1) unstable; urgency=low
+
+ * New upstream release (the following are fixes immediately relevant to
+ Debian. More are in the upstream changelog)
+ + allow cursor to have the same color as foreground (text), since it is
+ rendered as reverse (closes: #350664)
+ + add TIOCSCTTY ioctl() ifdef'd for __GNU__ to set the controlling
+ terminal (closes: #348457)
+ + typo in manpage (closes: #351425)
+ + revert the XTerm.ad change from patch #208 (closes: #348384)
+ + add check to ensure that double-clicking to extend selection will not
+ extend it into the scrollback area. This still allows users to scroll
+ back and select text (closes: #347415)
+ * Remove the 01_stolen_from_HEAD patch, as it is now obsolete
+
+ -- David Nusinow <dnusinow@debian.org> Mon, 13 Mar 2006 21:26:15 -0500
+
xterm (208-3) unstable; urgency=low
* Install everything in /usr/bin, /etc/X11/app-defaults, and
Deleted: branches/modular/app/xterm-210/debian/patches/001_stolen_from_HEAD.diff
===================================================================
--- branches/modular/app/xterm/debian/patches/001_stolen_from_HEAD.diff 2006-03-14 02:24:58 UTC (rev 1448)
+++ branches/modular/app/xterm-210/debian/patches/001_stolen_from_HEAD.diff 2006-03-14 02:50:33 UTC (rev 1449)
@@ -1,153 +0,0 @@
-$Id$
-
-Update to last snapshot of xterm #209 in order to fix problems with enable_narrowproto
-in configure.
-
-It should be dropped when #209 see the light.
-
-Index: aclocal.m4
-===================================================================
---- aclocal.m4.orig 2006-01-09 08:09:20.212471697 +0100
-+++ aclocal.m4 2006-01-09 08:09:43.170032108 +0100
-@@ -1,4 +1,4 @@
--dnl $XTermId: aclocal.m4,v 1.211 2006/01/04 02:10:19 tom Exp $
-+dnl $XTermId: aclocal.m4,v 1.213 2006/01/08 22:07:48 tom Exp $
- dnl
- dnl $XFree86: xc/programs/xterm/aclocal.m4,v 3.61 2006/01/04 02:10:19 dickey Exp $
- dnl
-@@ -391,7 +391,7 @@
- CF_ARG_OPTION(narrowproto,
- [ --enable-narrowproto enable narrow prototypes for X libraries],
- [enable_narrowproto=$enableval],
-- [enable_narrowproto=$default_narrowproto],
-+ [enable_narrowproto=$cf_default_narrowproto],
- [$cf_default_narrowproto])
- AC_MSG_RESULT($enable_narrowproto)
- ])
-@@ -2251,7 +2251,7 @@
- AC_DEFINE_UNQUOTED($cf_x_athena_LIBS)
- ])
- dnl ---------------------------------------------------------------------------
--dnl CF_X_FREETYPE version: 13 updated: 2005/11/24 21:35:11
-+dnl CF_X_FREETYPE version: 14 updated: 2006/01/07 14:31:43
- dnl -------------
- dnl Check for X FreeType headers and libraries (XFree86 4.x, etc).
- dnl
-@@ -2271,7 +2271,7 @@
- FREETYPE_PARAMS=
-
- AC_PATH_PROG(FREETYPE_PKG_CONFIG, pkg-config, none)
--if test "$FREETYPE_PKG_CONFIG" != none; then
-+if test "$FREETYPE_PKG_CONFIG" != none && "$FREETYPE_PKG_CONFIG" --exists xft; then
- FREETYPE_CONFIG=$FREETYPE_PKG_CONFIG
- FREETYPE_PARAMS=xft
- else
-Index: charproc.c
-===================================================================
---- charproc.c.orig 2006-01-09 08:09:20.212471697 +0100
-+++ charproc.c 2006-01-09 08:09:43.190033468 +0100
-@@ -1,4 +1,4 @@
--/* $XTermId: charproc.c,v 1.633 2006/01/04 02:10:19 tom Exp $ */
-+/* $XTermId: charproc.c,v 1.634 2006/01/06 00:47:54 tom Exp $ */
-
- /*
- * $Xorg: charproc.c,v 1.6 2001/02/09 02:06:02 xorgcvs Exp $
-@@ -5731,7 +5731,9 @@
- #endif
- releaseCursorGCs(screen);
- releaseWindowGCs(w, &(screen->fullVwin));
-+#ifndef NO_ACTIVE_ICON
- releaseWindowGCs(w, &(screen->iconVwin));
-+#endif
-
- if (screen->fnt_bold != 0
- && screen->fnt_bold != screen->fnt_norm)
-Index: configure
-===================================================================
---- configure.orig 2006-01-09 08:09:20.208471425 +0100
-+++ configure 2006-01-09 08:09:43.202034283 +0100
-@@ -8457,11 +8457,11 @@
- if test "$enableval" != "$cf_default_narrowproto" ; then
- enable_narrowproto=$enableval
- else
-- enable_narrowproto=$default_narrowproto
-+ enable_narrowproto=$cf_default_narrowproto
- fi
- else
- enableval=$cf_default_narrowproto
-- enable_narrowproto=$default_narrowproto
-+ enable_narrowproto=$cf_default_narrowproto
-
- fi;
- echo "$as_me:8467: result: $enable_narrowproto" >&5
-@@ -9382,7 +9382,7 @@
- echo "${ECHO_T}no" >&6
- fi
-
--if test "$FREETYPE_PKG_CONFIG" != none; then
-+if test "$FREETYPE_PKG_CONFIG" != none && "$FREETYPE_PKG_CONFIG" --exists xft; then
- FREETYPE_CONFIG=$FREETYPE_PKG_CONFIG
- FREETYPE_PARAMS=xft
- else
-Index: version.h
-===================================================================
---- version.h.orig 2006-01-09 08:09:20.220472241 +0100
-+++ version.h 2006-01-09 08:10:34.461518359 +0100
-@@ -1,4 +1,4 @@
--/* $XTermId: version.h,v 1.256 2006/01/04 02:10:27 tom Exp $ */
-+/* $XTermId: version.h,v 1.257 2006/01/06 01:12:59 tom Exp $ */
- /* $XFree86: xc/programs/xterm/version.h,v 3.119 2006/01/04 02:10:27 dickey Exp $ */
-
- /*
-@@ -7,7 +7,7 @@
- * version of X to which this version of xterm has been built. The number in
- * parentheses is my patch number (T.Dickey).
- */
--#define XTERM_PATCH 208
-+#define XTERM_PATCH 209
-
- #ifndef __vendorversion__
- #define __vendorversion__ "XTerm"
-Index: xterm.log.html
-===================================================================
---- xterm.log.html.orig 2006-01-09 08:09:20.220472241 +0100
-+++ xterm.log.html 2006-01-09 08:09:43.218035371 +0100
-@@ -20,7 +20,7 @@
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF *
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. *
- *****************************************************************************
-- $XTermId: xterm.log.html,v 1.359 2006/01/04 02:10:27 tom Exp $
-+ $XTermId: xterm.log.html,v 1.362 2006/01/08 22:11:47 tom Exp $
- $XFree86: xc/programs/xterm/xterm.log.html,v 1.144 2006/01/04 02:10:27 dickey Exp $
- -->
- <HTML>
-@@ -46,6 +46,7 @@
- is the latest version of this file.
-
- <UL>
-+<LI><A HREF="#xterm_209">Patch #209 - 2006/1/?? - XFree86 4.5.99.19</A>
- <LI><A HREF="#xterm_208">Patch #208 - 2006/1/3 - XFree86 4.5.99.19</A>
- <LI><A HREF="#xterm_207">Patch #207 - 2005/11/13 - XFree86 4.5.99.16</A>
- <LI><A HREF="#xterm_206">Patch #206 - 2005/11/3 - XFree86 4.5.99.15</A>
-@@ -257,6 +258,21 @@
- <LI><A HREF="#xterm_01">Patch #1 - 1996/1/6</A>
- </UL>
-
-+<H1><A NAME="xterm_209">Patch #209 - 2006/1/?? - XFree86 4.5.99.19</A></H1>
-+<ul>
-+ <li>fix typo in configure script option
-+ <code>--disable-narrowproto</code>
-+ (report by David Martínez Moreno).
-+
-+ <li>amend CF_X_FREETYPE changes for <code>pkg-config</code> check to
-+ ensure that <code>Xft</code> is known to that tool (report and
-+ patch by Emanuele Giaquinta).
-+
-+ <li>add an ifdef to allow <code>./configure --disable-active-icon</code>
-+ to work, broken by new code for testing memory leaks in
-+ <a href="#xterm_208">patch #208</a> (report by Brian Lindholm).
-+</ul>
-+
- <H1><A NAME="xterm_208">Patch #208 - 2006/1/3 - XFree86 4.5.99.19</A></H1>
- <ul>
- <li>add <code>charClass</code> resource to <code>XTerm.ad</code> and
Modified: branches/modular/app/xterm-210/debian/patches/900_debian_xterm.diff
===================================================================
--- branches/modular/app/xterm/debian/patches/900_debian_xterm.diff 2006-03-14 02:24:58 UTC (rev 1448)
+++ branches/modular/app/xterm-210/debian/patches/900_debian_xterm.diff 2006-03-14 02:50:33 UTC (rev 1449)
@@ -25,9 +25,9 @@
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 @@
+--- termcap.orig 2006-03-13 21:25:38.000000000 -0500
++++ termcap 2006-03-13 21:43:11.000000000 -0500
+@@ -41,6 +41,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:
@@ -42,7 +42,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:
-@@ -205,5 +213,6 @@
+@@ -202,5 +210,6 @@
# is widely used for a variety of incompatible terminal emulations including
# color_xterm and rxvt.
v0|xterm|X11 terminal emulator:\
@@ -52,9 +52,9 @@
# :tc=xterm-r6:
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 @@
+--- terminfo.orig 2006-03-13 21:25:38.000000000 -0500
++++ terminfo 2006-03-13 21:43:11.000000000 -0500
+@@ -303,6 +303,13 @@
u8=\E[?1;2c,
u9=\E[c,
vpa=\E[%i%p1%dd,
@@ -68,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
-@@ -1008,5 +1015,6 @@
+@@ -1004,5 +1011,6 @@
# is widely used for a variety of incompatible terminal emulations including
# color_xterm and rxvt.
xterm|X11 terminal emulator,
@@ -78,9 +78,9 @@
# use=xterm-r6,
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 @@
+--- XTerm.ad.orig 2006-03-13 21:25:38.000000000 -0500
++++ XTerm.ad 2006-03-13 21:43:11.000000000 -0500
+@@ -115,6 +115,10 @@
*tek4014*font3: 6x13
*tek4014*fontSmall: 6x10
@@ -93,8 +93,8 @@
! at startup because it is needed to make the layout work for the menubar:
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
+--- XTerm-col.ad.orig 2006-03-13 21:25:38.000000000 -0500
++++ XTerm-col.ad 2006-03-13 21:43:11.000000000 -0500
@@ -7,9 +7,9 @@
*VT100*boldColors: on
*VT100*dynamicColors: on
Modified: branches/modular/app/xterm-210/debian/patches/901_xterm_manpage.diff
===================================================================
--- branches/modular/app/xterm/debian/patches/901_xterm_manpage.diff 2006-03-14 02:24:58 UTC (rev 1448)
+++ branches/modular/app/xterm-210/debian/patches/901_xterm_manpage.diff 2006-03-14 02:50:33 UTC (rev 1449)
@@ -8,9 +8,9 @@
Index: xterm.man
===================================================================
---- xterm.man.orig 2006-01-05 23:16:45.000000000 -0500
-+++ xterm.man 2006-01-05 23:20:50.000000000 -0500
-@@ -71,7 +71,7 @@
+--- xterm.man.orig 2006-03-13 21:25:38.000000000 -0500
++++ xterm.man 2006-03-13 21:43:18.000000000 -0500
+@@ -69,7 +69,7 @@
.sp
.in -4
..
@@ -19,7 +19,7 @@
.SH NAME
xterm \- terminal emulator for X
.SH SYNOPSIS
-@@ -4128,10 +4128,10 @@
+@@ -4219,10 +4219,10 @@
.SH FILES
The actual pathnames given may differ on your system.
.TP 5
Modified: branches/modular/app/xterm-210/debian/patches/series
===================================================================
--- branches/modular/app/xterm/debian/patches/series 2006-03-14 02:24:58 UTC (rev 1448)
+++ branches/modular/app/xterm-210/debian/patches/series 2006-03-14 02:50:33 UTC (rev 1449)
@@ -1,3 +1,2 @@
-001_stolen_from_HEAD.diff -p0
900_debian_xterm.diff -p0
901_xterm_manpage.diff -p0
Reply to: