xorg: Changes to 'ubuntu'
debian/changelog | 29 +++++++++++++++++++++++++++++
debian/control | 2 +-
debian/local/Xreset | 34 ++++++++++++++++++++++++++++++++++
debian/local/Xreset.d/README | 4 ++++
debian/rules | 2 ++
debian/x11-common.dirs | 1 +
debian/x11-common.install | 2 ++
7 files changed, 73 insertions(+), 1 deletion(-)
New commits:
commit 423b289052524eccf2d4d973cbc0984ad4149dd8
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Thu Apr 1 14:32:26 2010 +0300
Release 1:7.5+5ubuntu1
diff --git a/debian/changelog b/debian/changelog
index fb64239..cb93002 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg (1:7.5+5ubuntu1) lucid; urgency=low
+
+ * Merge from Debian unstable.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> 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.
commit b93b220a340ec41e36eb9a4d6a5f7c9fad8aa621
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun Mar 14 22:45:14 2010 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index beed34f..54fab9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg (1:7.5+5) UNRELEASED; urgency=low
+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 <bgoglin@debian.org> Sun, 14 Mar 2010 22:41:20 +0100
+ -- Brice Goglin <bgoglin@debian.org> Sun, 14 Mar 2010 22:45:09 +0100
xorg (1:7.5+4) unstable; urgency=low
commit f07e8e0de64aaf4916b7b32c0dd8eafe8b82cf8d
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun Mar 14 22:48:17 2010 +0100
Bump Standards-Version to 3.8.4
diff --git a/debian/changelog b/debian/changelog
index 59e409d..beed34f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xorg (1:7.5+5) UNRELEASED; 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 <bgoglin@debian.org> Sun, 14 Mar 2010 22:41:20 +0100
diff --git a/debian/control b/debian/control
index 3d22056..731c839 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Drew Parsons <dparsons@debian.org>, Brice Goglin <bgoglin@debian.org>
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Build-Depends: dpkg (>= 1.7.0), po-debconf, debhelper (>= 7)
Package: x11-common
commit 094b3111bf3374dca6f364dd213941b79d91800b
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun Mar 14 22:43:46 2010 +0100
Fix typo in Xsession.d/50x11-common_determine-startup
diff --git a/debian/changelog b/debian/changelog
index 7a58436..59e409d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg (1:7.5+5) UNRELEASED; urgency=low
+
+ * Fix typo in Xsession.d/50x11-common_determine-startup, closes: #573899.
+
+ -- Brice Goglin <bgoglin@debian.org> Sun, 14 Mar 2010 22:41:20 +0100
+
xorg (1:7.5+4) unstable; urgency=low
* Add Xreset and Xreset.d support, closes: #230422.
diff --git a/debian/local/Xsession.d/50x11-common_determine-startup b/debian/local/Xsession.d/50x11-common_determine-startup
index 4ed7a32..cd9e4d3 100644
--- a/debian/local/Xsession.d/50x11-common_determine-startup
+++ b/debian/local/Xsession.d/50x11-common_determine-startup
@@ -7,7 +7,7 @@
# executable, fall back to looking for a user's custom X session script, if
# allowed by the options file.
if [ -z "$STARTUP" ]; then
- if has_option allow-user-session; then
+ if has_option allow-user-xsession; then
for STARTUPFILE in "$USERXSESSION" "$ALTUSERXSESSION"; do
if [ -e "$STARTUPFILE" ]; then
if [ -x "$STARTUPFILE" ]; then
@@ -36,7 +36,7 @@ fi
# If we still have not found a startup program, give up.
if [ -z "$STARTUP" ]; then
ERRMSG="unable to start X session ---"
- if has_option allow-user-session; then
+ if has_option allow-user-xsession; then
ERRMSG="$ERRMSG no \"$USERXSESSION\" file, no \"$ALTUSERXSESSION\" file,"
fi
errormsg "$ERRMSG no session managers, no window managers, and no terminal" \
commit c3a8249d58deeba4b9d163a768e792a1d044ce8b
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun Mar 14 11:15:20 2010 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 442a8d6..7a58436 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.5+4) UNRELEASED; urgency=low
+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
@@ -12,7 +12,7 @@ xorg (1:7.5+4) UNRELEASED; urgency=low
unlikely (like "~/.Xresources exists") outside, to avoid running the
other tests (like "xrdb exists") on systems which don't use Xresources.
- -- Brice Goglin <bgoglin@debian.org> Sat, 06 Mar 2010 16:15:01 +0100
+ -- Brice Goglin <bgoglin@debian.org> Sun, 14 Mar 2010 11:15:07 +0100
xorg (1:7.5+3) unstable; urgency=low
commit f4928802701d1a2301ce3e92da015d9bf7ed5d65
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun Mar 14 11:14:59 2010 +0100
Improve startup speed of Xsession.d scripts by eliminating all unnecessary external program calls
diff --git a/debian/changelog b/debian/changelog
index 0359056..442a8d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,16 @@
xorg (1:7.5+4) UNRELEASED; 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 <bgoglin@debian.org> Sat, 06 Mar 2010 16:15:01 +0100
diff --git a/debian/local/Xsession.d/20x11-common_process-args b/debian/local/Xsession.d/20x11-common_process-args
index 53e7a7b..93e4653 100644
--- a/debian/local/Xsession.d/20x11-common_process-args
+++ b/debian/local/Xsession.d/20x11-common_process-args
@@ -2,6 +2,18 @@
# This file is sourced by Xsession(5), not executed.
+# read OPTIONFILE
+OPTIONS=$(cat "$OPTIONFILE") || true
+
+has_option() {
+ if [ "${OPTIONS#*
+$1}" != "$OPTIONS" ]; then
+ return 0
+ else
+ return 1
+ fi
+}
+
# Determine how many arguments were provided.
case $# in
0)
@@ -12,7 +24,7 @@ case $# in
case "$1" in
failsafe)
# Failsafe session was requested.
- if grep -qs ^allow-failsafe "$OPTIONFILE"; then
+ if has_option allow-failsafe; then
if [ -e /usr/bin/x-terminal-emulator ]; then
if [ -x /usr/bin/x-terminal-emulator ]; then
exec x-terminal-emulator -geometry +1+1
diff --git a/debian/local/Xsession.d/30x11-common_xresources b/debian/local/Xsession.d/30x11-common_xresources
index f9f6e13..c3f53a8 100644
--- a/debian/local/Xsession.d/30x11-common_xresources
+++ b/debian/local/Xsession.d/30x11-common_xresources
@@ -4,25 +4,23 @@
# If xrdb (from xbase-clients) is installed, merge system-wide X resources.
# Then merge the user's X resources, if the options file is so configured.
-if /usr/bin/which xrdb >/dev/null 2>&1; then
- if [ -d "$SYSRESOURCES" ]; then
- RESOURCEFILES=$(run-parts --list $SYSRESOURCES)
- if [ -n "$RESOURCEFILES" ]; then
- for RESOURCEFILE in $RESOURCEFILES; do
- xrdb -merge $RESOURCEFILE
- done
- fi
+if [ -d "$SYSRESOURCES" ] && type xrdb >/dev/null 2>&1; then
+ RESOURCEFILES=$(run-parts --list $SYSRESOURCES)
+ if [ -n "$RESOURCEFILES" ]; then
+ for RESOURCEFILE in $RESOURCEFILES; do
+ xrdb -merge $RESOURCEFILE
+ done
fi
+fi
- if grep -qs ^allow-user-resources "$OPTIONFILE"; then
- if [ -f "$USRRESOURCES" ]; then
- xrdb -merge $USRRESOURCES
- fi
+if has_option allow-user-resources && [ -f "$USRRESOURCES" ]; then
+ if type xrdb >/dev/null 2>&1; then
+ xrdb -merge $USRRESOURCES
+ else
+ # Comment out this command if you desire a legacy-free X environment, and find
+ # the warning spurious.
+ message "warning: xrdb command not found; X resources not merged."
fi
-else
- # Comment out this command if you desire a legacy-free X environment, and find
- # the warning spurious.
- message "warning: xrdb command not found; X resources not merged."
fi
# vim:set ai et sts=2 sw=2 tw=80:
diff --git a/debian/local/Xsession.d/50x11-common_determine-startup b/debian/local/Xsession.d/50x11-common_determine-startup
index 2a669a0..4ed7a32 100644
--- a/debian/local/Xsession.d/50x11-common_determine-startup
+++ b/debian/local/Xsession.d/50x11-common_determine-startup
@@ -7,7 +7,7 @@
# executable, fall back to looking for a user's custom X session script, if
# allowed by the options file.
if [ -z "$STARTUP" ]; then
- if grep -qs ^allow-user-xsession "$OPTIONFILE"; then
+ if has_option allow-user-session; then
for STARTUPFILE in "$USERXSESSION" "$ALTUSERXSESSION"; do
if [ -e "$STARTUPFILE" ]; then
if [ -x "$STARTUPFILE" ]; then
@@ -36,7 +36,7 @@ fi
# If we still have not found a startup program, give up.
if [ -z "$STARTUP" ]; then
ERRMSG="unable to start X session ---"
- if grep -qs ^allow-user-xsession "$OPTIONFILE"; then
+ if has_option allow-user-session; then
ERRMSG="$ERRMSG no \"$USERXSESSION\" file, no \"$ALTUSERXSESSION\" file,"
fi
errormsg "$ERRMSG no session managers, no window managers, and no terminal" \
diff --git a/debian/local/Xsession.d/90x11-common_ssh-agent b/debian/local/Xsession.d/90x11-common_ssh-agent
index 05a16c5..5397434 100644
--- a/debian/local/Xsession.d/90x11-common_ssh-agent
+++ b/debian/local/Xsession.d/90x11-common_ssh-agent
@@ -6,7 +6,7 @@ STARTSSH=
SSHAGENT=/usr/bin/ssh-agent
SSHAGENTARGS=
-if grep -qs ^use-ssh-agent "$OPTIONFILE"; then
+if has_option use-ssh-agent; then
if [ -x "$SSHAGENT" ] && [ -z "$SSH_AUTH_SOCK" ] \
&& [ -z "$SSH2_AUTH_SOCK" ]; then
STARTSSH=yes
commit f8de4719d7755ad049021adafcda400a5740824d
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun Mar 7 12:50:38 2010 +0100
Document username in Xreset.d README
diff --git a/debian/local/Xreset.d/README b/debian/local/Xreset.d/README
index b695e6f..3c03f42 100644
--- a/debian/local/Xreset.d/README
+++ b/debian/local/Xreset.d/README
@@ -1,2 +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.
commit 66cedab350b61de50503fd2d3e4fb20f6c3257e7
Author: Brice Goglin <bgoglin@debian.org>
Date: Sat Mar 6 17:37:55 2010 +0100
Prefix Xreset.d lines with a # so that they are ignored when reading all Xreset.d files
diff --git a/debian/local/Xreset.d/README b/debian/local/Xreset.d/README
index f7ef6d3..b695e6f 100644
--- a/debian/local/Xreset.d/README
+++ b/debian/local/Xreset.d/README
@@ -1,2 +1,2 @@
-Scripts in this directory are executed as root when a user log out from
-a display manager using /etc/X11/Xreset.
+# Scripts in this directory are executed as root when a user log out from
+# a display manager using /etc/X11/Xreset.
commit b355aeb2b8b6eed2174cb02d99119c7dff048753
Author: Brice Goglin <bgoglin@debian.org>
Date: Sat Mar 6 16:16:16 2010 +0100
Add Xreset and Xreset.d support
diff --git a/debian/changelog b/debian/changelog
index 7b3d5d5..0359056 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg (1:7.5+4) UNRELEASED; urgency=low
+
+ * Add Xreset and Xreset.d support, closes: #230422.
+
+ -- Brice Goglin <bgoglin@debian.org> Sat, 06 Mar 2010 16:15:01 +0100
+
xorg (1:7.5+3) unstable; urgency=low
* Remove the obsolete x11proto-evie-dev from xorg-dev dependencies.
diff --git a/debian/local/Xreset b/debian/local/Xreset
new file mode 100644
index 0000000..7a0974c
--- /dev/null
+++ b/debian/local/Xreset
@@ -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 --git a/debian/local/Xreset.d/README b/debian/local/Xreset.d/README
new file mode 100644
index 0000000..f7ef6d3
--- /dev/null
+++ b/debian/local/Xreset.d/README
@@ -0,0 +1,2 @@
+Scripts in this directory are executed as root when a user log out from
+a display manager using /etc/X11/Xreset.
diff --git a/debian/rules b/debian/rules
index a3b6616..8e3927f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -83,6 +83,8 @@ binary-indep: build install
dh_link
dh_compress
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 --git a/debian/x11-common.dirs b/debian/x11-common.dirs
index 5ac730e..59b24d0 100644
--- a/debian/x11-common.dirs
+++ b/debian/x11-common.dirs
@@ -1,4 +1,5 @@
etc/X11/Xresources
+etc/X11/Xreset.d
etc/X11/Xsession.d
usr/include/X11
usr/lib/X11
diff --git a/debian/x11-common.install b/debian/x11-common.install
index c52e550..bee9350 100644
--- a/debian/x11-common.install
+++ b/debian/x11-common.install
@@ -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
Reply to: