Author: branden Date: 2004-12-19 23:01:46 -0500 (Sun, 19 Dec 2004) New Revision: 2101
Added: trunk/debian/local/lxterm trunk/debian/local/lxterm.1x Modified: trunk/debian/CHANGESETS trunk/debian/MANIFEST.alpha.in trunk/debian/MANIFEST.amd64.in trunk/debian/MANIFEST.arm.in trunk/debian/MANIFEST.hppa.in trunk/debian/MANIFEST.hurd-i386.in trunk/debian/MANIFEST.i386.in trunk/debian/MANIFEST.ia64.in trunk/debian/MANIFEST.m68k.in trunk/debian/MANIFEST.mips.in trunk/debian/MANIFEST.mipsel.in trunk/debian/MANIFEST.powerpc.in trunk/debian/MANIFEST.s390.in trunk/debian/MANIFEST.sparc.in trunk/debian/TODO trunk/debian/changelog trunk/debian/control trunk/debian/rules trunk/debian/xterm.install trunk/debian/xterm.postinst.in trunk/debian/xterm.prerm.in Log: Implement lxterm, a simple wrapper that chooses whether to launch xterm, koi8rxterm, or uxterm based on the output of "locale charmap". Ship script and manual page. Update MANIFEST files. Update xterm's package description. Register lxterm as an x-terminal emulator alternative, giving it a priority of 30. Lower uxterm's alternative priority to 20. Deregister lxterm as an alternative when the package is removed. (Closes: #279252) Modified: trunk/debian/CHANGESETS =================================================================== --- trunk/debian/CHANGESETS 2004-12-20 03:55:31 UTC (rev 2100) +++ trunk/debian/CHANGESETS 2004-12-20 04:01:46 UTC (rev 2101) @@ -34,4 +34,13 @@ Expand and update uxterm(1x) manual page. 2097 +Implement lxterm, a simple wrapper that chooses whether to launch xterm, +koi8rxterm, or uxterm based on the output of "locale charmap". Ship +script and manual page. Update MANIFEST files. Update xterm's package +description. Register lxterm as an x-terminal emulator alternative, +giving it a priority of 30. Lower uxterm's alternative priority to 20. +Deregister lxterm as an alternative when the package is removed. +(Closes: #279252) + 2101 + vim:set ai et sts=4 sw=4 tw=80: Modified: trunk/debian/MANIFEST.alpha.in =================================================================== --- trunk/debian/MANIFEST.alpha.in 2004-12-20 03:55:31 UTC (rev 2100) +++ trunk/debian/MANIFEST.alpha.in 2004-12-20 04:01:46 UTC (rev 2101) @@ -472,6 +472,7 @@ usr/X11R6/bin/listres usr/X11R6/bin/lndir usr/X11R6/bin/luit +usr/X11R6/bin/lxterm usr/X11R6/bin/makedepend usr/X11R6/bin/makeg usr/X11R6/bin/makepsres @@ -1679,6 +1680,7 @@ usr/X11R6/man/man1/listres.1x usr/X11R6/man/man1/lndir.1x usr/X11R6/man/man1/luit.1x +usr/X11R6/man/man1/lxterm.1x usr/X11R6/man/man1/makedepend.1x usr/X11R6/man/man1/makeg.1x usr/X11R6/man/man1/makepsres.1x Modified: trunk/debian/MANIFEST.amd64.in =================================================================== --- trunk/debian/MANIFEST.amd64.in 2004-12-20 03:55:31 UTC (rev 2100) +++ trunk/debian/MANIFEST.amd64.in 2004-12-20 04:01:46 UTC (rev 2101) @@ -472,6 +472,7 @@ usr/X11R6/bin/listres usr/X11R6/bin/lndir usr/X11R6/bin/luit +usr/X11R6/bin/lxterm usr/X11R6/bin/makedepend usr/X11R6/bin/makeg usr/X11R6/bin/makepsres @@ -1692,6 +1693,7 @@ usr/X11R6/man/man1/listres.1x usr/X11R6/man/man1/lndir.1x usr/X11R6/man/man1/luit.1x +usr/X11R6/man/man1/lxterm.1x usr/X11R6/man/man1/makedepend.1x usr/X11R6/man/man1/makeg.1x usr/X11R6/man/man1/makepsres.1x Modified: trunk/debian/MANIFEST.arm.in =================================================================== --- trunk/debian/MANIFEST.arm.in 2004-12-20 03:55:31 UTC (rev 2100) +++ trunk/debian/MANIFEST.arm.in 2004-12-20 04:01:46 UTC (rev 2101) @@ -471,6 +471,7 @@ usr/X11R6/bin/listres usr/X11R6/bin/lndir usr/X11R6/bin/luit +usr/X11R6/bin/lxterm usr/X11R6/bin/makedepend usr/X11R6/bin/makeg usr/X11R6/bin/makepsres @@ -1668,6 +1669,7 @@ usr/X11R6/man/man1/listres.1x usr/X11R6/man/man1/lndir.1x usr/X11R6/man/man1/luit.1x +usr/X11R6/man/man1/lxterm.1x usr/X11R6/man/man1/makedepend.1x usr/X11R6/man/man1/makeg.1x usr/X11R6/man/man1/makepsres.1x Modified: trunk/debian/MANIFEST.hppa.in =================================================================== --- trunk/debian/MANIFEST.hppa.in 2004-12-20 03:55:31 UTC (rev 2100) +++ trunk/debian/MANIFEST.hppa.in 2004-12-20 04:01:46 UTC (rev 2101) @@ -471,6 +471,7 @@ usr/X11R6/bin/listres usr/X11R6/bin/lndir usr/X11R6/bin/luit +usr/X11R6/bin/lxterm usr/X11R6/bin/makedepend usr/X11R6/bin/makeg usr/X11R6/bin/makepsres @@ -1561,6 +1562,7 @@ usr/X11R6/man/man1/listres.1x usr/X11R6/man/man1/lndir.1x usr/X11R6/man/man1/luit.1x +usr/X11R6/man/man1/lxterm.1x usr/X11R6/man/man1/makedepend.1x usr/X11R6/man/man1/makeg.1x usr/X11R6/man/man1/makepsres.1x Modified: trunk/debian/MANIFEST.hurd-i386.in =================================================================== --- trunk/debian/MANIFEST.hurd-i386.in 2004-12-20 03:55:31 UTC (rev 2100) +++ trunk/debian/MANIFEST.hurd-i386.in 2004-12-20 04:01:46 UTC (rev 2101) @@ -472,6 +472,7 @@ usr/X11R6/bin/listres usr/X11R6/bin/lndir usr/X11R6/bin/luit +usr/X11R6/bin/lxterm usr/X11R6/bin/makedepend usr/X11R6/bin/makeg usr/X11R6/bin/makepsres @@ -1688,6 +1689,7 @@ usr/X11R6/man/man1/listres.1x usr/X11R6/man/man1/lndir.1x usr/X11R6/man/man1/luit.1x +usr/X11R6/man/man1/lxterm.1x usr/X11R6/man/man1/makedepend.1x usr/X11R6/man/man1/makeg.1x usr/X11R6/man/man1/makepsres.1x Modified: trunk/debian/MANIFEST.i386.in =================================================================== --- trunk/debian/MANIFEST.i386.in 2004-12-20 03:55:31 UTC (rev 2100) +++ trunk/debian/MANIFEST.i386.in 2004-12-20 04:01:46 UTC (rev 2101) @@ -472,6 +472,7 @@ usr/X11R6/bin/listres usr/X11R6/bin/lndir usr/X11R6/bin/luit +usr/X11R6/bin/lxterm usr/X11R6/bin/makedepend usr/X11R6/bin/makeg usr/X11R6/bin/makepsres @@ -1705,6 +1706,7 @@ usr/X11R6/man/man1/listres.1x usr/X11R6/man/man1/lndir.1x usr/X11R6/man/man1/luit.1x +usr/X11R6/man/man1/lxterm.1x usr/X11R6/man/man1/makedepend.1x usr/X11R6/man/man1/makeg.1x usr/X11R6/man/man1/makepsres.1x Modified: trunk/debian/MANIFEST.ia64.in =================================================================== --- trunk/debian/MANIFEST.ia64.in 2004-12-20 03:55:31 UTC (rev 2100) +++ trunk/debian/MANIFEST.ia64.in 2004-12-20 04:01:46 UTC (rev 2101) @@ -472,6 +472,7 @@ usr/X11R6/bin/listres usr/X11R6/bin/lndir usr/X11R6/bin/luit +usr/X11R6/bin/lxterm usr/X11R6/bin/makedepend usr/X11R6/bin/makeg usr/X11R6/bin/makepsres @@ -1701,6 +1702,7 @@ usr/X11R6/man/man1/listres.1x usr/X11R6/man/man1/lndir.1x usr/X11R6/man/man1/luit.1x +usr/X11R6/man/man1/lxterm.1x usr/X11R6/man/man1/makedepend.1x usr/X11R6/man/man1/makeg.1x usr/X11R6/man/man1/makepsres.1x Modified: trunk/debian/MANIFEST.m68k.in =================================================================== --- trunk/debian/MANIFEST.m68k.in 2004-12-20 03:55:31 UTC (rev 2100) +++ trunk/debian/MANIFEST.m68k.in 2004-12-20 04:01:46 UTC (rev 2101) @@ -471,6 +471,7 @@ usr/X11R6/bin/listres usr/X11R6/bin/lndir usr/X11R6/bin/luit +usr/X11R6/bin/lxterm usr/X11R6/bin/makedepend usr/X11R6/bin/makeg usr/X11R6/bin/makepsres @@ -1670,6 +1671,7 @@ usr/X11R6/man/man1/listres.1x usr/X11R6/man/man1/lndir.1x usr/X11R6/man/man1/luit.1x +usr/X11R6/man/man1/lxterm.1x usr/X11R6/man/man1/makedepend.1x usr/X11R6/man/man1/makeg.1x usr/X11R6/man/man1/makepsres.1x Modified: trunk/debian/MANIFEST.mips.in =================================================================== --- trunk/debian/MANIFEST.mips.in 2004-12-20 03:55:31 UTC (rev 2100) +++ trunk/debian/MANIFEST.mips.in 2004-12-20 04:01:46 UTC (rev 2101) @@ -471,6 +471,7 @@ usr/X11R6/bin/listres usr/X11R6/bin/lndir usr/X11R6/bin/luit +usr/X11R6/bin/lxterm usr/X11R6/bin/makedepend usr/X11R6/bin/makeg usr/X11R6/bin/makepsres @@ -1562,6 +1563,7 @@ usr/X11R6/man/man1/listres.1x usr/X11R6/man/man1/lndir.1x usr/X11R6/man/man1/luit.1x +usr/X11R6/man/man1/lxterm.1x usr/X11R6/man/man1/makedepend.1x usr/X11R6/man/man1/makeg.1x usr/X11R6/man/man1/makepsres.1x Modified: trunk/debian/MANIFEST.mipsel.in =================================================================== --- trunk/debian/MANIFEST.mipsel.in 2004-12-20 03:55:31 UTC (rev 2100) +++ trunk/debian/MANIFEST.mipsel.in 2004-12-20 04:01:46 UTC (rev 2101) @@ -471,6 +471,7 @@ usr/X11R6/bin/listres usr/X11R6/bin/lndir usr/X11R6/bin/luit +usr/X11R6/bin/lxterm usr/X11R6/bin/makedepend usr/X11R6/bin/makeg usr/X11R6/bin/makepsres @@ -1562,6 +1563,7 @@ usr/X11R6/man/man1/listres.1x usr/X11R6/man/man1/lndir.1x usr/X11R6/man/man1/luit.1x +usr/X11R6/man/man1/lxterm.1x usr/X11R6/man/man1/makedepend.1x usr/X11R6/man/man1/makeg.1x usr/X11R6/man/man1/makepsres.1x Modified: trunk/debian/MANIFEST.powerpc.in =================================================================== --- trunk/debian/MANIFEST.powerpc.in 2004-12-20 03:55:31 UTC (rev 2100) +++ trunk/debian/MANIFEST.powerpc.in 2004-12-20 04:01:46 UTC (rev 2101) @@ -471,6 +471,7 @@ usr/X11R6/bin/listres usr/X11R6/bin/lndir usr/X11R6/bin/luit +usr/X11R6/bin/lxterm usr/X11R6/bin/makedepend usr/X11R6/bin/makeg usr/X11R6/bin/makepsres @@ -1677,6 +1678,7 @@ usr/X11R6/man/man1/listres.1x usr/X11R6/man/man1/lndir.1x usr/X11R6/man/man1/luit.1x +usr/X11R6/man/man1/lxterm.1x usr/X11R6/man/man1/makedepend.1x usr/X11R6/man/man1/makeg.1x usr/X11R6/man/man1/makepsres.1x Modified: trunk/debian/MANIFEST.s390.in =================================================================== --- trunk/debian/MANIFEST.s390.in 2004-12-20 03:55:31 UTC (rev 2100) +++ trunk/debian/MANIFEST.s390.in 2004-12-20 04:01:46 UTC (rev 2101) @@ -463,6 +463,7 @@ usr/X11R6/bin/listres usr/X11R6/bin/lndir usr/X11R6/bin/luit +usr/X11R6/bin/lxterm usr/X11R6/bin/makedepend usr/X11R6/bin/makeg usr/X11R6/bin/makepsres @@ -1487,6 +1488,7 @@ usr/X11R6/man/man1/listres.1x usr/X11R6/man/man1/lndir.1x usr/X11R6/man/man1/luit.1x +usr/X11R6/man/man1/lxterm.1x usr/X11R6/man/man1/makedepend.1x usr/X11R6/man/man1/makeg.1x usr/X11R6/man/man1/makepsres.1x Modified: trunk/debian/MANIFEST.sparc.in =================================================================== --- trunk/debian/MANIFEST.sparc.in 2004-12-20 03:55:31 UTC (rev 2100) +++ trunk/debian/MANIFEST.sparc.in 2004-12-20 04:01:46 UTC (rev 2101) @@ -471,6 +471,7 @@ usr/X11R6/bin/listres usr/X11R6/bin/lndir usr/X11R6/bin/luit +usr/X11R6/bin/lxterm usr/X11R6/bin/makedepend usr/X11R6/bin/makeg usr/X11R6/bin/makepsres @@ -1690,6 +1691,7 @@ usr/X11R6/man/man1/listres.1x usr/X11R6/man/man1/lndir.1x usr/X11R6/man/man1/luit.1x +usr/X11R6/man/man1/lxterm.1x usr/X11R6/man/man1/makedepend.1x usr/X11R6/man/man1/makeg.1x usr/X11R6/man/man1/makepsres.1x Modified: trunk/debian/TODO =================================================================== --- trunk/debian/TODO 2004-12-20 03:55:31 UTC (rev 2100) +++ trunk/debian/TODO 2004-12-20 04:01:46 UTC (rev 2101) @@ -55,8 +55,6 @@ * #261163: xlibs: <KPDL> mapping wrong in Polish layouts [patch available] * #255011: add macintosh/ca symbols file; awaiting keyboard photograph and test cycle with [EMAIL PROTECTED] -* #279252: xterm: write lxterm and koi8rxterm scripts and make lxterm the - highest-priority x-terminal-emulator Post 4.3.0-1 ------------ Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2004-12-20 03:55:31 UTC (rev 2100) +++ trunk/debian/changelog 2004-12-20 04:01:46 UTC (rev 2101) @@ -25,8 +25,16 @@ same as xterm itself). Deregister koi8rxterm as alternative when the package is removed. (Closes: #173565) - -- Branden Robinson <[EMAIL PROTECTED]> Sun, 19 Dec 2004 19:46:39 -0500 + * Implement lxterm, a simple wrapper that chooses whether to launch xterm, + koi8rxterm, or uxterm based on the output of "locale charmap". Ship + script and manual page. Update MANIFEST files. Update xterm's package + description. Register lxterm as an x-terminal emulator alternative, + giving it a priority of 30. Lower uxterm's alternative priority to 20. + Deregister lxterm as an alternative when the package is removed. + (Closes: #279252) + -- Branden Robinson <[EMAIL PROTECTED]> Sun, 19 Dec 2004 22:59:02 -0500 + xfree86 (4.3.0.dfsg.1-10) unstable; urgency=medium * Upload urgency set to medium due to fix for stable-release-critical bugs Modified: trunk/debian/control =================================================================== --- trunk/debian/control 2004-12-20 03:55:31 UTC (rev 2100) +++ trunk/debian/control 2004-12-20 04:01:46 UTC (rev 2101) @@ -1729,12 +1729,13 @@ window system directly. This version implements ISO/ANSI colors and most of the control sequences used by DEC VT220 terminals. . - This package provides three commands: xterm, which is the traditional + This package provides four commands: xterm, which is the traditional terminal emulator; uxterm, which is a wrapper around xterm that is intelligent about locale settings (especially those which use the UTF-8 character encoding), but which requires the luit program from the xutils - package; and koi8rxterm, a wrapper similar to uxterm for locales that use the - KOI8-R character set. + package; koi8rxterm, a wrapper similar to uxterm for locales that use the + KOI8-R character set; and lxterm, a simple wrapper that chooses which of the + previous commands to execute based on the user's locale settings. . A complete list of control sequences supported by the X terminal emulator is provided in /usr/share/doc/xterm. Added: trunk/debian/local/lxterm =================================================================== --- trunk/debian/local/lxterm 2004-12-20 03:55:31 UTC (rev 2100) +++ trunk/debian/local/lxterm 2004-12-20 04:01:46 UTC (rev 2101) @@ -0,0 +1,30 @@ +#!/bin/sh + +# $Id$ + +PROGNAME=${0##*/} + +die () { + echo "$PROGNAME: fatal error: $*" >&2 + exit 1 +} + +if ! which locale >/dev/null 2>&1; then + die "required program \"locale\" not available" +fi + +case "$(locale charmap)" in + KOI8-R) + XTERM=koi8rxterm + ;; + UTF-8) + XTERM=uxterm + ;; + *) + XTERM=xterm + ;; +esac + +exec "$XTERM" "$@" + +# vim:set ai et sts=4 sw=4 tw=80: Property changes on: trunk/debian/local/lxterm ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Added: trunk/debian/local/lxterm.1x =================================================================== --- trunk/debian/local/lxterm.1x 2004-12-20 03:55:31 UTC (rev 2100) +++ trunk/debian/local/lxterm.1x 2004-12-20 04:01:46 UTC (rev 2101) @@ -0,0 +1,55 @@ +.\" $Id$ +.\" +.TH lxterm 1x "2004-12-19" "Debian Project" +.SH NAME +lxterm \- locale\-sensitive wrapper for xterm +.SH SYNOPSIS +.B lxterm +[ +.I xterm-options +] +.SH DESCRIPTION +.B lxterm +is a wrapper around the +.BR xterm (1) +program that invokes +.BR xterm , +.BR koi8rxterm (1x), +or +.BR uxterm (1x) +as appropriate, based on the user's locale setting. +All arguments to +.B lxterm +are passed to +.B xterm +without processing; the +.BR \-class , +.BR \-k8 , +and +.B \-u8 +options should not be specified because they are used by +.B koi8rxterm +and +.BR uxterm . +See the +.B xterm +manual page for more information on +.IR xterm-options . +.PP +The +.BR locale (1) +utility is used to determine the character set used by the current locale. +If the character set is UTF-8, +.B uxterm +is invoked; if the character set is KOI8-R, +.B koi8rxtem +is invoked; otherwise, \(oqplain\(cq +.B xterm +is invoked. +.SH AUTHOR +Branden Robinson +.SH "SEE ALSO" +.BR locale (1), +.BR koi8rxterm (1x), +.BR uxterm (1x), +.BR xterm (1) Property changes on: trunk/debian/local/lxterm.1x ___________________________________________________________________ Name: svn:keywords + Id Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2004-12-20 03:55:31 UTC (rev 2100) +++ trunk/debian/rules 2004-12-20 04:01:46 UTC (rev 2101) @@ -337,6 +337,9 @@ install -m 644 debian/local/Xresources/xbase-clients $(DEBTREEDIR)/etc/X11/Xresources/xbase-clients install -m 755 -d $(DEBTREEDIR)/etc/X11/Xsession.d install -m 644 debian/local/Xsession.d/* $(DEBTREEDIR)/etc/X11/Xsession.d + # Install lxterm command and manual page. + install -m 755 debian/local/lxterm $(DEBTREEDIR)/usr/X11R6/bin + install -m 755 debian/local/lxterm.1x $(DEBTREEDIR)/usr/X11R6/man/man1 # Install koi8rxterm command, manual page, and app-defaults file. install -m 755 debian/local/koi8rxterm $(DEBTREEDIR)/usr/X11R6/bin install -m 755 debian/local/koi8rxterm.1x $(DEBTREEDIR)/usr/X11R6/man/man1 Modified: trunk/debian/xterm.install =================================================================== --- trunk/debian/xterm.install 2004-12-20 03:55:31 UTC (rev 2100) +++ trunk/debian/xterm.install 2004-12-20 04:01:46 UTC (rev 2101) @@ -3,8 +3,10 @@ etc/X11/app-defaults/XTerm etc/X11/app-defaults/XTerm-color usr/X11R6/bin/koi8rxterm +usr/X11R6/bin/lxterm usr/X11R6/bin/uxterm usr/X11R6/bin/xterm usr/X11R6/man/man1/koi8rxterm.1x +usr/X11R6/man/man1/lxterm.1x usr/X11R6/man/man1/uxterm.1x usr/X11R6/man/man1/xterm.1x Modified: trunk/debian/xterm.postinst.in =================================================================== --- trunk/debian/xterm.postinst.in 2004-12-20 03:55:31 UTC (rev 2100) +++ trunk/debian/xterm.postinst.in 2004-12-20 04:01:46 UTC (rev 2101) @@ -20,14 +20,19 @@ /usr/X11R6/man/man1/koi8rxterm.1x.gz update-alternatives --install /usr/bin/x-terminal-emulator \ + x-terminal-emulator /usr/X11R6/bin/uxterm 20 --slave \ + /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz \ + /usr/X11R6/man/man1/uxterm.1x.gz + +update-alternatives --install /usr/bin/x-terminal-emulator \ x-terminal-emulator /usr/X11R6/bin/xterm 20 --slave \ /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz \ /usr/X11R6/man/man1/xterm.1x.gz update-alternatives --install /usr/bin/x-terminal-emulator \ - x-terminal-emulator /usr/X11R6/bin/uxterm 30 --slave \ + x-terminal-emulator /usr/X11R6/bin/lxterm 30 --slave \ /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz \ - /usr/X11R6/man/man1/uxterm.1x.gz + /usr/X11R6/man/man1/lxterm.1x.gz #DEBHELPER# Modified: trunk/debian/xterm.prerm.in =================================================================== --- trunk/debian/xterm.prerm.in 2004-12-20 03:55:31 UTC (rev 2100) +++ trunk/debian/xterm.prerm.in 2004-12-20 04:01:46 UTC (rev 2101) @@ -18,6 +18,7 @@ update-alternatives --remove x-terminal-emulator /usr/X11R6/bin/koi8rxterm update-alternatives --remove x-terminal-emulator /usr/X11R6/bin/uxterm update-alternatives --remove x-terminal-emulator /usr/X11R6/bin/xterm + update-alternatives --remove x-terminal-emulator /usr/X11R6/bin/lxterm fi #DEBHELPER#