MANIFEST | 17 +++ Makefile.in | 43 ++++---- THANKS | 12 ++ charproc.c | 10 - fontutils.c | 16 +-- package/debian/changelog | 5 package/debian/color.sed | 4 package/debian/compat | 1 package/debian/control | 21 +++ package/debian/copyright | 221 ++++++++++++++++++++++++++++++++++++++++++ package/debian/rules | 185 +++++++++++++++++++++++++++++++++++ package/debian/source/format | 1 package/debian/watch | 4 package/debian/xterm-dev.docs | 8 + package/debian/xterm-xres.sed | 8 + package/xterm.spec | 175 +++++++++++++++++++++++++++++++++ version.h | 4 xterm.log.html | 10 + xtermcfg.hin | 41 ++++--- 19 files changed, 733 insertions(+), 53 deletions(-)
New commits: commit 73d90d5e5a4411620f5e1710930adf8c38bf30eb Author: Cyril Brulebois <k...@debian.org> Date: Wed Oct 27 12:40:14 2010 +0200 Import xterm 266 diff --git a/MANIFEST b/MANIFEST index fb673de..ad9bc8d 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,4 +1,4 @@ -MANIFEST for xterm-265, version xterm-265 +MANIFEST for xterm-266, version xterm-266 -------------------------------------------------------------------------------- MANIFEST this file 256colres.h resource-definitions for 256-color mode @@ -115,6 +115,21 @@ icons/xterm_32x32.xcf gimp file, for editing 32x32 icon icons/xterm_32x32.xpm 32x32 monochrome icon icons/xterm_48x48.xcf gimp file, for editing 48x48 icon icons/xterm_48x48.xpm 48x48 monochrome icon +package/debian subdirectory +package/debian/changelog build-script +package/debian/color.sed build-script +package/debian/compat build-script +package/debian/control build-script +package/debian/copyright build-script +package/debian/rules build-script +package/debian/source subdirectory +package/debian/source/format build-script +package/debian subdirectory +package/debian/watch build-script +package/debian/xterm-dev.docs build-script +package/debian/xterm-xres.sed build-script +package subdirectory +package/xterm.spec build-script tektests subdirectory tektests/aitest.tek tek4014 demo: draw a globe tektests/dmerc.tek tek4014 demo: draws a Mercator projection with orbit diff --git a/Makefile.in b/Makefile.in index 0c0bff6..ed86ce2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -## $XTermId: Makefile.in,v 1.171 2010/04/04 22:41:32 tom Exp $ +## $XTermId: Makefile.in,v 1.172 2010/10/23 18:15:25 tom Exp $ # ----------------------------------------------------------------------------- # this file is part of xterm # @@ -196,27 +196,34 @@ install \ install-bin \ install-scripts \ install-full :: - @$(SHELL) -c 'echo "... installing $(BINDIR)/$(binary_uxterm)"; \ - if test "$(binary_xterm)" != "xterm"; then \ - name="$(binary_xterm)"; \ - sed -e "s,=xterm,=$$name," $(srcdir)/uxterm >uxterm.tmp; \ - $(INSTALL_SCRIPT) -m 755 uxterm.tmp $(BINDIR)/$(binary_uxterm); \ + @$(SHELL) -c "name=\"$(binary_xterm)\"; \ + dest=\"$(binary_uxterm)\"; \ + echo \"... installing $(BINDIR)/\$$dest\"; \ + if test \"\$$name\" != \"xterm\"; then \ + sed -e \"s,=xterm,=\$$name,\" $(srcdir)/uxterm >uxterm.tmp; \ + $(INSTALL_SCRIPT) -m 755 uxterm.tmp $(BINDIR)/\$$dest; \ rm -f uxterm.tmp; \ else \ - $(INSTALL_SCRIPT) -m 755 $(srcdir)/uxterm $(BINDIR)/$(binary_uxterm); \ - fi' - @$(SHELL) -c 'echo "... installing $(BINDIR)/$(binary_k8term)"; \ - if test "$(binary_xterm)" != "xterm"; then \ - name="$(binary_xterm)"; \ - sed -e "s,=xterm,=$$name," $(srcdir)/koi8rxterm >k8term.tmp; \ - $(INSTALL_SCRIPT) -m 755 k8term.tmp $(BINDIR)/$(binary_k8term); \ + $(INSTALL_SCRIPT) -m 755 $(srcdir)/uxterm $(BINDIR)/\$$dest; \ + fi" + @$(SHELL) -c "name=\"$(binary_xterm)\"; \ + dest=\"$(binary_k8term)\"; \ + echo \"... installing $(BINDIR)/\$$dest\"; \ + if test \"\$$name\" != \"xterm\"; then \ + sed -e \"s,=xterm,=\$$name,\" $(srcdir)/koi8rxterm >k8term.tmp; \ + $(INSTALL_SCRIPT) -m 755 k8term.tmp $(BINDIR)/\$$dest; \ rm -f k8term.tmp; \ else \ - $(INSTALL_SCRIPT) -m 755 $(srcdir)/koi8rxterm $(BINDIR)/$(binary_k8term); \ - fi' - @-$(SHELL) -c "if test @XTERM_SYMLINK@ != NONE ; then cd $(BINDIR) && rm -f @XTERM_SYMLINK@ ; fi" - @-$(SHELL) -c "if test @XTERM_SYMLINK@ != NONE ; then cd $(BINDIR) && $(LN_S) $(binary_xterm) @XTERM_SYMLINK@ ; fi" - @-$(SHELL) -c "if test @XTERM_SYMLINK@ != NONE ; then cd $(BINDIR) && echo '... created symbolic link:' && ls -l $(binary_xterm) @XTERM_SYMLINK@ ; fi" + $(INSTALL_SCRIPT) -m 755 $(srcdir)/koi8rxterm $(BINDIR)/\$$dest; \ + fi" + @-$(SHELL) -c "name=\"$(binary_xterm)\"; \ + if test @XTERM_SYMLINK@ != NONE ; then \ + cd $(BINDIR) && ( \ + rm -f @XTERM_SYMLINK@ ; \ + $(LN_S) \$$name @XTERM_SYMLINK@ ; \ + echo \"... created symbolic link:\" ; \ + ls -l \$$name @XTERM_SYMLINK@ ) ; \ + fi" install \ install-man \ diff --git a/THANKS b/THANKS index ae3dbfc..424dfa2 100644 --- a/THANKS +++ b/THANKS @@ -1,4 +1,4 @@ --- $XTermId: THANKS,v 1.1 2009/10/11 17:30:42 tom Exp $ +-- $XTermId: THANKS,v 1.2 2010/10/24 17:46:47 tom Exp $ -- vile:txtmode fk=8bit There's no AUTHORS file in this distribution; it would be redundant since I (Thomas E. Dickey) have done more than 80% of the work on xterm since 1996. @@ -10,6 +10,7 @@ For some insight, see Here's a list from xterm.log.html of people who have contributed changes. +Adam M Costello Adam Sulmicki Alan Coopersmith Alex Hornung @@ -17,6 +18,7 @@ Alexander Pohoyda Alexander V Lukyanov Andrea Odetti Andreas Jaeger +Andreas Schwab Andrew Sumner Andrew Tipton Anton Kovalenko @@ -30,6 +32,8 @@ Bram Moolenaar Branden Robinson Bruno Haible Caetano Jimenez Carezzato +Chris Adams +Chris Clayton Christian Biere Christian Weisgerber Chuck Blake @@ -44,6 +48,7 @@ David Mathog David Wood David Yeo Denis Zaitsev +Dennis Preiser Dennis Schneider Dr Werner Fink Ed Schouten @@ -72,9 +77,11 @@ Jeff Chua Jeff Uphoff Jens Schweikhardt Jeremy Buhler +Jeremy Huddleston Jeroen Ruigrok Jess Thrysoee Jim Paris +Jochen Voss Joe Allen Joe Peterson Johnny Billquist @@ -86,6 +93,7 @@ Kean Johnston Keith Packard Ken Martin Kevin Buhr +Kevin Schoedel Kiyokazu Suto Larry Riedel Lee Olsen @@ -100,6 +108,7 @@ Matthias Scheler Matthieu Herrb Matthieu Lagouge Max Mikhanosha +Michael Riepe Michael Rohleder Michael Schroeder Mike Castle @@ -127,6 +136,7 @@ Robert Brady Robert Earl Robin Cutshaw Ross Paterson +Ryan Johnson Scott Sewall Semen A Ustimenko Sergei Laskavy diff --git a/charproc.c b/charproc.c index fd8b575..919b9e2 100644 --- a/charproc.c +++ b/charproc.c @@ -1,4 +1,4 @@ -/* $XTermId: charproc.c,v 1.1086 2010/10/13 23:04:01 tom Exp $ */ +/* $XTermId: charproc.c,v 1.1087 2010/10/22 23:04:58 tom Exp $ */ /* @@ -6383,13 +6383,13 @@ VTInitialize(Widget wrequest, #define DefaultFontNames TScreenOf(wnew)->menu_font_names[fontMenu_default] init_Sres(misc.default_font.f_n); init_Sres(misc.default_font.f_b); - DefaultFontNames[fNorm] = wnew->misc.default_font.f_n; - DefaultFontNames[fBold] = wnew->misc.default_font.f_b; + DefaultFontNames[fNorm] = x_strdup(wnew->misc.default_font.f_n); + DefaultFontNames[fBold] = x_strdup(wnew->misc.default_font.f_b); #if OPT_WIDE_CHARS init_Sres(misc.default_font.f_w); init_Sres(misc.default_font.f_wb); - DefaultFontNames[fWide] = wnew->misc.default_font.f_w; - DefaultFontNames[fWBold] = wnew->misc.default_font.f_wb; + DefaultFontNames[fWide] = x_strdup(wnew->misc.default_font.f_w); + DefaultFontNames[fWBold] = x_strdup(wnew->misc.default_font.f_wb); #endif TScreenOf(wnew)->MenuFontName(fontMenu_fontescape) = NULL; TScreenOf(wnew)->MenuFontName(fontMenu_fontsel) = NULL; diff --git a/fontutils.c b/fontutils.c index 2fce86a..87d99a3 100644 --- a/fontutils.c +++ b/fontutils.c @@ -1,4 +1,4 @@ -/* $XTermId: fontutils.c,v 1.351 2010/10/22 09:02:10 tom Exp $ */ +/* $XTermId: fontutils.c,v 1.353 2010/10/23 00:27:22 tom Exp $ */ /************************************************************ @@ -911,7 +911,7 @@ xtermLoadFont(XtermWidget xw, TRACE(("xtermLoadFont #%d "name" %s%s\n", \ fontnum, \ (warn[index] == fwResource) ? "*" : " ", \ - NonNull(myfonts.field))); + NonNull(myfonts.field))) DbgResource("normal", f_n, fNorm); DbgResource("bold ", f_b, fBold); #if OPT_WIDE_CHARS @@ -1249,7 +1249,7 @@ typedef struct { TRACE(("COPY_MENU_FONTS " #src " to " #dst "\n")); \ for (n = fontMenu_default; n <= fontMenu_lastBuiltin; ++n) { \ for (m = 0; m < fMAX; ++m) { \ - dst.menu_font_names[n][m] = src.menu_font_names[n][m]; \ + dst.menu_font_names[n][m] = x_strdup(src.menu_font_names[n][m]); \ } \ } @@ -1329,11 +1329,11 @@ xtermLoadVTFonts(XtermWidget xw, String myName, String myClass) */ xw->misc.default_font = subresourceRec.default_font; COPY_MENU_FONTS(subresourceRec, xw->screen); - screen->MenuFontName(fontMenu_default) = xw->misc.default_font.f_n; - screen->menu_font_names[0][fBold] = xw->misc.default_font.f_b; + screen->MenuFontName(fontMenu_default) = x_strdup(xw->misc.default_font.f_n); + screen->menu_font_names[0][fBold] = x_strdup(xw->misc.default_font.f_b); #if OPT_WIDE_CHARS - screen->menu_font_names[0][fWide] = xw->misc.default_font.f_w; - screen->menu_font_names[0][fWBold] = xw->misc.default_font.f_wb; + screen->menu_font_names[0][fWide] = x_strdup(xw->misc.default_font.f_w); + screen->menu_font_names[0][fWBold] = x_strdup(xw->misc.default_font.f_wb); #endif } else { TRACE(("...no resources found\n")); @@ -3019,7 +3019,7 @@ SetVTFont(XtermWidget xw, #define USE_CACHED(field, name) \ if (myfonts.field == 0) { \ - myfonts.field = screen->menu_font_names[which][name]; \ + myfonts.field = x_strdup(screen->menu_font_names[which][name]); \ TRACE(("set myfonts." #field " from menu_font_names[%d][" #name "] %s\n", \ which, NonNull(myfonts.field))); \ } else { \ diff --git a/package/debian/changelog b/package/debian/changelog new file mode 100644 index 0000000..cab8669 --- /dev/null +++ b/package/debian/changelog @@ -0,0 +1,5 @@ +xterm-dev (266) unstable; urgency=low + + * add build-script for testing, adapted from Debian xterm package. + + -- Thomas E. Dickey <dic...@invisible-island.net> Fri, 22 Oct 2010 17:15:59 -0400 diff --git a/package/debian/color.sed b/package/debian/color.sed new file mode 100644 index 0000000..6029c59 --- /dev/null +++ b/package/debian/color.sed @@ -0,0 +1,4 @@ +s/! Uncomment this for "white" text on a dark background./! Set the default text foreground and background colors./ +s/!\*VT100\*foreground: gray90/*VT100*foreground: gray90/ +s/!\*VT100\*background: black/*VT100*background: black/ +/!\*VT100.scrollbar.thumb:[ ]*vlines2/,/!lines[ ]*-1,0,0,0,0,-1/s/!// diff --git a/package/debian/compat b/package/debian/compat new file mode 100644 index 0000000..7ed6ff8 --- /dev/null +++ b/package/debian/compat @@ -0,0 +1 @@ +5 diff --git a/package/debian/control b/package/debian/control new file mode 100644 index 0000000..f511533 --- /dev/null +++ b/package/debian/control @@ -0,0 +1,21 @@ +Source: xterm-dev +Section: x11 +Priority: optional +Maintainer: Thomas E. Dickey <dic...@invisible-island.net> +Homepage: http://invisible-island.net/xterm/ +Build-Depends: debhelper (>= 7) +Standards-Version: 3.8.2 + +Package: xterm-dev +Architecture: any +Depends: ${misc:Depends} +Provides: x-terminal-emulator +Recommends: x11-utils | xutils | bluit +Description: X terminal emulator (development version) + xterm is the standard terminal emulator for the X Window System. + It provides DEC VT102 and Tektronix 4014 compatible terminals for + programs that cannot use the window system directly. This version + implements ISO/ANSI colors, Unicode, and most of the control sequences + used by DEC VT220 terminals. + . + This package contains a development version of xterm. diff --git a/package/debian/copyright b/package/debian/copyright new file mode 100644 index 0000000..fef8e13 --- /dev/null +++ b/package/debian/copyright @@ -0,0 +1,221 @@ +Upstream source http://invisible-island.net/xterm/xterm.html + +------------------------------------------------------------------------------- +Except as noted below, all copyrights use the same wording, denoted MIT-X11. +That is not in Debian's list under /usr/share/licenses. Here is the common +wording: + +All Rights Reserved + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name(s) of the above copyright +holders shall not be used in advertising or otherwise to promote the +sale, use or other dealings in this Software without prior written +authorization. + +------------------------------------------------------------------------------- +Files: * */* +License: MIT-X11 + +Copyright 1996-2010 by Thomas E. Dickey + +(date ranges vary, depending on when the respective files were first changed +significantly, and run through the most recent change date). + +------------------------------------------------------------------------------- +Files: 88colres.pl +License: MIT-X11 + +Copyright 1999-2005,2007 by Thomas E. Dickey +Copyright 1999-2000 by Steve Wall + +------------------------------------------------------------------------------- +Files: vttests/88colors2.pl +License: MIT-X11 + +Copyright 1999-2007,2009 by Thomas E. Dickey +Copyright 1999 by Steve Wall + +------------------------------------------------------------------------------- +Files: vttests/256colors2.pl +License: MIT-X11 + +Copyright 1999-2007,2009 by Thomas E. Dickey +Copyright 2002 by Steve Wall +Copyright 1999 by Todd Larason + +------------------------------------------------------------------------------- +Files: xcharmouse.h + +Copyright 1998 by Jason Bacon <aca...@execpc.com> + +All Rights Reserved + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of the above listed +copyright holder(s) not be used in advertising or publicity pertaining +to distribution of the software without specific, written prior +permission. + +THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD +TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE +LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +------------------------------------------------------------------------------- +Files: xutf8.* +License: MIT-X11 + +Copyright (C) 2001 by Juliusz Chroboczek + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + +------------------------------------------------------------------------------- +Files: ctlseqs.ms install-sh +License: MIT-X11 + +Copyright 1984-1994 X Consortium + +------------------------------------------------------------------------------- +Copyright 1987,1988 by Digital Equipment Corporation, Maynard, Massachusetts. + +All Rights Reserved + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of Digital Equipment +Corporation not be used in advertising or publicity pertaining to +distribution of the software without specific, written prior permission. + +DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING +ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL +DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR +ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +SOFTWARE. + +------------------------------------------------------------------------------- +Copyright 1988,1989 The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of The Open Group shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from The Open Group. + +------------------------------------------------------------------------------- +Files: koi8rxterm.man uxterm.man +License: MIT-X11 + +Copyright 2001, 2004 Branden Robinson + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +SOFTWARE IN THE PUBLIC INTEREST, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. + +------------------------------------------------------------------------------- +Files: charclass.* + +Markus Kuhn -- 2000-07-03 + +Permission to use, copy, modify, and distribute this software +for any purpose and without fee is hereby granted. The author +disclaims all warranties with regard to this software. + +------------------------------------------------------------------------------- +Files: wcwidth.* + +Markus Kuhn -- 2007-05-25 + +Permission to use, copy, modify, and distribute this software +for any purpose and without fee is hereby granted. The author +disclaims all warranties with regard to this software. + +------------------------------------------------------------------------------- +Files: config.guess config.sub +License: GPL-2+ + + Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, + 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 + Free Software Foundation, Inc. + +------------------------------------------------------------------------------- +Files: configure +License: GPL-2+ + + Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 + Free Software Foundation, Inc. + +------------------------------------------------------------------------------- diff --git a/package/debian/rules b/package/debian/rules new file mode 100755 index 0000000..ad0d680 --- /dev/null +++ b/package/debian/rules @@ -0,0 +1,185 @@ +#!/usr/bin/make -f +# Made with the aid of dh_make, by Craig Small +# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess. +# Some lines taken from debmake, by Cristoph Lameter. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +DESKTOP_VENDOR = dickey + +PKG_SUFFIX = -dev + +PACKAGE := $(shell dpkg-parsechangelog| \ + sed -n 's/^Source: \(.*\)$$/\1/p') + +PKG_APPDEFAULTS := /etc/X11/app-defaults +PKG_DESKTOP := /usr/share/applications + +DSTDIR := $(CURDIR)/debian/$(PACKAGE) +MY_DESKTOP := $(DSTDIR)/usr/share/applications + +CFLAGS = + +ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) +DEBOP=--enable-debug +else +DEBOP= +endif + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +configure: configure-stamp +configure-stamp: + dh_testdir + + ./configure \ + --host=$(DEB_HOST_GNU_TYPE) \ + --build=$(DEB_BUILD_GNU_TYPE) \ + --program-suffix=$(PKG_SUFFIX) \ + --prefix=/usr \ + --libexecdir=\$${prefix}/lib \ + --mandir=\$${prefix}/share/man \ + --sysconfdir=/etc/$(PACKAGE) \ + --localstatedir=/var \ + --libdir=/etc/$(PACKAGE) \ + --without-xterm-symlink \ + --enable-256-color \ + --enable-88-color \ + --enable-dabbrev \ + --enable-dec-locator \ + --enable-exec-xterm \ + --enable-hp-fkeys \ + --enable-load-vt-fonts \ + --enable-logfile-exec \ + --enable-logging \ + --enable-mini-luit \ + --enable-paste64 \ + --enable-rectangles \ + --enable-sco-fkeys \ + --enable-tcap-fkeys \ + --enable-tcap-query \ + --enable-toolbar \ + --enable-wide-chars \ + --enable-xmc-glitch \ + --with-app-defaults=$(PKG_APPDEFAULTS) \ + --with-icondir=\$${prefix}/share/pixmaps \ + --with-own-terminfo=\$${prefix}/share/terminfo \ + --with-terminal-type=xterm-new \ + --with-utempter \ + ${DEBOP} + + touch configure-stamp + +build: build-stamp +build-stamp: configure-stamp + dh_testdir + + $(MAKE) + + touch build-stamp + +clean: + dh_testdir + dh_testroot + + [ ! -f Makefile ] || $(MAKE) distclean + + dh_clean + +install: install-stamp +install-stamp: build-stamp + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) install \ + DESTDIR=$(CURDIR)/debian/$(PACKAGE) + + touch install-stamp + +install: install-indep install-arch +install-indep: + +install-arch: + dh_testdir + dh_testroot + dh_prep -s + dh_installdirs -s + + $(MAKE) install-bin \ + DESTDIR=$(DSTDIR) + +# Build architecture-independent files here. +binary-indep: build install + dh_testdir + dh_testroot + + # This overwrites the Debian package's copy of app-defaults and icons. + # But the resources are not the same; they are patched. + sed -i -f package/debian/color.sed XTerm-col.ad + sed -i -f package/debian/xterm-xres.sed XTerm.ad + + $(MAKE) install-app \ + install-icon \ + install-man \ + DESTDIR=$(DSTDIR) + + # Follow-up with a check against the installed resource files. + ( cd $(DSTDIR)$(PKG_APPDEFAULTS) && $(SHELL) -c 'for p in *;do diff -u $$p $(PKG_APPDEFAULTS)/; done' ; exit 0 ) + + # The Debian package does not install desktop files. + # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=486317 + $(SHELL) -c 'for p in *.desktop;do \ + sed -i \ + -e "s/Categories=System;/Categories=Application;Utility;/" \ + -e "s/^\\(Name=.*\\)/\\1$(PKG_SUFFIX)/" \ + -e "s/^\\(Exec=.*\\)/\\1$(PKG_SUFFIX)/" \ + $$p; done' + + $(MAKE) install-desktop \ + DESKTOP_FLAGS="--vendor='$(DESKTOP_VENDOR)' --dir $(MY_DESKTOP)" + + ( cd $(DSTDIR)$(PKG_DESKTOP) \ + && $(SHELL) -c 'for p in *;do \ + test -n "$(PKG_SUFFIX)" && mv $$p `basename $$p .desktop`$(PKG_SUFFIX).desktop; \ + diff -u $$p $(PKG_DESKTOP)/; \ + done' ; \ + exit 0 ) + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installdebconf + dh_installdocs + dh_installmenu + dh_installmime + dh_installexamples tektests vttests + dh_installchangelogs + dh_install + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install install-stamp diff --git a/package/debian/source/format b/package/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/package/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/package/debian/watch b/package/debian/watch new file mode 100644 index 0000000..6c46327 --- /dev/null +++ b/package/debian/watch @@ -0,0 +1,4 @@ +version=3 + +opts=passive ftp://invisible-island.net/xterm/current/xterm\.tar.gz \ + debian uupdate diff --git a/package/debian/xterm-dev.docs b/package/debian/xterm-dev.docs new file mode 100644 index 0000000..b29b135 --- /dev/null +++ b/package/debian/xterm-dev.docs @@ -0,0 +1,8 @@ +INSTALL +README.i18n +THANKS +ctlseqs.ms +ctlseqs.txt +termcap +terminfo +xterm.log.html diff --git a/package/debian/xterm-xres.sed b/package/debian/xterm-xres.sed new file mode 100644 index 0000000..745cb58 --- /dev/null +++ b/package/debian/xterm-xres.sed @@ -0,0 +1,8 @@ +/\*tek4014\*fontSmall:[ ]*6x10/a\ +\ +! Debian package customizations follow.\ +*backarrowKeyIsErase: true\ +*ptyInitialErase: true +/!*allowWindowOps: false/a\ +*allowWindowOps: true\ +*activeIcon: true diff --git a/package/xterm.spec b/package/xterm.spec new file mode 100644 index 0000000..9b0d69f --- /dev/null +++ b/package/xterm.spec @@ -0,0 +1,175 @@ +# $XTermId: xterm.spec,v 1.5 2010/10/24 21:20:10 tom Exp $ +Summary: A text-based Web browser +Name: xterm +Version: dev +Release: 266 +License: X11 +Group: Applications/Internet +Source: xterm-%{release}.tgz +# URL: http://invisible-island.net/xterm/ +Provides: x-terminal-emulator + +%description +xterm is the standard terminal emulator for the X Window System. +It provides DEC VT102 and Tektronix 4014 compatible terminals for +programs that cannot use the window system directly. This version +implements ISO/ANSI colors, Unicode, and most of the control sequences +used by DEC VT220 terminals. + +This package provides four commands: + a) xterm, which is the actual terminal emulator + b) uxterm, which is a wrapper around xterm which sets xterm to use UTF-8 + encoding when the user's locale supports this, + c) koi8rxterm, a wrapper similar to uxterm for locales that use the + KOI8-R character set, and + d) resize. + +A complete list of control sequences supported by the X terminal emulator +is provided in /usr/share/doc/xterm. + +The xterm program uses bitmap images provided by the xbitmaps package. + +Those interested in using koi8rxterm will likely want to install the +xfonts-cyrillic package as well. + +%prep + +%define my_suffix -dev + +%define desktop_vendor dickey +%define desktop_utils %(if which desktop-file-install 2>&1 >/dev/null ; then echo "yes" ; fi) + +%define apps_shared %(test -d /usr/share/X11/app-defaults && echo 1 || echo 0) +%define apps_syscnf %(test -d /etc/X11/app-defaults && echo 1 || echo 0) + +%if %{apps_shared} +%define _xresdir %{_datadir}/X11/app-defaults +%else +%define _xresdir %{_sysconfdir}/X11/app-defaults +%endif + +%define _iconsdir %{_datadir}/icons +%define _pixmapsdir %{_datadir}/pixmaps +%define my_docdir %{_datadir}/doc/xterm%{my_suffix} + +%setup -q -n xterm-%{release} + +%build +CPPFLAGS="-DMISC_EXP -DEXP_HTTP_HEADERS" \ +%configure \ + --target %{_target_platform} \ + --prefix=%{_prefix} \ + --bindir=%{_bindir} \ + --datadir=%{_datadir} \ + --mandir=%{_mandir} \ +%if "%{my_suffix}" != "" + --program-suffix=%{my_suffix} \ + --without-xterm-symlink \ +%endif + --enable-256-color \ + --enable-88-color \ + --enable-dabbrev \ + --enable-dec-locator \ + --enable-exec-xterm \ + --enable-hp-fkeys \ + --enable-load-vt-fonts \ + --enable-logfile-exec \ + --enable-logging \ + --enable-mini-luit \ + --enable-paste64 \ + --enable-rectangles \ + --enable-sco-fkeys \ + --enable-tcap-fkeys \ + --enable-tcap-query \ + --enable-toolbar \ + --enable-wide-chars \ + --enable-xmc-glitch \ + --with-app-defaults=%{_xresdir} \ + --with-icondir=%{_pixmapsdir} \ + --with-own-terminfo=%{_datadir}/terminfo \ + --with-terminal-type=xterm-new \ + --with-utempter +make + +chmod u+w XTerm.ad +cat >>XTerm.ad <<EOF +*backarrowKeyIsErase: true +*ptyInitialErase: true +EOF +ls -l *.ad + +%install +rm -rf $RPM_BUILD_ROOT + +# Usually do not use install-ti, since that will conflict with ncurses. +make install-bin install-man install-app install-icon \ +%if "%{install_ti}" == "yes" + install-ti \ +%endif + DESTDIR=$RPM_BUILD_ROOT \ + TERMINFO=%{_datadir}/terminfo + + mkdir -p $RPM_BUILD_ROOT%{my_docdir} + cp \ + ctlseqs.txt \ + README.i18n \ + THANKS \ + xterm.log.html \ + $RPM_BUILD_ROOT%{my_docdir}/ + + cp -r vttests \ + $RPM_BUILD_ROOT%{my_docdir}/ + + # The scripts are readable, but not executable, to let find-requires + # know that they do not depend on Perl packages. + chmod 644 $RPM_BUILD_ROOT%{my_docdir}/vttests/* + +%if "%{desktop_utils}" == "yes" +for p in *.desktop +do + sed -i \ + -e 's/Categories=System;/Categories=Application;Utility;/' \ + -e 's/^\\(Name=.*\\)/\\1%{my_suffix}/' \ + -e 's/^\\(Exec=.*\\)/\\1%{my_suffix}/' \ + $p +done + +make install-desktop \ + DESKTOP_FLAGS="--vendor='%{desktop_vendor}' --dir $RPM_BUILD_ROOT%{_datadir}/applications" + +test -n "%{my_suffix}" && \ +( cd $RPM_BUILD_ROOT%{_datadir}/applications + for p in *.desktop + do + mv $p `basename $p .desktop`%{my_suffix}.desktop + done +) +%endif + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%{_bindir}/koi8rxterm%{my_suffix} +%{_bindir}/xterm%{my_suffix} +%{_bindir}/uxterm%{my_suffix} +%{_bindir}/resize%{my_suffix} +%{_mandir}/*/* +%{my_docdir}/* +%{_pixmapsdir}/xterm*.xpm +%{_xresdir}/*XTerm* + +%if "%{install_ti}" == "yes" +%{_datadir}/terminfo/* +%endif + +%if "%{desktop_utils}" == "yes" +%config(missingok) %{_datadir}/applications/%{desktop_vendor}-xterm%{my_suffix}.desktop +%config(missingok) %{_datadir}/applications/%{desktop_vendor}-uxterm%{my_suffix}.desktop +%endif + +%changelog + +* Fri Oct 22 2010 Thomas E. Dickey +- initial version. diff --git a/version.h b/version.h index a234208..2efdc0a 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ /* - * $XTermId: version.h,v 1.323 2010/10/22 00:54:53 tom Exp $ + * $XTermId: version.h,v 1.324 2010/10/22 20:47:32 tom Exp $ * ---------------------------------------------------------------------------- * this file is part of xterm * @@ -39,7 +39,7 @@ * version of X to which this version of xterm has been built. The number in * parentheses is my patch number (Thomas E. Dickey). */ -#define XTERM_PATCH 265 +#define XTERM_PATCH 266 #ifndef __vendorversion__ -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1pb5jt-0004v2...@alioth.debian.org