xorg: Changes to 'debian-unstable'
debian/changelog | 7 +++++++
debian/local/Xsession.d/90x11-common_ssh-agent | 2 +-
debian/xserver-xorg.postinst.in | 8 ++++++--
3 files changed, 14 insertions(+), 3 deletions(-)
New commits:
commit 3932cf95eb5c2415b4fc0f73488e0733c9b338ac
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Aug 2 19:42:24 2008 +0200
On sparc, don't put the driver description in the Driver field
patch from Bernhard R. Link (closes: #469299).
diff --git a/debian/changelog b/debian/changelog
index 5431571..214c7c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ xorg (1:7.3+15) UNRELEASED; urgency=low
[ Julien Cristau ]
* If the TMPDIR environment variable is set, preserve it across the
invocation of ssh-agent (closes: #355923). Thanks, Sam Morris!
+ * On sparc, don't put the driver description in the Driver field, using
+ patch from Bernhard R. Link (closes: #469299).
-- Christian Perrier <bubulle@debian.org> Fri, 18 Jul 2008 18:43:14 +0200
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index 717b611..db18f53 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -102,6 +102,7 @@ THIS_SERVER=/usr/bin/Xorg
NCARDS=0
NSERVERS=0
NDRIVERS=0
+DRIVERS_LIST=
MULTIHEAD=
# get machine architecture
@@ -526,7 +527,6 @@ if [ "$ARCH" = "sparc" ]; then
if which $DISCOVER_PROG > /dev/null 2>&1; then
DISCOVERED_VIDEO=$($DISCOVER_FUNC)
MULTIHEAD=$(echo "$DISCOVERED_VIDEO" | wc -l)
- DISCOVERED_VIDEO=$(echo "$DISCOVERED_VIDEO" | head -n 1)
if [ -n "$DISCOVERED_VIDEO" ]; then
NCARDS=$(echo "$DISCOVERED_VIDEO" | wc -l)
SERVERS=$(echo "$DISCOVERED_VIDEO" | awk 'BEGIN { FS="\t" } {print $2}' | grep -v unknown | sort | uniq)
@@ -536,10 +536,14 @@ if [ "$ARCH" = "sparc" ]; then
DRIVERS=$(echo "$DISCOVERED_VIDEO" | awk 'BEGIN { FS="\t" } {print $NF}' | grep -v unknown | sort | uniq)
if [ -n "$DRIVERS" ]; then
NDRIVERS=$(echo "$DRIVERS" | wc -l)
+ DRIVERS_LIST=$(echo "$DRIVERS" | awk 'BEGIN {ORS="";FS="\t"} {if(NR > 1){print last ","};last=$0} END {print last}')
fi
if [ $MULTIHEAD -gt 1 ]; then
MULTIHEAD=yes
fi
+ DISCOVERED_VIDEO=$(echo "$DRIVERS" | head -n 1)
+ else
+ DISCOVERED_VIDEO=""
fi
else
DISCOVERED_VIDEO=""
@@ -547,7 +551,7 @@ if [ "$ARCH" = "sparc" ]; then
else
DISCOVERED_VIDEO=""
fi
-db_subst xserver-xorg/config/device/driver choices "$DISCOVERED_VIDEO"
+db_subst xserver-xorg/config/device/driver choices "$DRIVERS_LIST"
auto_answer db_input low xserver-xorg/config/device/driver "$DISCOVERED_VIDEO"
if [ -n "$FIRSTINST" ] || [ -n "$RECONFIGURE" ]; then
commit 030cdf9b36b5b4db53db6622b633197d6cc25796
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Aug 2 19:30:58 2008 +0200
Preserve TMPDIR setting across execution of ssh-agent
If the TMPDIR environment variable is set, preserve it across the
invocation of ssh-agent (closes: #355923). Thanks, Sam Morris!
diff --git a/debian/changelog b/debian/changelog
index 3ec3ba7..5431571 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
xorg (1:7.3+15) UNRELEASED; urgency=low
+ [ Christian Perrier ]
[ Debconf translations]
* Finnish. Closes: #491323
* Korean. Closes: #491519
+ [ Julien Cristau ]
+ * If the TMPDIR environment variable is set, preserve it across the
+ invocation of ssh-agent (closes: #355923). Thanks, Sam Morris!
+
-- Christian Perrier <bubulle@debian.org> Fri, 18 Jul 2008 18:43:14 +0200
xorg (1:7.3+14) unstable; urgency=low
diff --git a/debian/local/Xsession.d/90x11-common_ssh-agent b/debian/local/Xsession.d/90x11-common_ssh-agent
index fddcdd2..05a16c5 100644
--- a/debian/local/Xsession.d/90x11-common_ssh-agent
+++ b/debian/local/Xsession.d/90x11-common_ssh-agent
@@ -18,7 +18,7 @@ if grep -qs ^use-ssh-agent "$OPTIONFILE"; then
fi
if [ -n "$STARTSSH" ]; then
- STARTUP="$SSHAGENT $SSHAGENTARGS $STARTUP"
+ STARTUP="$SSHAGENT $SSHAGENTARGS ${TMPDIR:+env TMPDIR=$TMPDIR} $STARTUP"
fi
# vim:set ai et sts=2 sw=2 tw=80:
Reply to: