Author: julien Date: 2006-11-08 00:45:57 -0500 (Wed, 08 Nov 2006) New Revision: 3971
Modified: trunk/app/xterm/debian/NEWS trunk/app/xterm/debian/README trunk/app/xterm/debian/changelog trunk/app/xterm/debian/copyright trunk/app/xterm/debian/local/KOI8RXTerm trunk/app/xterm/debian/local/koi8rxterm trunk/app/xterm/debian/local/koi8rxterm.1 trunk/app/xterm/debian/local/lxterm trunk/app/xterm/debian/local/lxterm.1 trunk/app/xterm/debian/local/uxterm.1 trunk/app/xterm/debian/local/xterm.faq.html trunk/app/xterm/debian/rules trunk/app/xterm/debian/xterm.README.Debian trunk/app/xterm/debian/xterm.doc-base trunk/app/xterm/debian/xterm.docs trunk/app/xterm/debian/xterm.menu trunk/app/xterm/debian/xterm.postinst trunk/app/xterm/debian/xterm.preinst trunk/app/xterm/debian/xterm.prerm Log: Merge r2616:2622 from branches/7.1/ (for some reason, this had never been merged into trunk before now) Modified: trunk/app/xterm/debian/NEWS =================================================================== --- trunk/app/xterm/debian/NEWS 2006-11-08 04:29:13 UTC (rev 3970) +++ trunk/app/xterm/debian/NEWS 2006-11-08 05:45:57 UTC (rev 3971) @@ -15,4 +15,4 @@ $Id$ -# vim:set ai et sts=2 sw=2 tw=78: +# vim:set ai et sw=2 ts=2 tw=78: Property changes on: trunk/app/xterm/debian/NEWS ___________________________________________________________________ Name: svn:keywords + Id Modified: trunk/app/xterm/debian/README =================================================================== --- trunk/app/xterm/debian/README 2006-11-08 04:29:13 UTC (rev 3970) +++ trunk/app/xterm/debian/README 2006-11-08 05:45:57 UTC (rev 3971) @@ -93,4 +93,4 @@ This contains Debian-specific programs and documentation that we include in our xterm binary packages; for instance, our UTF-8 wrapper. -vim:set ai et sw=2 sts=2 tw=80: +vim:set ai et sw=2 ts=2 tw=80: Property changes on: trunk/app/xterm/debian/README ___________________________________________________________________ Name: svn:keywords + Id Modified: trunk/app/xterm/debian/changelog =================================================================== --- trunk/app/xterm/debian/changelog 2006-11-08 04:29:13 UTC (rev 3970) +++ trunk/app/xterm/debian/changelog 2006-11-08 05:45:57 UTC (rev 3971) @@ -6,8 +6,10 @@ path caused, and make sure that the x-terminal-emulator.1.gz link in /usr/share/man/man1/ is still there. If it disappeared, we add it in postinst. Thanks to Vincent Lefevre and Joey Hess (closes: #349462). + * Merge changes by Branden Robinson from the 7.1 branch (on xterm 215). + Therefore, this upload closes: #301173. - -- Julien Cristau <[EMAIL PROTECTED]> Wed, 8 Nov 2006 05:12:34 +0100 + -- Julien Cristau <[EMAIL PROTECTED]> Wed, 8 Nov 2006 06:33:08 +0100 xterm (222-1) unstable; urgency=low @@ -33,6 +35,19 @@ -- Christoph Berg <[EMAIL PROTECTED]> Fri, 15 Sep 2006 16:18:06 +0200 +xterm (215-1) unstable; urgency=low + + * Merge upstream release Patch #215 (released 2006-06-19). + * Ship "Xterm Control Sequences" document again, in both GNU Roff and plain + text formats, and register the latter with doc-base. (The former is + easily viewable in a terminal with "groff -Tutf8 ctlseqs.ms | more", so it + seems useful.) (Closes: #301173) + * Update copy of XTerm FAQ to revision 1.90 (dated 2005-11-02). + * Resync koi8rxterm script with recent upstream changes to uxterm, upon + which it is based. + + -- Branden Robinson <[EMAIL PROTECTED]> Tue, 1 Aug 2006 12:42:13 -0400 + xterm (210-3) unstable; urgency=low * Depend on xbitmaps rather than xlibs-data. Property changes on: trunk/app/xterm/debian/copyright ___________________________________________________________________ Name: svn:keywords + Id Modified: trunk/app/xterm/debian/local/KOI8RXTerm =================================================================== --- trunk/app/xterm/debian/local/KOI8RXTerm 2006-11-08 04:29:13 UTC (rev 3970) +++ trunk/app/xterm/debian/local/KOI8RXTerm 2006-11-08 05:45:57 UTC (rev 3971) @@ -1,4 +1,4 @@ -! $Id: KOI8RXTerm 189 2005-06-11 00:04:27Z branden $ +! $Id$ ! This is based on the UXTerm app-defaults file by Thomas Dickey. Property changes on: trunk/app/xterm/debian/local/KOI8RXTerm ___________________________________________________________________ Name: svn:keywords + Id Modified: trunk/app/xterm/debian/local/koi8rxterm =================================================================== --- trunk/app/xterm/debian/local/koi8rxterm 2006-11-08 04:29:13 UTC (rev 3970) +++ trunk/app/xterm/debian/local/koi8rxterm 2006-11-08 05:45:57 UTC (rev 3971) @@ -1,10 +1,14 @@ #!/bin/sh -# $Id: koi8rxterm 189 2005-06-11 00:04:27Z branden $ +# $Id$ # This is a wrapper script to set up xterm with a KOI8-R locale; based on # uxterm, by Thomas Dickey. -program=xterm -locale=`(LC_ALL=C LC_CTYPE=C LANG=C locale >/dev/null) 2>&1` +: ${XTERM_PROGRAM=xterm} + +# Check if there is a workable locale program. If there is not, we will read +# something via the standard error. Ignore whatever is written to the +# standard output. +locale=`sh -c "LC_ALL=C LC_CTYPE=C LANG=C locale >/dev/null" 2>&1` found=no # Check for -version and -help options, to provide a simple return without @@ -13,7 +17,7 @@ then case $1 in -v|-ver*|-h|-he*) - $program "$@" + $XTERM_PROGRAM "$@" exit $? ;; esac @@ -53,20 +57,29 @@ name="LC_CTYPE" value="ru_RU.KOI8-R" fi + eval save=\$${name} eval ${name}=${value} eval export ${name} if test -z "$locale" ; then # The 'locale' program tries to do a sanity check. - check=`(locale >/dev/null) 2>&1` + check=`sh -c "locale >/dev/null" 2>&1` if test -n "$check" ; then - echo "koi8rxterm tried to use locale $value" >&2 - echo "$check" >&2 + eval ${name}=${save} + eval export ${name} + + echo "koi8rxterm tried to use locale $value by setting \$$name" >&2 + xmessage -file - <<EOF +koi8rxterm tried unsuccessfully to use locale $value +by setting \$$name to "${value}". +EOF exit 1 fi fi fi # for testing: -#test -f ./xterm && program=./xterm +#test -f ./xterm && XTERM_PROGRAM=./xterm -exec $program -class KOI8RXTerm -title 'koi8rxterm' -k8 "$@" +exec $XTERM_PROGRAM -class KOI8RXTerm -title 'koi8rxterm' -k8 "$@" + +# vim:set ai noet sw=8 ts=8 tw=80: Property changes on: trunk/app/xterm/debian/local/koi8rxterm ___________________________________________________________________ Name: svn:keywords + Id Modified: trunk/app/xterm/debian/local/koi8rxterm.1 =================================================================== --- trunk/app/xterm/debian/local/koi8rxterm.1 2006-11-08 04:29:13 UTC (rev 3970) +++ trunk/app/xterm/debian/local/koi8rxterm.1 2006-11-08 05:45:57 UTC (rev 3971) @@ -1,4 +1,4 @@ -.\" $Id: koi8rxterm.1x 180 2005-06-10 20:54:37Z branden $ +.\" $Id$ .\" .\" Copyright 2004 Branden Robinson .\" Property changes on: trunk/app/xterm/debian/local/koi8rxterm.1 ___________________________________________________________________ Name: svn:keywords + Id Modified: trunk/app/xterm/debian/local/lxterm =================================================================== --- trunk/app/xterm/debian/local/lxterm 2006-11-08 04:29:13 UTC (rev 3970) +++ trunk/app/xterm/debian/local/lxterm 2006-11-08 05:45:57 UTC (rev 3971) @@ -1,6 +1,6 @@ #!/bin/sh -# $Id: lxterm 189 2005-06-11 00:04:27Z branden $ +# $Id$ PROGNAME=${0##*/} @@ -27,4 +27,4 @@ exec "$XTERM" "$@" -# vim:set ai et sts=4 sw=4 tw=80: +# vim:set ai et sw=4 ts=4 tw=80: Property changes on: trunk/app/xterm/debian/local/lxterm ___________________________________________________________________ Name: svn:keywords + Id Modified: trunk/app/xterm/debian/local/lxterm.1 =================================================================== --- trunk/app/xterm/debian/local/lxterm.1 2006-11-08 04:29:13 UTC (rev 3970) +++ trunk/app/xterm/debian/local/lxterm.1 2006-11-08 05:45:57 UTC (rev 3971) @@ -1,4 +1,4 @@ -.\" $Id: lxterm.1x 189 2005-06-11 00:04:27Z branden $ +.\" $Id$ .\" .TH lxterm 1 "2004-12-19" "Debian Project" .SH NAME Property changes on: trunk/app/xterm/debian/local/lxterm.1 ___________________________________________________________________ Name: svn:keywords + Id Modified: trunk/app/xterm/debian/local/uxterm.1 =================================================================== --- trunk/app/xterm/debian/local/uxterm.1 2006-11-08 04:29:13 UTC (rev 3970) +++ trunk/app/xterm/debian/local/uxterm.1 2006-11-08 05:45:57 UTC (rev 3971) @@ -1,4 +1,4 @@ -.\" $Id: uxterm.1x 180 2005-06-10 20:54:37Z branden $ +.\" $Id$ .\" .\" Copyright 2001, 2004 Branden Robinson .\" Property changes on: trunk/app/xterm/debian/local/uxterm.1 ___________________________________________________________________ Name: svn:keywords + Id Modified: trunk/app/xterm/debian/local/xterm.faq.html =================================================================== --- trunk/app/xterm/debian/local/xterm.faq.html 2006-11-08 04:29:13 UTC (rev 3970) +++ trunk/app/xterm/debian/local/xterm.faq.html 2006-11-08 05:45:57 UTC (rev 3971) @@ -1,7 +1,7 @@ <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN"> <!-- ***************************************************************************** - * Copyright 1997-2003,2004 by Thomas E. Dickey * + * Copyright 1997-2004,2005 by Thomas E. Dickey * * All Rights Reserved. * * * * Permission to use, copy, modify, and distribute this software and its * @@ -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.faq.html,v 1.84 2004/07/13 21:47:03 tom Exp $ + $XTermId: xterm.faq.html,v 1.90 2005/11/02 21:23:05 tom Exp $ --> <HTML> <HEAD> @@ -30,7 +30,7 @@ </HEAD> <BODY> <HR> -Copyright 1997-2003,2004 by Thomas E. Dickey +Copyright 1997-2004,2005 by Thomas E. Dickey <HR> <H1>Contents</H1> <UL> @@ -894,7 +894,7 @@ current_title=$(xprop -id $WINDOWID | grep WM_NAME | cut -d= -f2) </code></PRE> Here's another source of information: -<a href="http://www.giccs.georgetown.edu/~ric/howto/Xterm-Title/">Xterm-Title HowTo</a> +<a href="http://cns.georgetown.edu/~ric/howto/Xterm-Title/">Xterm-Title HowTo</a> <H2><A NAME="how2_blink">How do I make the cursor blink?</A></H2> Standard xterm does not implement a blinking cursor. @@ -909,7 +909,6 @@ <li>Starting xterm, or not <ul> <LI><A HREF="#no_ptys">Xterm does not run (no available pty's)</A> -<LI><A HREF="#no_ncurses">I need libncurses.so.3.0</A> <LI><A HREF="#no_termcap">I need /etc/termcap</A> <LI><A HREF="#no_libpath">Why does $LD_LIBRARY_PATH get reset?</A> <LI><A HREF="#no_ls_and_e">Why do the -e and -ls options not work together?</A> @@ -946,6 +945,7 @@ <LI><A HREF="#xterm_resize">FVWM does weird things when I try to resize xterm</A> <LI><A HREF="#xterm_tite">Why doesn't the screen clear when running vi?</A> <LI><A HREF="#xterm_vite">Why is the cursor misplaced after running vi?</A> +<LI><A HREF="#narrowproto">Why doesn't the scrollbar work?</A> </ul> <LI><A HREF="#warning_msg">What is this warning message?</A> </UL> @@ -1143,7 +1143,7 @@ </code></pre> For example, a more-specific pattern for the resource name lets you override: <pre><code> - XTerm.VT100.translations: #override \n\ + XTerm*VT100.translations: #override \n\ ~Shift<Key>Home: string(\033[1~)\n\ ~Shift<Key>End: string(\033[4~)\n\ ~Shift<Key>Prior: string(\033[5~)\n\ @@ -1315,30 +1315,6 @@ (e.g., with your window manager), you can always do cut/paste by pressing the shift key while clicking with the mouse. -<H2><A NAME="no_ncurses">I need libncurses.so.3.0</A></H2> -During initialization, xterm checks to see if the value of $TERM is -legal, i.e., is defined via the termcap interface. -Some people have linked xterm against ncurses, which provides a similar -interface, since they do not want to package termcap on their system. -<P> -The libncurses.so.3.0 corresponds to ncurses 1.9.8a; while there have -been interface changes to ncurses past this point (the current version of -<A HREF="../ncurses/ncurses.faq.html#latest_version">ncurses</A>), -the termcap interface should still be compatible. -So (for xterm) it doesn't matter much which version of ncurses you have -installed. However, other applications may not work properly. -Some people have advised just linking libncurses.so.2.0 to libncurses.so.3.0, -but that won't work well at all (one person simply linked libncurses.so.3.0 -to the libtermcap.so, which may work...). -A better solution would be to install the later version of ncurses, -with a link (if you must) from the newer version to the older library. -<P> -Since there is little agreement on the set of shared libraries that -are assumed to be present on the user's system, XFree86 distributes -xterm statically linked against termcap because that is simplest, -and because you lose functionality (the $TERMCAP variable) when linked -against terminfo libraries such as ncurses. - <H2><A NAME="no_libpath">Why does $LD_LIBRARY_PATH get reset?</A></H2> If xterm is running setuid (which is needed on some systems which have no wrappers for opening pty's and updating utmp), newer systems automatically @@ -1619,6 +1595,24 @@ operations so they apply only to the current screen. That makes it less likely to misplace your cursor. +<H2><A NAME="narrowproto">Why doesn't the scrollbar work?</A></H2> +Originally xterm was built using imake rather than a configure script. +One feature of imake that is not possible to guess within the +configure script is the wide-prototype compile-time definition +NARROWPROTO. When this is not set properly, the Athena widget +scrollbars do not work properly. xterm's configure script has a +fallback case which allows disabling imake. However, this is moot +with the Xorg "modular" build, whose compiler options are unrelated to +imake or older versions of any libraries that it may distribute. In +this case, the configure script needs some help. Use this option to +enable or disable NARROW proto (and disable imake with the +--disable-imake option) to match the whims of Xorg hackers. +<p> +For instance +<pre><code> + configure --disable-imake --disable-narrowproto +</code></pre> + <H2><A NAME="xterm_erase">Why doesn't my delete key work?</A></H2> This seems to be a problem with the older XFree86 release (3.1.2). I have picked up pieces of the story (xterm and the keyboard work as @@ -1831,45 +1825,45 @@ <PRE><code> XTerm*internalBorder: 10 XTerm*highlightSelection: true - XTerm*VT100*colorBDMode: on - XTerm*VT100*colorBD: blue - XTerm*VT100*colorULMode: on - XTerm*VT100*colorUL: magenta - XTerm.VT100.eightBitInput: true - XTerm.VT100.eightBitOutput: true + XTerm*VT100.colorBDMode: on + XTerm*VT100.colorBD: blue + XTerm*VT100.colorULMode: on + XTerm*VT100.colorUL: magenta + XTerm*VT100.eightBitInput: true + XTerm*VT100.eightBitOutput: true XTerm*scrollBar: true - XTerm.VT100.titeInhibit: true + XTerm*VT100.titeInhibit: true - XTerm.VT100*colorMode: on - XTerm.VT100*dynamicColors: on + XTerm*VT100.colorMode: on + XTerm*VT100.dynamicColors: on ! Uncomment this to use color for underline attribute - XTerm.VT100*colorULMode: on - XTerm.VT100*underLine: off + XTerm*VT100.colorULMode: on + XTerm*VT100.underLine: off ! Uncomment this to use color for the bold attribute - XTerm.VT100*colorBDMode: on + XTerm*VT100.colorBDMode: on - XTerm.VT100*color0: black - XTerm.VT100*color1: red3 - XTerm.VT100*color2: green3 - XTerm.VT100*color3: yellow3 - XTerm.VT100*color4: blue3 - XTerm.VT100*color5: magenta3 - XTerm.VT100*color6: cyan3 - XTerm.VT100*color7: gray90 - XTerm.VT100*color8: gray30 - XTerm.VT100*color9: red - XTerm.VT100*color10: green - XTerm.VT100*color11: yellow - XTerm.VT100*color12: blue - XTerm.VT100*color13: magenta - XTerm.VT100*color14: cyan - XTerm.VT100*color15: white - XTerm.VT100*colorUL: yellow - XTerm.VT100*colorBD: white + XTerm*VT100.color0: black + XTerm*VT100.color1: red3 + XTerm*VT100.color2: green3 + XTerm*VT100.color3: yellow3 + XTerm*VT100.color4: blue3 + XTerm*VT100.color5: magenta3 + XTerm*VT100.color6: cyan3 + XTerm*VT100.color7: gray90 + XTerm*VT100.color8: gray30 + XTerm*VT100.color9: red + XTerm*VT100.color10: green + XTerm*VT100.color11: yellow + XTerm*VT100.color12: blue + XTerm*VT100.color13: magenta + XTerm*VT100.color14: cyan + XTerm*VT100.color15: white + XTerm*VT100.colorUL: yellow + XTerm*VT100.colorBD: white - XTerm.VT100*cursorColor: lime green + XTerm*VT100.cursorColor: lime green </code> </PRE> XFree86 xterm comes with two copies of the resource file, @@ -1902,12 +1896,12 @@ while this applies only to the VT100 widget (which is probably what you intended): <PRE><code> - XTerm.VT100*geometry: 80x24 + XTerm.VT100.geometry: 80x24 </code></PRE> or better yet (to allow for the toolbar option, which uses a level of widget hierarchy): <PRE><code> - XTerm*VT100*geometry: 80x24 + XTerm*VT100.geometry: 80x24 </code></PRE> <H2><A NAME="warning_msg">What is this warning message?</A></H2> @@ -2239,7 +2233,7 @@ There are several variants on this: xterm adapted for Motif libraries. I have seen none that work properly: <UL> -<LI><a href="http://camms1.caos.kun.nl/~schaft/mxterm/mxterm.html">MXTERM: +<LI><a href="http://www.cmbi.kun.nl/~schaft/mxterm/mxterm.html">MXTERM: a motif Xterm with character attributes color rendered</a> I've noticed this one only recently. It is a reworking of the earlier patches for color_xterm Modified: trunk/app/xterm/debian/rules =================================================================== --- trunk/app/xterm/debian/rules 2006-11-08 04:29:13 UTC (rev 3970) +++ trunk/app/xterm/debian/rules 2006-11-08 05:45:57 UTC (rev 3971) @@ -195,4 +195,4 @@ exit 1; \ fi -# vim:set noet ai sts=8 sw=8 tw=0: +# vim:set ai noet sw=8 ts=8 tw=0: Property changes on: trunk/app/xterm/debian/rules ___________________________________________________________________ Name: svn:keywords + Id Modified: trunk/app/xterm/debian/xterm.README.Debian =================================================================== --- trunk/app/xterm/debian/xterm.README.Debian 2006-11-08 04:29:13 UTC (rev 3970) +++ trunk/app/xterm/debian/xterm.README.Debian 2006-11-08 05:45:57 UTC (rev 3971) @@ -45,6 +45,6 @@ consistent with the Linux virtual console (and therefore with the behavior of DEC VT 220 terminals). -$Id: xterm.README.Debian 405 2005-07-24 04:46:38Z dnusinow $ +$Id$ -vim:set ai et sts=4 sw=4 tw=80: +vim:set ai et sw=4 ts=4 tw=80: Property changes on: trunk/app/xterm/debian/xterm.README.Debian ___________________________________________________________________ Name: svn:keywords + Id Modified: trunk/app/xterm/debian/xterm.doc-base =================================================================== --- trunk/app/xterm/debian/xterm.doc-base 2006-11-08 04:29:13 UTC (rev 3970) +++ trunk/app/xterm/debian/xterm.doc-base 2006-11-08 05:45:57 UTC (rev 3971) @@ -12,3 +12,13 @@ Format: HTML Index: /usr/share/doc/xterm/xterm.faq.html Files: /usr/share/doc/xterm/xterm.faq.html + +Document: xterm-ctlseqs +Title: Xterm Control Sequences +Author: Edward Moy, Stephen Gildea, Thomas Dickey +Abstract: This document describes the terminal control sequences that XTerm + recognizes. +Section: XShells + +Format: text +Files: /usr/share/doc/xterm/ctlseqs.txt.gz Modified: trunk/app/xterm/debian/xterm.docs =================================================================== --- trunk/app/xterm/debian/xterm.docs 2006-11-08 04:29:13 UTC (rev 3970) +++ trunk/app/xterm/debian/xterm.docs 2006-11-08 05:45:57 UTC (rev 3971) @@ -1,4 +1,6 @@ README.i18n +ctlseqs.ms +ctlseqs.txt xterm.log.html debian/local/xterm.faq.html debian/local/xterm.faq.gz Modified: trunk/app/xterm/debian/xterm.menu =================================================================== --- trunk/app/xterm/debian/xterm.menu 2006-11-08 04:29:13 UTC (rev 3970) +++ trunk/app/xterm/debian/xterm.menu 2006-11-08 05:45:57 UTC (rev 3971) @@ -1,4 +1,4 @@ -# $Id: xterm.menu 189 2005-06-11 00:04:27Z branden $ +# $Id$ ?package(xterm):\ needs="x11"\ Property changes on: trunk/app/xterm/debian/xterm.menu ___________________________________________________________________ Name: svn:keywords + Id Modified: trunk/app/xterm/debian/xterm.postinst =================================================================== --- trunk/app/xterm/debian/xterm.postinst 2006-11-08 04:29:13 UTC (rev 3970) +++ trunk/app/xterm/debian/xterm.postinst 2006-11-08 05:45:57 UTC (rev 3971) @@ -5,32 +5,29 @@ # /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>. # Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava. -# $Id: xterm.postinst.in 189 2005-06-11 00:04:27Z branden $ +# $Id$ set -e -THIS_PACKAGE=xterm -THIS_SCRIPT=postinst - update-alternatives --install /usr/bin/x-terminal-emulator \ - x-terminal-emulator /usr/bin/xterm 20 --slave \ - /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz \ - /usr/share/man/man1/xterm.1.gz + x-terminal-emulator /usr/bin/xterm 20 --slave \ + /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz \ + /usr/share/man/man1/xterm.1.gz update-alternatives --install /usr/bin/x-terminal-emulator \ - x-terminal-emulator /usr/bin/uxterm 20 --slave \ - /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz \ - /usr/share/man/man1/uxterm.1.gz + x-terminal-emulator /usr/bin/uxterm 20 --slave \ + /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz \ + /usr/share/man/man1/uxterm.1.gz update-alternatives --install /usr/bin/x-terminal-emulator \ - x-terminal-emulator /usr/bin/koi8rxterm 20 --slave \ - /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz \ - /usr/share/man/man1/koi8rxterm.1.gz + x-terminal-emulator /usr/bin/koi8rxterm 20 --slave \ + /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz \ + /usr/share/man/man1/koi8rxterm.1.gz update-alternatives --install /usr/bin/x-terminal-emulator \ - x-terminal-emulator /usr/bin/lxterm 30 --slave \ - /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz \ - /usr/share/man/man1/lxterm.1.gz + x-terminal-emulator /usr/bin/lxterm 30 --slave \ + /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz \ + /usr/share/man/man1/lxterm.1.gz # in xterm versions from 204-0pre1 to 222-1, the manpage alternative was # set incorrectly to x-terminal-emulator.1x.gz. In some cases, this can lead @@ -45,4 +42,4 @@ exit 0 -# vim:set ai et sts=2 sw=2 tw=0: +# vim:set ai et sw=4 ts=4 tw=80: Property changes on: trunk/app/xterm/debian/xterm.postinst ___________________________________________________________________ Name: svn:keywords + Id Modified: trunk/app/xterm/debian/xterm.preinst =================================================================== --- trunk/app/xterm/debian/xterm.preinst 2006-11-08 04:29:13 UTC (rev 3970) +++ trunk/app/xterm/debian/xterm.preinst 2006-11-08 05:45:57 UTC (rev 3971) @@ -5,40 +5,37 @@ # /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>. # Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava. -# $Id: xterm.preinst.in 189 2005-06-11 00:04:27Z branden $ +# $Id$ set -e -THIS_PACKAGE=xterm -THIS_SCRIPT=preinst - -#INCLUDE_SHELL_LIB# - if [ "$1" = "upgrade" ] || [ "$1" = "install" ]; then - if dpkg --compare-versions "$2" lt "4.0.1-1"; then - # clean up after older alternative that used different path - if update-alternatives --display x-terminal-emulator | - fgrep -q /usr/bin/X11/xterm; then - update-alternatives --remove x-terminal-emulator /usr/bin/X11/xterm + if dpkg --compare-versions "$2" lt "4.0.1-1"; then + # Clean up after older alternative that used different path. + if update-alternatives --display x-terminal-emulator | + fgrep -q /usr/bin/X11/xterm; then + update-alternatives --remove x-terminal-emulator /usr/bin/X11/xterm + fi fi - fi - if dpkg --compare-versions "$2" lt "204"; then - # clean up after older alternative that used different path - if update-alternatives --display x-terminal-emulator | - fgrep -q /usr/X11R6/bin/xterm; then - - 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 - + if dpkg --compare-versions "$2" lt "204"; then + # Clean up after older alternative that used different path. + if update-alternatives --display x-terminal-emulator | + fgrep -q /usr/X11R6/bin/xterm; then + 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 fi - fi fi #DEBHELPER# exit 0 -# vim:set ai et sts=2 sw=2 tw=0: +# vim:set ai et sw=4 ts=4 tw=80: Property changes on: trunk/app/xterm/debian/xterm.preinst ___________________________________________________________________ Name: svn:keywords + Id Modified: trunk/app/xterm/debian/xterm.prerm =================================================================== --- trunk/app/xterm/debian/xterm.prerm 2006-11-08 04:29:13 UTC (rev 3970) +++ trunk/app/xterm/debian/xterm.prerm 2006-11-08 05:45:57 UTC (rev 3971) @@ -5,24 +5,19 @@ # /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>. # Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava. -# $Id: xterm.prerm.in 189 2005-06-11 00:04:27Z branden $ +# $Id$ set -e -THIS_PACKAGE=xterm -THIS_SCRIPT=prerm - -#INCLUDE_SHELL_LIB# - if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then - update-alternatives --remove x-terminal-emulator /usr/bin/koi8rxterm - update-alternatives --remove x-terminal-emulator /usr/bin/uxterm - update-alternatives --remove x-terminal-emulator /usr/bin/xterm - update-alternatives --remove x-terminal-emulator /usr/bin/lxterm + update-alternatives --remove x-terminal-emulator /usr/bin/koi8rxterm + update-alternatives --remove x-terminal-emulator /usr/bin/uxterm + update-alternatives --remove x-terminal-emulator /usr/bin/xterm + update-alternatives --remove x-terminal-emulator /usr/bin/lxterm fi #DEBHELPER# exit 0 -# vim:set ai et sts=2 sw=2 tw=0: +# vim:set ai et sw=4 ts=4 tw=80: Property changes on: trunk/app/xterm/debian/xterm.prerm ___________________________________________________________________ Name: svn:keywords + Id -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]