X Strike Force X.Org X11 SVN commit: r3892 - in trunk/app/xterm/debian: . local patches
Author: julien
Date: 2006-10-23 18:07:11 -0400 (Mon, 23 Oct 2006)
New Revision: 3892
Modified:
trunk/app/xterm/debian/changelog
trunk/app/xterm/debian/local/KOI8RXTerm
trunk/app/xterm/debian/patches/900_debian_xterm.diff
trunk/app/xterm/debian/patches/901_xterm_manpage.diff
trunk/app/xterm/debian/patches/902_disallowWindowOps
trunk/app/xterm/debian/rules
Log:
* New upstream release
+ Refresh patches.
* Acknowledge NMU (thanks, Christoph!).
* Update KOI8RXTerm app-defaults, thanks to Thomas Dickey (closes: #384925).
* Configure with --enable-luit, again thanks to Thomas (closes: #381591).
Modified: trunk/app/xterm/debian/changelog
===================================================================
--- trunk/app/xterm/debian/changelog 2006-10-23 21:09:47 UTC (rev 3891)
+++ trunk/app/xterm/debian/changelog 2006-10-23 22:07:11 UTC (rev 3892)
@@ -1,3 +1,13 @@
+xterm (222-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ + Refresh patches.
+ * Acknowledge NMU (thanks, Christoph!).
+ * Update KOI8RXTerm app-defaults, thanks to Thomas Dickey (closes: #384925).
+ * Configure with --enable-luit, again thanks to Thomas (closes: #381591).
+
+ -- Julien Cristau <julien.cristau@ens-lyon.org> Tue, 24 Oct 2006 00:06:04 +0200
+
xterm (210-3.1) unstable; urgency=high
* Non-maintainer upload.
Modified: trunk/app/xterm/debian/local/KOI8RXTerm
===================================================================
--- trunk/app/xterm/debian/local/KOI8RXTerm 2006-10-23 21:09:47 UTC (rev 3891)
+++ trunk/app/xterm/debian/local/KOI8RXTerm 2006-10-23 22:07:11 UTC (rev 3892)
@@ -12,9 +12,9 @@
*VT100*allowC1Printable: true
! Use Cyrillic instead of Latin fonts.
-*VT100*font: -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-koi8-r
-*VT100*font2: -misc-fixed-medium-r-normal--8-80-75-75-c-50-koi8-r
-*VT100*font3: -misc-fixed-medium-r-normal--14-130-75-75-c-70-koi8-r
-*VT100*font4: -misc-fixed-medium-r-normal--13-120-75-75-c-80-koi8-r
-*VT100*font5: -misc-fixed-medium-r-normal--18-120-100-100-c-90-koi8-r
-*VT100*font6: -misc-fixed-medium-r-normal--20-200-75-75-c-100-koi8-r
+*VT100.font: -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-koi8-r
+*VT100.font2: -misc-fixed-medium-r-normal--8-80-75-75-c-50-koi8-r
+*VT100.font3: -misc-fixed-medium-r-normal--14-130-75-75-c-70-koi8-r
+*VT100.font4: -misc-fixed-medium-r-normal--13-120-75-75-c-80-koi8-r
+*VT100.font5: -misc-fixed-medium-r-normal--18-120-100-100-c-90-koi8-r
+*VT100.font6: -misc-fixed-medium-r-normal--20-200-75-75-c-100-koi8-r
Modified: trunk/app/xterm/debian/patches/900_debian_xterm.diff
===================================================================
--- trunk/app/xterm/debian/patches/900_debian_xterm.diff 2006-10-23 21:09:47 UTC (rev 3891)
+++ trunk/app/xterm/debian/patches/900_debian_xterm.diff 2006-10-23 22:07:11 UTC (rev 3892)
@@ -25,9 +25,9 @@
Index: termcap
===================================================================
---- termcap.orig 2006-03-13 21:25:38.000000000 -0500
-+++ termcap 2006-03-13 21:43:11.000000000 -0500
-@@ -41,6 +41,14 @@
+--- termcap.orig 2006-10-23 22:34:40.000000000 +0200
++++ termcap 2006-10-23 23:56:58.000000000 +0200
+@@ -73,6 +73,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:
-@@ -202,5 +210,6 @@
+@@ -234,5 +242,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 2006-03-13 21:25:38.000000000 -0500
-+++ terminfo 2006-03-13 21:43:11.000000000 -0500
-@@ -303,6 +303,13 @@
+--- terminfo.orig 2006-10-23 22:34:19.000000000 +0200
++++ terminfo 2006-10-23 23:56:58.000000000 +0200
+@@ -823,6 +823,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
-@@ -1004,5 +1011,6 @@
+@@ -1602,5 +1609,6 @@
# is widely used for a variety of incompatible terminal emulations including
# color_xterm and rxvt.
xterm|X11 terminal emulator,
@@ -78,8 +78,8 @@
# use=xterm-r6,
Index: XTerm.ad
===================================================================
---- XTerm.ad.orig 2006-03-13 21:25:38.000000000 -0500
-+++ XTerm.ad 2006-03-13 21:43:11.000000000 -0500
+--- XTerm.ad.orig 2006-10-23 22:34:18.000000000 +0200
++++ XTerm.ad 2006-10-23 23:56:58.000000000 +0200
@@ -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 2006-03-13 21:25:38.000000000 -0500
-+++ XTerm-col.ad 2006-03-13 21:43:11.000000000 -0500
+--- XTerm-col.ad.orig 2006-10-23 22:34:22.000000000 +0200
++++ XTerm-col.ad 2006-10-23 23:56:58.000000000 +0200
@@ -7,9 +7,9 @@
*VT100*boldColors: on
*VT100*dynamicColors: on
@@ -108,9 +108,9 @@
! - OR -
! Uncomment this for black text on a "white" background.
-@@ -111,20 +111,32 @@
- *.Form.menubar.*.foreground: gray15
- *.Form.background: AntiqueWhite
+@@ -114,20 +114,32 @@
+ *Form.background: AntiqueWhite
+ *form.background: AntiqueWhite
+*mainMenu*background: AntiqueWhite
+*mainMenu*foreground: gray15
Modified: trunk/app/xterm/debian/patches/901_xterm_manpage.diff
===================================================================
--- trunk/app/xterm/debian/patches/901_xterm_manpage.diff 2006-10-23 21:09:47 UTC (rev 3891)
+++ trunk/app/xterm/debian/patches/901_xterm_manpage.diff 2006-10-23 22:07:11 UTC (rev 3892)
@@ -8,8 +8,8 @@
Index: xterm.man
===================================================================
---- xterm.man.orig 2006-03-13 21:25:38.000000000 -0500
-+++ xterm.man 2006-03-13 21:43:18.000000000 -0500
+--- xterm.man.orig 2006-10-23 22:34:32.000000000 +0200
++++ xterm.man 2006-10-23 23:57:04.000000000 +0200
@@ -69,7 +69,7 @@
.sp
.in -4
@@ -19,7 +19,7 @@
.SH NAME
xterm \- terminal emulator for X
.SH SYNOPSIS
-@@ -4219,10 +4219,10 @@
+@@ -4368,10 +4368,10 @@
.SH FILES
The actual pathnames given may differ on your system.
.TP 5
Modified: trunk/app/xterm/debian/patches/902_disallowWindowOps
===================================================================
--- trunk/app/xterm/debian/patches/902_disallowWindowOps 2006-10-23 21:09:47 UTC (rev 3891)
+++ trunk/app/xterm/debian/patches/902_disallowWindowOps 2006-10-23 22:07:11 UTC (rev 3892)
@@ -5,6 +5,6 @@
@@ -190,3 +190,5 @@
!
! Alternatively,
- !*on2Clicks: regex [[:alpha:]]+://([[:alnum:]!#+,./=?@~-]|(%[[:xdigit:]][[:xdigit:]]))+
+ !*on2Clicks: regex [[:alpha:]]+://([[:alnum:]!#+,./=?@_~-]|(%[[:xdigit:]][[:xdigit:]]))+
+
+*allowWindowOps: false
Modified: trunk/app/xterm/debian/rules
===================================================================
--- trunk/app/xterm/debian/rules 2006-10-23 21:09:47 UTC (rev 3891)
+++ trunk/app/xterm/debian/rules 2006-10-23 22:07:11 UTC (rev 3892)
@@ -85,10 +85,11 @@
configure: $(STAMP_DIR)/patch $(STAMP_DIR)/configure
$(STAMP_DIR)/configure: $(STAMP_DIR)/patch
dh_testdir
- ./configure --enable-logging --enable-wide-chars --enable-256-color \
- --prefix=/usr --exec-prefix=/usr --mandir=/usr/share/man \
- --with-app-defaults=/etc/X11/app-defaults \
- --disable-imake --enable-narrowproto
+ ./configure --enable-logging --enable-wide-chars --enable-luit \
+ --enable-256-color \
+ --prefix=/usr --exec-prefix=/usr --mandir=/usr/share/man \
+ --with-app-defaults=/etc/X11/app-defaults \
+ --disable-imake --enable-narrowproto
touch $@
Reply to: