X Strike Force X.Org X11 SVN commit: r104 - trunk/debian
Author: dnusinow
Date: 2005-05-16 21:43:00 -0500 (Mon, 16 May 2005)
New Revision: 104
Added:
trunk/debian/xorg-common.README.Debian
trunk/debian/xorg-common.config.in
trunk/debian/xorg-common.dirs
trunk/debian/xorg-common.doc-base.debian-faq
trunk/debian/xorg-common.docs
trunk/debian/xorg-common.docs.s390
trunk/debian/xorg-common.examples
trunk/debian/xorg-common.init
trunk/debian/xorg-common.install
trunk/debian/xorg-common.links
trunk/debian/xorg-common.postinst.in
trunk/debian/xorg-common.postrm.in
trunk/debian/xorg-common.preinst.in
trunk/debian/xorg-common.templates
Modified:
trunk/debian/changelog
Log:
Adding xorg-common packaging files. .init script de-lsb-ified until Debian can support it without issues. Audited, altered, and approved by David.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-05-17 02:29:55 UTC (rev 103)
+++ trunk/debian/changelog 2005-05-17 02:43:00 UTC (rev 104)
@@ -13,6 +13,9 @@
- Re-brand XFree86 to X.Org in README
- Re-add usr/X11R6/lib/X11/fonts/encodings/large/jisx0208.1983-0.enc.gz
to xfonts-base.install
+ - Merge xfree tree xfree86-common.init in to xorg-common.init
+ - Comment out lsb stuff for now, since Debian can't guarantee it.
+ Replace logging with echo's like in xfree script.
- Re-add jisx0208.1983-0.enc.gz to MANIFEST.all's list of font encodings
until I know more about why it was removed.
Added: trunk/debian/xorg-common.README.Debian
===================================================================
--- trunk/debian/xorg-common.README.Debian 2005-05-17 02:29:55 UTC (rev 103)
+++ trunk/debian/xorg-common.README.Debian 2005-05-17 02:43:00 UTC (rev 104)
@@ -0,0 +1,90 @@
+Debian README for xfree86-common package
+========================================
+
+The xfree86-common package provides the infrastructure common to all Debian X
+installations.
+
+Newcomers to the X Window System should first read the Debian X FAQ
+(Frequently Asked Questions list): /usr/share/doc/xfree86-common/FAQ.gz.
+You can view this file with your favorite pager program after decompressing
+it. For example:
+ $ zcat /usr/share/doc/xfree86-common/FAQ.gz | pager
+
+Those who have upgraded their Debian X packages from version 3.3.2.3-2 or
+earlier (Debian 2.0), will want to read the information in
+/usr/share/doc/xfree86-common/README.Debian-upgrade.
+
+Note that as of version 3.3.6-4, support for the /etc/X11/window-managers
+file has been removed; the default window manager is now determined by
+using the Debian alternatives mechanism. See update-alternatives(8) for
+more information.
+
+Use "dpkg --print-avail <package>" to read the extended descriptions of
+the XFree86 packages and get some idea of their contents.
+
+There are three common types of X Window System installation:
+
+1) standalone X workstation -- the X server and most X clients run on the
+same physical hardware. Thus both the xlibs and xserver-common packages
+will be present.
+
+2) X terminal -- only an X server is present; all X clients are run on
+remote hardware. The xlibs package need not be present, but the
+xserver-common package will be. For Debian policy reasons, xlibs is of
+"standard" priority and thus most likely will be installed, unless the
+administrator has taken deliberate steps to remove it. Nevertheless, if
+the machine in question is configured strictly as an X terminal, the X
+libraries present on the machine will not be used.
+
+3) X client server -- here the different usages of "client" and "server" in
+common computing parlance and the X sense can be somewhat confusing.
+Essentially, this is the counterpart to 2) above. This is a machine on
+which X clients run, but they are displayed only to remote machines; this
+machine's own video hardware (if any) is not used by the X Window System.
+Therefore, the xlibs package will be present (since in practice all X
+clients written in C require the X libraries), but the xserver-common
+package will not be.
+
+One can conclude from the above that any Debian machine which has anything to
+do with the X Window System will have xlibs and/or xserver-common installed.
+The xfree86-common package is the foundation on which those two packages
+themselves depend.
+
+In addition to manual pages and documentation, the xfree86-common
+package contains the following:
+
+1) the basic X directory hierarchy and symbolic links into it -- /usr/X11R6
+is the canonical location for the X Window System according to the FHS
+(Filesystem Hierarchy Standard). By providing both this hierarchy and the
+symbolic links pointing into it (/usr/bin/X11, /usr/lib/X11, et al.), any
+future changes in the filesystem location or structure of the X Window System
+can be centrally managed.
+
+2) the /etc/X11/Xresources directory, and the xfree86-common file within it
+-- historically in Debian systems, /etc/X11/Xresources has been a plain file,
+whose contents were processed by an X resource database merge (a.k.a. xrdb
+-merge) when an X session was launched (whether by startx or xdm). This
+arrangement made it difficult for other packages to specify system-wide but
+user-modifiable X resources. Now, however, /etc/X11/Xresources is a directory.
+/etc/X11/Xsession (see below) performs an xrdb -merge on each of the files
+within this directory; it is thus easy for individual packages to allow for
+system-wide user-customizable X resources. It is strongly suggested that
+packages wishing to take advantage of this place a file in /etc/X11/Xresources
+with the same name as the package in question, to prevent name collisions. The
+xfree86-common file here should be used for very high-level, global resource
+settings (such as setting the color customization, setting properties of Athena
+widgets, etc.). See the X(1) manual page for more information on X resources.
+
+3) /etc/X11/Xsession -- this is a shell script executed each time an X session
+is started, whether by startx or xdm. Since it resides in /etc, the system
+administrator is free to edit it, but for convenience some aspects of its
+behavior are easily customizable via the /etc/X11/Xsession.options file.
+See the Xsession(5) manual page for more information.
+
+4) /etc/X11/Xsession.options -- a plain text file containing configuration
+options for the /etc/X11/Xsession file. See the Xsession.options(5)
+manual page for more information.
+
+$Id: xfree86-common.README.Debian 1244 2004-04-13 22:02:31Z branden $
+
+vim:set ai et sts=4 sw=4 tw=80:
Added: trunk/debian/xorg-common.config.in
===================================================================
--- trunk/debian/xorg-common.config.in 2005-05-17 02:29:55 UTC (rev 103)
+++ trunk/debian/xorg-common.config.in 2005-05-17 02:43:00 UTC (rev 104)
@@ -0,0 +1,31 @@
+#!/bin/sh
+# Debian xfree86-common package configuration script
+# Copyright 2002, 2003 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>.
+
+# $Id: xfree86-common.config.in 1254 2004-04-14 19:14:43Z branden $
+
+set -e
+
+# source debconf library
+. /usr/share/debconf/confmodule
+
+THIS_PACKAGE=xorg-common
+THIS_SCRIPT=config
+
+#INCLUDE_SHELL_LIB#
+
+# is this an unofficial Debian package?
+if [ -z "$OFFICIAL_BUILD" ]; then
+ observe "unofficial build detected; issuing debconf note as warning"
+ run db_register xorg-common/experimental_packages \
+ xorg-common/nag
+ run db_input high xorg-common/nag
+ run db_go
+ run db_unregister xorg-common/nag
+fi
+
+exit 0
+
+# vim:set ai et sts=2 sw=2 tw=0:
Added: trunk/debian/xorg-common.dirs
===================================================================
--- trunk/debian/xorg-common.dirs 2005-05-17 02:29:55 UTC (rev 103)
+++ trunk/debian/xorg-common.dirs 2005-05-17 02:43:00 UTC (rev 104)
@@ -0,0 +1 @@
+etc/X11/Xresources
Added: trunk/debian/xorg-common.doc-base.debian-faq
===================================================================
--- trunk/debian/xorg-common.doc-base.debian-faq 2005-05-17 02:29:55 UTC (rev 103)
+++ trunk/debian/xorg-common.doc-base.debian-faq 2005-05-17 02:43:00 UTC (rev 104)
@@ -0,0 +1,14 @@
+Document: debian-x-faq
+Title: Debian X Window System Frequently Asked Questions (FAQ)
+Author: Branden Robinson
+Abstract: This document is intended to provide answers to the questions
+ most often asked by users of the X Window System on the Debian Operating
+ System.
+Section: Apps/System
+
+Format: text
+Files: /usr/share/doc/xorg-common/FAQ.gz
+
+Format: HTML
+Index: /usr/share/doc/xorg-common/FAQ.xhtml
+Files: /usr/share/doc/xorg-common/FAQ.xhtml
Added: trunk/debian/xorg-common.docs
===================================================================
--- trunk/debian/xorg-common.docs 2005-05-17 02:29:55 UTC (rev 103)
+++ trunk/debian/xorg-common.docs 2005-05-17 02:43:00 UTC (rev 104)
@@ -0,0 +1,12 @@
+build-tree/xc/programs/Xserver/hw/xfree86/CHANGELOG
+build-tree/xc/programs/Xserver/hw/xfree86/CHANGELOG.ND
+build-tree/xc/programs/Xserver/hw/xfree86/CHANGELOG.R5
+debian/changelog.Debian.old
+debian/local/FAQ
+debian/local/FAQ.xhtml
+debian/local/README.Debian-upgrade
+debian/tmp/usr/X11R6/lib/X11/doc/README
+debian/tmp/usr/X11R6/lib/X11/doc/README.dps
+debian/tmp/usr/X11R6/lib/X11/doc/README.fonts
+debian/tmp/usr/X11R6/lib/X11/doc/RELNOTES
+debian/tmp/usr/X11R6/lib/X11/doc/Versions
Added: trunk/debian/xorg-common.docs.s390
===================================================================
--- trunk/debian/xorg-common.docs.s390 2005-05-17 02:29:55 UTC (rev 103)
+++ trunk/debian/xorg-common.docs.s390 2005-05-17 02:43:00 UTC (rev 104)
@@ -0,0 +1,12 @@
+build-tree/xc/programs/Xserver/hw/xfree86/CHANGELOG
+build-tree/xc/programs/Xserver/hw/xfree86/CHANGELOG.ND
+build-tree/xc/programs/Xserver/hw/xfree86/CHANGELOG.R5
+build-tree/xc/programs/Xserver/hw/xfree86/doc/README.dps
+build-tree/xc/programs/Xserver/hw/xfree86/doc/RELNOTES
+build-tree/xc/programs/Xserver/hw/xfree86/doc/Versions
+debian/changelog.Debian.old
+debian/local/FAQ
+debian/local/FAQ.xhtml
+debian/local/README.Debian-upgrade
+debian/tmp/usr/X11R6/lib/X11/doc/README
+debian/tmp/usr/X11R6/lib/X11/doc/README.fonts
Added: trunk/debian/xorg-common.examples
===================================================================
--- trunk/debian/xorg-common.examples 2005-05-17 02:29:55 UTC (rev 103)
+++ trunk/debian/xorg-common.examples 2005-05-17 02:43:00 UTC (rev 104)
@@ -0,0 +1 @@
+debian/local/xsession
Added: trunk/debian/xorg-common.init
===================================================================
--- trunk/debian/xorg-common.init 2005-05-17 02:29:55 UTC (rev 103)
+++ trunk/debian/xorg-common.init 2005-05-17 02:43:00 UTC (rev 104)
@@ -0,0 +1,99 @@
+#!/bin/sh
+
+# Copyright 2003, 2004 Branden Robinson <branden@debian.org>.
+#
+# This is free software; you may redistribute it and/or modify
+# it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2,
+# or (at your option) any later version.
+#
+# This is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License with
+# the Debian operating system, in /usr/share/common-licenses/GPL; if
+# not, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA 02111-1307 USA
+
+# /etc/init.d/xorg-common: set up the X server and ICE socket directories
+
+set -e
+
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+SOCKET_DIR=/tmp/.X11-unix
+ICE_DIR=/tmp/.ICE-unix
+
+#. /lib/lsb/init-functions
+#. /etc/default/rcS
+
+do_restorecon () {
+ # Restore file security context (SELinux).
+ if which restorecon >/dev/null 2>&1; then
+ restorecon "$1"
+ fi
+}
+
+set_up_socket_dir () {
+ if [ "$VERBOSE" != no ]; then
+ #log_begin_msg "Setting up X server socket directory $SOCKET_DIR..."
+ echo -n "Setting up X server socket directory $SOCKET_DIR..."
+ else
+ #log_begin_msg "Setting up X server socket directory..."
+ echo -n "Setting up X server socket directory..."
+ fi
+ if [ -e $SOCKET_DIR ] && [ ! -d $SOCKET_DIR ]; then
+ mv $SOCKET_DIR $SOCKET_DIR.$$
+ fi
+ mkdir -p $SOCKET_DIR
+ chown 0:0 $SOCKET_DIR
+ chmod 1777 $SOCKET_DIR
+ do_restorecon $SOCKET_DIR
+ #log_end_msg 0
+ echo "done."
+}
+
+set_up_ice_dir () {
+ if [ "$VERBOSE" != no ]; then
+ #log_begin_msg "Setting up ICE socket directory $ICE_DIR..."
+ echo -n "Setting up ICE socket directory $ICE_DIR..."
+ else
+ #log_begin_msg "Setting up ICE socket directory..."
+ echo -n "Setting up ICE socket directory..."
+ fi
+ if [ -e $ICE_DIR ] && [ ! -d $ICE_DIR ]; then
+ mv $ICE_DIR $ICE_DIR.$$
+ fi
+ mkdir -p $ICE_DIR
+ chown 0:0 $ICE_DIR
+ chmod 1777 $ICE_DIR
+ do_restorecon $ICE_DIR
+ #log_end_msg 0
+ echo "done."
+}
+
+case "$1" in
+ start)
+ set_up_socket_dir
+ set_up_ice_dir
+ ;;
+
+ restart|reload|force-reload)
+ /etc/init.d/xorg-common start
+ ;;
+
+ stop)
+ :
+ ;;
+
+ *)
+ #log_success_msg "Usage: /etc/init.d/xorg-common {start|stop|restart|reload|force-reload}"
+ echo "Usage: /etc/init.d/xorg-common {start|stop|restart|reload|force-reload}"
+ exit 1
+ ;;
+esac
+
+exit 0
+
+# vim:set ai et sts=2 sw=2 tw=0:
Added: trunk/debian/xorg-common.install
===================================================================
--- trunk/debian/xorg-common.install 2005-05-17 02:29:55 UTC (rev 103)
+++ trunk/debian/xorg-common.install 2005-05-17 02:43:00 UTC (rev 104)
@@ -0,0 +1,17 @@
+etc/X11/Xresources/xorg-common
+etc/X11/Xsession
+etc/X11/Xsession.d/20xorg-common_process-args
+etc/X11/Xsession.d/30xorg-common_xresources
+etc/X11/Xsession.d/50xorg-common_determine-startup
+etc/X11/Xsession.d/90xorg-common_ssh-agent
+etc/X11/Xsession.d/99xorg-common_start
+etc/X11/Xsession.options
+etc/X11/rgb.txt
+usr/X11R6/man/man7/X.7x
+usr/X11R6/man/man7/X.Org.7x
+usr/X11R6/man/man7/XConsortium.7x
+usr/X11R6/man/man7/XProjectTeam.7x
+usr/X11R6/man/man7/XStandards.7x
+usr/X11R6/man/man7/Xsecurity.7x
+usr/share/man/man5/Xsession.5
+usr/share/man/man5/Xsession.options.5
Added: trunk/debian/xorg-common.links
===================================================================
--- trunk/debian/xorg-common.links 2005-05-17 02:29:55 UTC (rev 103)
+++ trunk/debian/xorg-common.links 2005-05-17 02:43:00 UTC (rev 104)
@@ -0,0 +1,4 @@
+etc/X11/rgb.txt usr/X11R6/lib/X11/rgb.txt
+usr/X11R6/bin usr/bin/X11
+usr/X11R6/include/X11 usr/include/X11
+usr/X11R6/lib/X11 usr/lib/X11
Added: trunk/debian/xorg-common.postinst.in
===================================================================
--- trunk/debian/xorg-common.postinst.in 2005-05-17 02:29:55 UTC (rev 103)
+++ trunk/debian/xorg-common.postinst.in 2005-05-17 02:43:00 UTC (rev 104)
@@ -0,0 +1,40 @@
+#!/bin/sh
+# Debian xfree86-common package post-installation script
+# Copyright 1998--2001, 2003 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>.
+# Acknowlegements to Stephen Early, Mark Eichin, and Manoj Srivastava.
+
+# $Id: xfree86-common.postinst.in 1433 2004-05-21 17:59:20Z branden $
+
+set -e
+
+THIS_PACKAGE=xorg-common
+THIS_SCRIPT=postinst
+
+#INCLUDE_SHELL_LIB#
+
+check_symlinks_and_bomb /usr/bin/X11 \
+ /usr/include/X11 \
+ /usr/lib/X11
+
+# ensure that /etc/X11/Xresources is now a directory (see preinst)
+if [ ! -d /etc/X11/Xresources ]; then
+ die "/etc/X11/Xresources is not a directory; either the package didn't ship" \
+ "the directory (a bug in the package), or dpkg failed to unpack it to" \
+ "the filesystem (a bug in dpkg)"
+fi
+
+remove_conffile_commit /etc/X11/Xsession.d/40xfree86-common_xmodmap
+
+if [ -e /etc/init.d/xorg-common ]; then
+ update-rc.d xorg-common start 70 S .
+fi
+
+#DEBHELPER#
+
+invoke-rc.d xorg-common start || true
+
+exit 0
+
+# vim:set ai et sts=2 sw=2 tw=80:
Added: trunk/debian/xorg-common.postrm.in
===================================================================
--- trunk/debian/xorg-common.postrm.in 2005-05-17 02:29:55 UTC (rev 103)
+++ trunk/debian/xorg-common.postrm.in 2005-05-17 02:43:00 UTC (rev 104)
@@ -0,0 +1,32 @@
+#!/bin/sh
+# Debian xfree86-common package post-removal script
+# Copyright 1998--2001, 2003 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>.
+# Acknowlegements to Stephen Early, Mark Eichin, and Manoj Srivastava.
+
+# $Id: xfree86-common.postrm.in 1259 2004-04-14 20:51:34Z branden $
+
+set -e
+
+THIS_PACKAGE=xorg-common
+THIS_SCRIPT=postrm
+
+#INCLUDE_SHELL_LIB#
+
+if [ "$1" = "abort-install" ] || [ "$1" = "abort-upgrade" ]; then
+ remove_conffile_rollback /etc/X11/Xsession.d/40xfree86-common_xmodmap
+fi
+
+#DEBHELPER#
+
+if [ "$1" = "purge" ]; then
+ update-rc.d xorg-common remove
+ for DIR in /etc/X11/Xresources /etc/X11/Xsession.d /etc/X11; do
+ rmdir "$DIR" 2> /dev/null || true
+ done
+fi
+
+exit 0
+
+# vim:set ai et sts=2 sw=2 tw=80:
Added: trunk/debian/xorg-common.preinst.in
===================================================================
--- trunk/debian/xorg-common.preinst.in 2005-05-17 02:29:55 UTC (rev 103)
+++ trunk/debian/xorg-common.preinst.in 2005-05-17 02:43:00 UTC (rev 104)
@@ -0,0 +1,54 @@
+#!/bin/sh
+# Debian xfree86-common package pre-installation script
+# Copyright 1998--2001, 2003 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>.
+# Acknowlegements to Stephen Early, Mark Eichin, and Manoj Srivastava.
+
+# $Id: xfree86-common.preinst.in 1044 2004-02-16 17:40:33Z branden $
+
+set -e
+
+THIS_PACKAGE=xorg-common
+THIS_SCRIPT=preinst
+
+#INCLUDE_SHELL_LIB#
+
+if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
+ # In xbase 3.3.2.3a-2 (October 1998), /etc/X11/Xresources became a directory.
+ # Prior to that, it was a conffile. Because it may have been customized by
+ # the administrator and we must avoid clobbering it, refuse to install if
+ # /etc/X11/Xresources exists and is not a directory when this package is
+ # installed.
+ if [ -e /etc/X11/Xresources ] && [ ! -d /etc/X11/Xresources ]; then
+ ERRMSG="/etc/X11/Xresources exists and is not a directory;"
+ ERRMSG="$ERRMSG the xorg-common package cannot be installed until this"
+ if [ -f /etc/X11/Xresources ]; then
+ ERRMSG="$ERRMSG file"
+ else
+ ERRMSG="$ERRMSG thing"
+ fi
+ ERRMSG="$ERRMSG is removed"
+ die "$ERRMSG"
+ fi
+
+ if dpkg --compare-versions "$2" lt "3.3.6-5"; then
+ observe "removing obsolete /etc/X11/window-managers file"
+ rm -f /etc/X11/window-managers
+ fi
+
+ if dpkg --compare-versions "$2" lt "4.1.0-7"; then
+ remove_conffile_prepare /etc/X11/Xsession.d/40xfree86-common_xmodmap \
+ b370a42803aec72f27da67ca6a225402
+ fi
+
+ check_symlinks_and_warn /usr/bin/X11 \
+ /usr/include/X11 \
+ /usr/lib/X11
+fi
+
+#DEBHELPER#
+
+exit 0
+
+# vim:set ai et sts=2 sw=2 tw=0:
Added: trunk/debian/xorg-common.templates
===================================================================
--- trunk/debian/xorg-common.templates 2005-05-17 02:29:55 UTC (rev 103)
+++ trunk/debian/xorg-common.templates 2005-05-17 02:43:00 UTC (rev 104)
@@ -0,0 +1,24 @@
+Template: xorg-common/experimental_packages
+Type: note
+_Description: experimental version of XFree86 packages
+ You are using an experimental version of XFree86 packages for Debian. Please
+ do not file bugs with the Debian Bug Tracking System against this version of
+ the packages, since they have not been released to the Debian distribution
+ yet.
+ .
+ If you experience problems with these packages or would like to submit
+ patches, please send mail to the Debian X mailing list. You can read more
+ about this mailing list on the World Wide Web:
+ http://lists.debian.org/debian-x/
+ .
+ If you do not want to be running experimental X packages, you need to do two
+ things:
+ 1) Ensure that you do not have experimental package repositiories in
+ your /etc/apt/sources.list file;
+ 2) Instruct apt to downgrade XFree86 to an appropriate released version;
+ you can do this by appending a package suite name to the package name
+ with "apt-get" -- for example:
+ apt-get install xfree86-common/unstable
+ or
+ apt-get install xfree86-common/stable
+ You may need to specify downgrades for several packages.
Reply to: