X Strike Force X.Org X11 SVN commit: r555 - branches/6.9/debian
Author: dnusinow
Date: 2005-08-25 12:24:34 -0500 (Thu, 25 Aug 2005)
New Revision: 555
Removed:
branches/6.9/debian/xterm.README.Debian
branches/6.9/debian/xterm.doc-base
branches/6.9/debian/xterm.docs
branches/6.9/debian/xterm.install
branches/6.9/debian/xterm.menu
branches/6.9/debian/xterm.postinst.in
branches/6.9/debian/xterm.preinst.in
branches/6.9/debian/xterm.prerm.in
Modified:
branches/6.9/debian/changelog
branches/6.9/debian/control
branches/6.9/debian/rules
Log:
* Remove xterm references. Upstream is no longer shipping it in the monolith
and we've been planning to move to Thomas Dickey's releases as our
canonical upstream anyway.
Modified: branches/6.9/debian/changelog
===================================================================
--- branches/6.9/debian/changelog 2005-08-25 14:42:34 UTC (rev 554)
+++ branches/6.9/debian/changelog 2005-08-25 17:24:34 UTC (rev 555)
@@ -1,6 +1,9 @@
xorg-x11 (6.9.0.dfsg.1-0pre1+SVN) UNRELEASED; urgency=low
[ David Nusinow ]
+ * Remove xterm references. Upstream is no longer shipping it in the monolith
+ and we've been planning to move to Thomas Dickey's releases as our
+ canonical upstream anyway.
* libdps is dead upstream. Remove all traces of it from our builds
* Radically change the way we build xserver-xorg-dbg. We no longer
separately build a static version, but instead build a normal modular
Modified: branches/6.9/debian/control
===================================================================
--- branches/6.9/debian/control 2005-08-25 14:42:34 UTC (rev 554)
+++ branches/6.9/debian/control 2005-08-25 17:24:34 UTC (rev 555)
@@ -2585,36 +2585,6 @@
.
This package supersedes the xbooks package in older versions of Debian.
-Package: xterm
-Architecture: any
-Depends: xlibs-data, ${shlibs:Depends}, ${misc:Depends}
-Recommends: xutils
-Suggests: xfonts-cyrillic
-Conflicts: xbase (<< 3.3.2.3a-2), suidmanager (<< 0.50)
-Replaces: xbase (<< 3.3.2.3a-2)
-Provides: x-terminal-emulator
-Description: X terminal emulator
- xterm is a 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 and most of
- the control sequences used by DEC VT220 terminals.
- .
- 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; 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.
- .
- The xterm program uses bitmap images provided by the xlibs-data package.
- .
- Those interested in using koi8rxterm will likely want to install the
- xfonts-cyrillic package as well.
-
Package: xutils
Architecture: any
Depends: x11-common (>= 6.8.1), cpp, ${shlibs:Depends}, ${misc:Depends}
@@ -2732,7 +2702,7 @@
Package: x-window-system
Architecture: all
-Depends: x-window-system-core, lbxproxy, proxymngr, twm, xdm, xfs, xfwp, xnest, xprint, xterm, xvfb
+Depends: x-window-system-core, lbxproxy, proxymngr, twm, xdm, xfs, xfwp, xnest, xprint, xvfb
Description: X Window System
This metapackage provides substantially all the components of the X Window
System as developed by the X.Org Project, as well as a set of historically
Modified: branches/6.9/debian/rules
===================================================================
--- branches/6.9/debian/rules 2005-08-25 14:42:34 UTC (rev 554)
+++ branches/6.9/debian/rules 2005-08-25 17:24:34 UTC (rev 555)
@@ -259,7 +259,6 @@
rm -rf imports
dh_clean debian/local/xserver-wrapper \
debian/local/FAQ \
- debian/local/xterm.faq.gz \
debian/shlibs.local \
debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new \
debian/po/pothead
@@ -335,13 +334,6 @@
debian/local/xserver-wrapper: debian/local/xserver-wrapper.c
$(CC) -Wall -g $(SERVER_WRAPPER_OPT) -o $@ $<
-# Generate plain text XTerm FAQ from HTML.
-debian/local/xterm.faq.gz: debian/local/xterm.faq.html
- $(HTML2TEXT) $< >debian/local/xterm.faq
- # dh_compress doesn't recognize this file extension, so we must
- # compress it manually.
- gzip -9f debian/local/xterm.faq
-
# We deviate from Debian convention when it comes to the "build" target,
# because there are parts of the build tree that are used only for
# architecture-independent packages and which are time-consuming to deal with.
@@ -359,7 +351,7 @@
.PHONY: real-build
stampdir_targets+=build
real-build: $(STAMP_DIR)/build
-$(STAMP_DIR)/build: $(STAMP_DIR)/setup $(STAMP_DIR)/genscripts debian/local/FAQ debian/local/xserver-wrapper debian/local/xterm.faq.gz
+$(STAMP_DIR)/build: $(STAMP_DIR)/setup $(STAMP_DIR)/genscripts debian/local/FAQ debian/local/xserver-wrapper
ifndef test_rules
$(MAKE) -C $(SOURCE_TREE) WORLDOPTS="" IMAKE_DEFINES="$(IMAKE_DEFINES)" World
else
@@ -448,15 +440,6 @@
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
- install -m 644 debian/local/KOI8RXTerm $(DEBTREEDIR)/etc/X11/app-defaults
- # Install manual page for uxterm.
- install -m 644 debian/local/uxterm.1x $(DEBTREEDIR)/usr/X11R6/man/man1
install -m 755 debian/local/xdm/* $(DEBTREEDIR)/etc/X11/xdm
install -m 644 debian/local/xdm.options $(DEBTREEDIR)/etc/X11/xdm
install -m 644 debian/local/xdm.options.5 $(DEBTREEDIR)/usr/share/man/man5
@@ -644,8 +627,6 @@
dh_fixperms
chown root:root debian/xserver-common/usr/X11R6/bin/X
chmod ug+s debian/xserver-common/usr/X11R6/bin/X
- chown :utmp debian/xterm/usr/X11R6/bin/xterm
- chmod g+s debian/xterm/usr/X11R6/bin/xterm
dh_installdeb
dh_shlibdeps -Nlibdps1 -Nlibx11-6 -l$(DEBTREEDIR)/usr/lib -l$(DEBTREEDIR)/usr/X11R6/lib --exclude=usr/X11R6/lib/modules
dh_shlibdeps -plibdps1 -l$(DEBTREEDIR)/usr/lib -l$(DEBTREEDIR)/usr/X11R6/lib -- -Ldebian/libdps1.shlibs.local
Deleted: branches/6.9/debian/xterm.README.Debian
===================================================================
--- branches/6.9/debian/xterm.README.Debian 2005-08-25 14:42:34 UTC (rev 554)
+++ branches/6.9/debian/xterm.README.Debian 2005-08-25 17:24:34 UTC (rev 555)
@@ -1,50 +0,0 @@
-Debian README for xterm package
-===============================
-
-Newcomers to the X Window System should first read the Debian X FAQ
-(Frequently Asked Questions list): /usr/share/doc/x11-common/FAQ.gz.
-You can view this file with your favorite pager program after decompressing
-it. For example:
- $ zcat /usr/share/doc/x11-common/FAQ.gz | pager
-
-As of version 3.3.4-1, xterm logs to the wtmp and lastlog files. If you do
-not have a utmp group on your system, xterm will be installed setuid root
-instead of setgid utmp. xterm drops its root privileges after it
-initializes, so if it is setuid this can result in corrupt wtmp entries.
-The best thing to do is make a utmp group in /etc/group, or upgrade to
-version 2.0.3.4 or later of the base-passwd package, so that you have a
-utmp group.
-
-The xterm terminal type on a Debian system is an alias for xterm-debian.
-This means that "xterm" and "xterm-debian" are interchangeable as values of
-the $TERM environment variable in the shell. Since the xterm-debian type
-is typically not found on non-Debian systems, xterm is used as the system
-default.
-
-The terminal description for xterm-debian differs from that of
-xterm-xorg in exactly two respects:
- 1. kbs is defined as ^? (ASCII 127), not ^H (ASCII 8)
- 2. kdch1 is defined as the sequence: ^[ [ 3 ~ (no spaces, and ^[ is ASCII
- 27, a.k.a ESCAPE) instead of ^? (ASCII 127)
-^[[3~ is the DEC VT220 escape sequence for the keypad delete key (not the
-numeric keypad, the one with Page Up, Page Down, etc. on a PC keyboard).
-DEC VT100's, the text terminal wich xterm was designed to emulate, had no
-keypad delete key. ^[[3~ is also what the Linux console terminal type
-generates for the keypad delete key. Note that the terminal definitions
-that a Debian system uses are in the ncurses-term package, not in the xterm
-package itself, though the (pre-compiled) terminfo and termcap files that
-Debian uses may be found in the xterm documentation directory,
-/usr/share/doc/xterm. People interested in reading further to stock up
-ammo for their backspace/delete and terminal type wars should consult Tom
-Dickey's (current maintainer of the xterm source code) FAQ, available in
-the file /usr/share/doc/xterm/xterm.faq{html,text.gz} and the website
-<http://vt100.net>.
-
-The default keymappings for xterm are different than they are upstream to
-comply with the Debian Keyboard Policy and make xterm's behavior more
-consistent with the Linux virtual console (and therefore with the behavior
-of DEC VT 220 terminals).
-
-$Id$
-
-vim:set ai et sts=4 sw=4 tw=80:
Deleted: branches/6.9/debian/xterm.doc-base
===================================================================
--- branches/6.9/debian/xterm.doc-base 2005-08-25 14:42:34 UTC (rev 554)
+++ branches/6.9/debian/xterm.doc-base 2005-08-25 17:24:34 UTC (rev 555)
@@ -1,14 +0,0 @@
-Document: xterm-faq
-Title: XTerm Frequently Asked Questions (FAQ)
-Author: Thomas Dickey
-Abstract: This document provides answers to frequently asked questions
- about the XTerm terminal emulator as it ships with the X.Org distribution
- of the X Window System.
-Section: XShells
-
-Format: text
-Files: /usr/share/doc/xterm/xterm.faq.gz
-
-Format: HTML
-Index: /usr/share/doc/xterm/xterm.faq.html
-Files: /usr/share/doc/xterm/xterm.faq.html
Deleted: branches/6.9/debian/xterm.docs
===================================================================
--- branches/6.9/debian/xterm.docs 2005-08-25 14:42:34 UTC (rev 554)
+++ branches/6.9/debian/xterm.docs 2005-08-25 17:24:34 UTC (rev 555)
@@ -1,4 +0,0 @@
-build-tree/xc/programs/xterm/README.i18n
-build-tree/xc/programs/xterm/xterm.log.html
-debian/local/xterm.faq.html
-debian/local/xterm.faq.gz
Deleted: branches/6.9/debian/xterm.install
===================================================================
--- branches/6.9/debian/xterm.install 2005-08-25 14:42:34 UTC (rev 554)
+++ branches/6.9/debian/xterm.install 2005-08-25 17:24:34 UTC (rev 555)
@@ -1,6 +0,0 @@
-etc/X11/app-defaults/KOI8RXTerm
-usr/X11R6/bin/koi8rxterm
-usr/X11R6/bin/lxterm
-usr/X11R6/man/man1/koi8rxterm.1x
-usr/X11R6/man/man1/lxterm.1x
-usr/X11R6/man/man1/uxterm.1x
Deleted: branches/6.9/debian/xterm.menu
===================================================================
--- branches/6.9/debian/xterm.menu 2005-08-25 14:42:34 UTC (rev 554)
+++ branches/6.9/debian/xterm.menu 2005-08-25 17:24:34 UTC (rev 555)
@@ -1,14 +0,0 @@
-# $Id$
-
-?package(xterm):\
- needs="x11"\
- section="XShells"\
- longtitle="XTerm: terminal emulator for X"\
- title="XTerm"\
- command="xterm"
-?package(xterm):\
- needs="x11"\
- section="XShells"\
- longtitle="XTerm: terminal emulator for X with Unicode support"\
- title="XTerm (Unicode)"\
- command="uxterm"
Deleted: branches/6.9/debian/xterm.postinst.in
===================================================================
--- branches/6.9/debian/xterm.postinst.in 2005-08-25 14:42:34 UTC (rev 554)
+++ branches/6.9/debian/xterm.postinst.in 2005-08-25 17:24:34 UTC (rev 555)
@@ -1,41 +0,0 @@
-#!/bin/sh
-# Debian xterm package post-installation script
-# Copyright 1998-2001, 2003, 2004 Branden Robinson.
-# Licensed under the GNU General Public License, version 2. See the file
-# /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 630 2003-10-07 21:21:20Z branden $
-
-set -e
-
-THIS_PACKAGE=xterm
-THIS_SCRIPT=postinst
-
-#INCLUDE_SHELL_LIB#
-
-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.1.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.1.gz
-
-update-alternatives --install /usr/bin/x-terminal-emulator \
- x-terminal-emulator /usr/X11R6/bin/koi8rxterm 20 --slave \
- /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz \
- /usr/X11R6/man/man1/koi8rxterm.1.gz
-
-update-alternatives --install /usr/bin/x-terminal-emulator \
- 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/lxterm.1.gz
-
-#DEBHELPER#
-
-exit 0
-
-# vim:set ai et sts=2 sw=2 tw=0:
Deleted: branches/6.9/debian/xterm.preinst.in
===================================================================
--- branches/6.9/debian/xterm.preinst.in 2005-08-25 14:42:34 UTC (rev 554)
+++ branches/6.9/debian/xterm.preinst.in 2005-08-25 17:24:34 UTC (rev 555)
@@ -1,31 +0,0 @@
-#!/bin/sh
-# Debian xterm package pre-installation script
-# Copyright 2003, 2004 Branden Robinson.
-# Licensed under the GNU General Public License, version 2. See the file
-# /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 513 2003-09-12 16:10:27Z branden $
-
-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
- fi
- fi
-fi
-
-#DEBHELPER#
-
-exit 0
-
-# vim:set ai et sts=2 sw=2 tw=0:
Deleted: branches/6.9/debian/xterm.prerm.in
===================================================================
--- branches/6.9/debian/xterm.prerm.in 2005-08-25 14:42:34 UTC (rev 554)
+++ branches/6.9/debian/xterm.prerm.in 2005-08-25 17:24:34 UTC (rev 555)
@@ -1,28 +0,0 @@
-#!/bin/sh
-# Debian xterm package pre-removal script
-# Copyright 1998, 1999, 2004 Branden Robinson.
-# Licensed under the GNU General Public License, version 2. See the file
-# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
-# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
-
-# $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/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#
-
-exit 0
-
-# vim:set ai et sts=2 sw=2 tw=0:
Reply to: