diff -Nru xorg-7.5+3ubuntu1/debian/changelog xorg-7.5+5ubuntu1/debian/changelog --- xorg-7.5+3ubuntu1/debian/changelog 2010-03-09 21:15:02.000000000 +0000 +++ xorg-7.5+5ubuntu1/debian/changelog 2010-04-01 12:27:38.000000000 +0100 @@ -1,3 +1,32 @@ +xorg (1:7.5+5ubuntu1) lucid; urgency=low + + * Merge from Debian unstable. + + -- Timo Aaltonen Thu, 01 Apr 2010 14:27:16 +0300 + +xorg (1:7.5+5) unstable; urgency=low + + * Fix typo in Xsession.d/50x11-common_determine-startup, closes: #573899. + * Bump Standards-Version to 3.8.4, no changes needed. + + -- Brice Goglin Sun, 14 Mar 2010 22:45:09 +0100 + +xorg (1:7.5+4) unstable; urgency=low + + * Add Xreset and Xreset.d support, closes: #230422. + * Improve startup speed of Xsession.d scripts by eliminating all unnecessary + external program calls, thanks Martin Pitt, closes: #570447. + - In 20x11-common_process-args, cat $OPTIONFILE once into a variable and + use POSIX variable substitution in all scripts instead of calling grep + for every single test. + - Use shell built in "type" instead of external "which" to test for + programs. + - 30x11-common_xresources: Swap the order of tests to keep the most + unlikely (like "~/.Xresources exists") outside, to avoid running the + other tests (like "xrdb exists") on systems which don't use Xresources. + + -- Brice Goglin Sun, 14 Mar 2010 11:15:07 +0100 + xorg (1:7.5+3ubuntu1) lucid; urgency=low [Timo Aaltonen] diff -Nru xorg-7.5+3ubuntu1/debian/control xorg-7.5+5ubuntu1/debian/control --- xorg-7.5+3ubuntu1/debian/control 2010-03-09 21:06:29.000000000 +0000 +++ xorg-7.5+5ubuntu1/debian/control 2010-04-01 12:21:14.000000000 +0100 @@ -4,7 +4,7 @@ Maintainer: Ubuntu X-SWAT XSBC-Original-Maintainer: Debian X Strike Force Uploaders: David Nusinow , Drew Parsons , Brice Goglin -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 Build-Depends: dpkg (>= 1.7.0), po-debconf, debhelper (>= 7.3.15ubuntu3) Vcs-Git: git://git.debian.org/git/pkg-xorg/debian/xorg Vcs-Browser: http://git.debian.org/?p=pkg-xorg/debian/xorg.git diff -Nru xorg-7.5+3ubuntu1/debian/local/Xreset xorg-7.5+5ubuntu1/debian/local/Xreset --- xorg-7.5+3ubuntu1/debian/local/Xreset 1970-01-01 01:00:00.000000000 +0100 +++ xorg-7.5+5ubuntu1/debian/local/Xreset 2010-04-01 12:19:48.000000000 +0100 @@ -0,0 +1,34 @@ +#!/bin/sh +# +# /etc/X11/Xreset +# +# global Xreset file -- for use by display managers + +# $Id: Xsession 967 2005-12-27 07:20:55Z dnusinow $ + +set -e + +PROGNAME=Xreset +SYSSESSIONDIR=/etc/X11/Xreset.d + +if [ ! -d "$SYSSESSIONDIR" ]; then + # Nothing to do, exiting + exit 0 +fi + +# 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 --list $SYSSESSIONDIR) +if [ -n "$SESSIONFILES" ]; then + set +e + for SESSIONFILE in $SESSIONFILES; do + . $SESSIONFILE + done + set -e +fi + +exit 0 + +# vim:set ai et sts=2 sw=2 tw=80: diff -Nru xorg-7.5+3ubuntu1/debian/local/Xreset.d/README xorg-7.5+5ubuntu1/debian/local/Xreset.d/README --- xorg-7.5+3ubuntu1/debian/local/Xreset.d/README 1970-01-01 01:00:00.000000000 +0100 +++ xorg-7.5+5ubuntu1/debian/local/Xreset.d/README 2010-04-01 12:19:48.000000000 +0100 @@ -0,0 +1,4 @@ +# Scripts in this directory are executed as root when a user log out from +# a display manager using /etc/X11/Xreset. +# The username of the user logging out is provided in the $USER environment +# variable. diff -Nru xorg-7.5+3ubuntu1/debian/rules xorg-7.5+5ubuntu1/debian/rules --- xorg-7.5+3ubuntu1/debian/rules 2010-03-01 07:54:05.000000000 +0000 +++ xorg-7.5+5ubuntu1/debian/rules 2010-04-01 12:19:48.000000000 +0100 @@ -97,6 +97,8 @@ ) >> debian/$$p.preinst.debhelper; \ done dh_fixperms + chown root:root debian/x11-common/etc/X11/Xreset + chmod 755 debian/x11-common/etc/X11/Xreset chown root:root debian/x11-common/etc/X11/Xsession chmod 755 debian/x11-common/etc/X11/Xsession dh_installdeb diff -Nru xorg-7.5+3ubuntu1/debian/x11-common.dirs xorg-7.5+5ubuntu1/debian/x11-common.dirs --- xorg-7.5+3ubuntu1/debian/x11-common.dirs 2010-02-19 00:02:02.000000000 +0000 +++ xorg-7.5+5ubuntu1/debian/x11-common.dirs 2010-04-01 12:19:48.000000000 +0100 @@ -1,4 +1,5 @@ etc/X11/Xresources +etc/X11/Xreset.d etc/X11/Xsession.d usr/include/X11 usr/lib/X11 diff -Nru xorg-7.5+3ubuntu1/debian/x11-common.install xorg-7.5+5ubuntu1/debian/x11-common.install --- xorg-7.5+3ubuntu1/debian/x11-common.install 2010-03-01 07:54:05.000000000 +0000 +++ xorg-7.5+5ubuntu1/debian/x11-common.install 2010-04-01 12:19:48.000000000 +0100 @@ -1,4 +1,6 @@ debian/local/rgb.txt etc/X11 +debian/local/Xreset etc/X11 +debian/local/Xreset.d/* etc/X11/Xreset.d debian/local/Xsession etc/X11 debian/local/Xsession.d/* etc/X11/Xsession.d debian/local/Xsession.options etc/X11