xorg: Changes to 'debian-unstable'
debian/changelog | 6 +++++-
debian/local/Xsession.d/20x11-common_process-args | 2 +-
debian/local/Xsession.d/30x11-common_xresources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 65eafe9f7c3e721eb73e81a1c16af7c5b447f1d1
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date: Sun May 6 18:37:40 2007 +0300
Xsession.d/*: change 'which' -> '/usr/bin/which', since the zsh builtin command can in
some circumstances make the login fail.
diff --git a/debian/changelog b/debian/changelog
index 64c3194..542f5af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,11 @@ xorg (1:7.2-4) UNRELEASED; urgency=low
* Add armel support, thanks to Riku Voipio (closes: #408817).
* Make xephem conflict versioned as <= 3.4-5 (closes: #419533).
- -- Brice Goglin <Brice.Goglin@ens-lyon.org> Mon, 30 Apr 2007 12:17:46 +0200
+ [ Timo Aaltonen ]
+ * Xsession.d/*: change 'which' -> '/usr/bin/which', since the zsh builtin
+ command can in some circumstances make the login fail.
+
+ -- Timo Aaltonen <tjaalton@cc.hut.fi> Sun, 6 May 2007 18:33:29 +0300
xorg (1:7.2-3) unstable; urgency=low
diff --git a/debian/local/Xsession.d/20x11-common_process-args b/debian/local/Xsession.d/20x11-common_process-args
index 2a412bd..53e7a7b 100644
--- a/debian/local/Xsession.d/20x11-common_process-args
+++ b/debian/local/Xsession.d/20x11-common_process-args
@@ -33,7 +33,7 @@ case $# in
;;
*)
# Specific program was requested.
- STARTUP_FULL_PATH=$(which "$1" || true)
+ STARTUP_FULL_PATH=$(/usr/bin/which "$1" || true)
if [ -n "$STARTUP_FULL_PATH" ] && [ -e "$STARTUP_FULL_PATH" ]; then
if [ -x "$STARTUP_FULL_PATH" ]; then
STARTUP="$1"
diff --git a/debian/local/Xsession.d/30x11-common_xresources b/debian/local/Xsession.d/30x11-common_xresources
index 1c3bd83..f9f6e13 100644
--- a/debian/local/Xsession.d/30x11-common_xresources
+++ b/debian/local/Xsession.d/30x11-common_xresources
@@ -4,7 +4,7 @@
# 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 which xrdb >/dev/null 2>&1; then
+if /usr/bin/which xrdb >/dev/null 2>&1; then
if [ -d "$SYSRESOURCES" ]; then
RESOURCEFILES=$(run-parts --list $SYSRESOURCES)
if [ -n "$RESOURCEFILES" ]; then
Reply to: