xorg: Changes to 'debian-lenny'

[Julien Cristau <jcristau@alioth.debian.org>]

 debian/xserver-xorg.postinst.in |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 8f6c69e2e8907737e7ab72f077ecf635b04d0cf0
Author: Julien Cristau <jcristau@debian.org>
Date:   Wed Jun 3 21:28:50 2009 +0200

    xserver-xorg.postinst: run dexconf on upgrade on sparc

diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index a7432e5..5beb891 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -931,7 +931,8 @@ fi
 
 # Don't touch the config on upgrades except to deal with known issues with old
 # configs.
-if [ -z "$UPGRADE" ] || dpkg --compare-versions "$2" le "1:7.0.14"; then
+if [ -z "$UPGRADE" ] || dpkg --compare-versions "$2" le "1:7.0.14" || \
+  [ "$ARCHITECTURE" = sparc ] && dpkg --compare-versions "$2" lt-nl 1:7.3+19; then
   # compare the current and stored checksums; if they do not match, assume
   # that's the way the user wants it.  if we're reconfiguring, overwrite
   # it regardless and back it up.

commit 4af536ab4e0540847c9beeaa3d9b5b54fa37e29f
Author: Julien Cristau <jcristau@debian.org>
Date:   Wed Jun 3 21:28:34 2009 +0200

    xserver-xorg.postinst: put fbdev in the list of debconf driver choices

diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index 06b0b5c..a7432e5 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -539,6 +539,7 @@ if [ "$ARCH" = "sparc" ]; then
         DRIVERS_LIST=$(echo "$DRIVERS" | awk 'BEGIN {ORS="";FS="\t"} {if(NR > 1){print last ","};last=$0} END {print last}')
       else
         DRIVERS=fbdev
+        DRIVERS_LIST=fbdev
       fi
       if [ $MULTIHEAD -gt 1 ]; then
         MULTIHEAD=yes