xinit: Changes to 'debian-unstable'
debian/changelog | 7 --
debian/control | 2
debian/local/Xsession | 128 ------------------------------------------
debian/local/Xsession.options | 9 --
debian/local/xsession | 110 ------------------------------------
debian/xinit.install | 2
6 files changed, 5 insertions(+), 253 deletions(-)
New commits:
commit d6542f512bc43d109e0775d706191b0469c981e7
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date: Sat May 19 01:58:12 2007 +0300
debian/control: add Conflicts/Replaces.
debian/local,xinit.install: remove xsession-files, leftovers from the ubuntu package.
diff --git a/debian/changelog b/debian/changelog
index a1bdcec..127c3d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,16 +5,15 @@ xinit (1.0.2-1) UNRELEASED; urgency=low
- Rename Package and Source.
- Remove unnecessary Build-Deps.
- Modify description.
+ - Conflicts/Replaces: xbase-clients (<= 1:7.2.ds2-3) to make
+ upgrades smoother.
* debian/copyright: Leave only copyright notices that relate to
this package.
* debian/xinit.install, rules: Edit to reflect new packaging.
* debian/xinit.dirs: Remove.
- * debian/local/: Add Xsession, Xsession.options and xsession from
- the Ubuntu package. Needs changing xorg.
- TODO: review the files.
* debian/patches: Delete patches which do not relate to this package.
- -- Timo Aaltonen <tjaalton@cc.hut.fi> Thu, 17 May 2007 15:34:56 +0300
+ -- Timo Aaltonen <tjaalton@cc.hut.fi> Sat, 19 May 2007 01:55:32 +0300
xbase-clients (1:7.2.ds2-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index d689377..bc04d6f 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,8 @@ Package: xinit
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
Pre-Depends: x11-common (>= 1:7.0.0)
+Conflicts: xbase-clients (<= 1:7.2.ds2-3)
+Replaces: xbase-clients (<= 1:7.2.ds2-3)
Description: X server initialisation tool
xinit and startx are programs which facilitate starting an X server, and
loading a base X session.
diff --git a/debian/local/Xsession b/debian/local/Xsession
deleted file mode 100755
index 85481ff..0000000
--- a/debian/local/Xsession
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/bin/sh
-#
-# /etc/X11/Xsession
-#
-# global Xsession file -- used by display managers and xinit (startx)
-
-# $Id: Xsession 1507M 2004-09-13 07:36:26Z (local) $
-
-set -e
-
-PROGNAME=Xsession
-
-message () {
- # pretty-print messages of arbitrary length; use xmessage if it
- # is available and $DISPLAY is set
- MESSAGE="$PROGNAME: $*"
- echo "$MESSAGE" | fold -s -w ${COLUMNS:-80} >&2
- if [ -n "$DISPLAY" ] && which xmessage > /dev/null 2>&1; then
- echo "$MESSAGE" | fold -s -w ${COLUMNS:-80} | xmessage -center -file -
- fi
-}
-
-message_nonl () {
- # pretty-print messages of arbitrary length (no trailing newline); use
- # xmessage if it is available and $DISPLAY is set
- MESSAGE="$PROGNAME: $*"
- echo -n "$MESSAGE" | fold -s -w ${COLUMNS:-80} >&2;
- if [ -n "$DISPLAY" ] && which xmessage > /dev/null 2>&1; then
- echo -n "$MESSAGE" | fold -s -w ${COLUMNS:-80} | xmessage -center -file -
- fi
-}
-
-errormsg () {
- # exit script with error
- message "$*"
- exit 1
-}
-
-internal_errormsg () {
- # exit script with error; essentially a "THIS SHOULD NEVER HAPPEN" message
- # One big call to message() for the sake of xmessage; if we had two then
- # the user would have dismissed the error we want reported before seeing the
- # request to report it.
- errormsg "$*" \
- "Please report the installed version of the \"xfree86-common\"" \
- "package and the complete text of this error message to" \
- "<debian-x@lists.debian.org>."
-}
-
-run_parts () {
- # until run-parts --noexec is implemented
- if [ -z "$1" ]; then
- internal_errormsg "run_parts() called without an argument."
- fi
- if [ ! -d "$1" ]; then
- internal_errormsg "run_parts() called, but \"$1\" does not exist or is" \
- "not a directory."
- fi
- for F in $(ls $1); do
- if expr "$F" : '[[:alnum:]_-]\+$' > /dev/null 2>&1; then
- if [ -f "$1/$F" ]; then
- echo "$1/$F"
- fi
- fi
- done
-}
-
-# initialize variables for use by all session scripts
-
-OPTIONFILE=/etc/X11/Xsession.options
-
-SYSRESOURCES=/etc/X11/Xresources
-USRRESOURCES=$HOME/.Xresources
-
-SYSSESSIONDIR=/etc/X11/Xsession.d
-USERXSESSION=$HOME/.xsession
-ALTUSERXSESSION=$HOME/.Xsession
-ERRFILE=$HOME/.xsession-errors
-
-# attempt to create an error file; abort if we cannot
-if touch "$ERRFILE" 2> /dev/null && [ -w "$ERRFILE" ] &&
- [ ! -L "$ERRFILE" ]; then
- chmod 600 "$ERRFILE"
-elif ERRFILE=$(tempfile 2> /dev/null); then
- if ! ln -sf "$ERRFILE" "${TMPDIR:=/tmp}/xsession-$USER"; then
- message "warning: unable to symlink \"$TMPDIR/xsession-$USER\" to" \
- "\"$ERRFILE\"; look for session log/errors in" \
- "\"$TMPDIR/xsession-$USER\"."
- fi
-else
- errormsg "unable to create X session log/error file; aborting."
-fi
-
-exec >>"$ERRFILE" 2>&1
-
-echo "$PROGNAME: X session started for $LOGNAME at $(date)"
-
-# sanity check; is our session script directory present?
-if [ ! -d "$SYSSESSIONDIR" ]; then
- errormsg "no \"$SYSSESSIONDIR\" directory found; aborting."
-fi
-
-# Attempt to create a file of non-zero length in /tmp; a full filesystem can
-# cause mysterious X session failures. We do not use touch, :, or test -w
-# because they won't actually create a file with contents. We also let standard
-# error from tempfile and echo go to the error file to aid the user in
-# determining what went wrong.
-WRITE_TEST=$(tempfile)
-if ! echo "*" >>"$WRITE_TEST"; then
- message "warning: unable to write to ${WRITE_TEST%/*}; X session may exit" \
- "with an error"
-fi
-rm -f "$WRITE_TEST"
-
-# use run-parts to source every file in the session directory; we source
-# instead of executing so that the variables and functions defined above
-# are available to the scripts, and so that they can pass variables to each
-# other
-SESSIONFILES=$(run_parts $SYSSESSIONDIR)
-if [ -n "$SESSIONFILES" ]; then
- for SESSIONFILE in $SESSIONFILES; do
- . $SESSIONFILE
- done
-fi
-
-exit 0
-
-# vim:set ai et sts=2 sw=2 tw=80:
diff --git a/debian/local/Xsession.options b/debian/local/Xsession.options
deleted file mode 100644
index b5cb024..0000000
--- a/debian/local/Xsession.options
+++ /dev/null
@@ -1,9 +0,0 @@
-# /etc/X11/Xsession.options
-#
-# configuration options for /etc/X11/Xsession
-# See Xsession.options(5) for an explanation of the available options.
-allow-failsafe
-allow-user-resources
-allow-user-xsession
-use-ssh-agent
-use-session-dbus
diff --git a/debian/local/xsession b/debian/local/xsession
deleted file mode 100644
index 80c7caa..0000000
--- a/debian/local/xsession
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/bin/sh
-
-# Sample .xsession file, by Branden Robinson
-# This file is in the public domain.
-# To use this file:
-# cp -i /usr/share/doc/xorg-common/examples/xsession $HOME/.xsession
-
-# Users are strongly encouraged to edit this file to their tastes.
-
-# Note that the $HOME/.xsession file only has effect if the
-# "allow-user-xsession" option is set in /etc/X11/Xsession.options. See
-# Xsession.options(5) for more information ("man 5 Xsession.options").
-
-# NOTE: This example file assumes that the xbase-clients, xterm, and twm
-# packages are installed. If they are not, the commands that reference them
-# will fail. In the case of twm (see below), this will cause the script to
-# exit and the X session to end almost as soon as it begins.
-
-# The X session file, in this case $HOME/.xsession, is a shell script that
-# contains a list of things to do (programs to run and so forth) every time
-# X starts for a particular user. It allows you to personalize your X
-# environment and get down to business (or play) faster. If there are
-# things you want done every time you start X (or log into a machine using
-# XDM), rather than doing them by hand every time by running commands from
-# a terminal window, you can place them here, in the .xsession file, and
-# they will be run automatically, every time.
-
-# There are essentially three types of commands in an .xsession file; we
-# usually fire up some persistent X clients, like xterms, a clock, a biff
-# program of some sort, etc., which we expect to stick around more or less
-# for the duration of our X session. These commands will need to be
-# backgrounded, or "amped off", otherwise your X session will "stay" on
-# that command until it exits. The second type of command is relatively
-# instantaneous in effect, or we *desire* the X sesson to stop until that
-# command exits -- we don't background those. Finally, at the end of our
-# .xsession file we generally "exec" a window manager. That replaces the
-# running .xsession shell script with the window manager process, and when
-# the window manager exits, the X session is over (the user returns to the
-# virtual console or the XDM login screen).
-
-# Before starting, I should mention that all of the commands used in this
-# example have manual pages ("man xclock", for instance) and reading those
-# will help you a long way towards getting things tweaked just the way you
-# like them.
-
-# You should ensure that any variables that you reference in this file are
-# defined. Generally, for sessions started with startx this is not necessary,
-# because startx itself is run from a shell prompt, so the shell's startup
-# files (like .profile and .bashrc for bash, or .login and .cshrc for csh
-# and tcsh) have already been run. But for X sessions started by xdm, these
-# startup files are not run (which makes sense, because xdm is not a shell),
-# and this shell script is not run in an environment with those variables
-# available. The best way to handle both of these cases is with a structure
-# like the following:
-#
-# [ "$MYVARIABLE" ] || MYVARIABLE=value
-#
-# The above command only sets MYVARIABLE to value if MYVARIABLE is not defined
-# (or null). See the manual pages for bash(1) and [(1) (that's right, there
-# is a command called left-bracket -- pronounced "test") and/or a good book on
-# Unix shell programming for more information.
-
-# For our first real command, let's have a one that is not backgrounded; we'll
-# show the system's message of the day with the xmessage command (which is in
-# the xcontrib package). This may be very useful on multi-user machines where
-# the /etc/motd file is actually used for announcements; it may be less useful
-# on a personal computer that is minimally shared. If we amped this off,
-# then the message box would come up and execution would proceed (in other
-# words, the remaining commands in this .xsession script will go ahead and
-# execute while the xmessage window in still on the screen). Without being
-# backgrounded, this sort of forces an acknowledgement of the message before
-# proceeding, but has a timeout of sixty seconds, after which the message will
-# dismiss itself, in case the machine is slow and the user has wandered
-# off just after logging in (if it takes a while to start the remaining X
-# clients, he'll probably want to come back with them up and running).
-xmessage -nearmouse -file /etc/motd -timeout 60 -button Continue
-
-# The following command simply sets the screen background (often called the
-# "desktop" in other winodwing systems, but in X the proper term is "root
-# window") to blue, and has relatively instantaneous effect. We could amp it
-# off, but that would be pretty pointless, since this command takes almost no
-# time to run. If you have something else that will do something with the
-# root window (xloadimage, floatbg, xearth, etc.), you'll probably want to
-# comment out or delete the next line.
-xsetroot -solid skyblue
-
-# Let's get a little load average action going...
-# It is important to learn how the geometry option/resource works -- the first
-# two numbers are the dimensions (width and height, in pixels), and the next
-# two are position parameters as offsets from the edges of the screen. See
-# the X manpage ("man X"), section "GEOMETRY SPECIFICATIONS" for more
-# information.
-xload -bg black -fg green -hl red -update 5 -geometry 170x100+70+0 &
-
-# Something to check the mail...
-xbiff -bg black -fg green -geometry 100x50+255+0 &
-
-# Something to keep track of time...
-xclock -bg black -fg green -update 1 -digital -geometry 150x40-0+0 &
-
-# And finally, the most important part of any GUI, the command-line interface.
-# Note that for xterm the geometry dimensions are expressed in character
-# cells, not pixels (e.g., 80x24).
-xterm -title "Debian GNU/Linux" -ls -geometry 80x24+70+135 &
-
-# Now execute the window manager and we'll be on our way. Most people have
-# window managers they like better than twm -- install the corresponding
-# Debian package and edit the following line appropriately if you're one of
-# them.
-exec twm
diff --git a/debian/xinit.install b/debian/xinit.install
index 966e739..84acd07 100644
--- a/debian/xinit.install
+++ b/debian/xinit.install
@@ -1,6 +1,4 @@
usr/bin/*
usr/share/man/man1/*
-debian/local/Xsession etc/X11
-debian/local/Xsession.options etc/X11
debian/local/xserverrc etc/X11/xinit
usr/lib/X11/xinit/xinitrc etc/X11/xinit
Reply to: