[SRM] xorg and xorg-server update for lenny

[Julien Cristau <jcristau@debian.org>]

Hi,

the workaround put in xorg-server for 5.0.1 didn't fix the problem on
sparc with pci drivers, and actually made things worse for some people,
so I'd like to revert it in 5.0.2, and try to fix it some other way
instead.

The xorg-server update would:
- remove the patch added in r1
- cherry-pick a patch to fix the idletime xsync timer (see
  http://packages.qa.debian.org/g/gnome-session/news/20090521T093223Z.html
  and
  http://cgit.freedesktop.org/xorg/xserver/commit?id=1f4fb0225b278d1cf4145aebeb0bdd23dc8f62d5)
I'm not attaching the patch here, it's in git, branch debian-lenny, for
those who care.

The sparc workaround is moved to xserver-xorg, which will attempt to
default to the fbdev driver on sparc if no specific fb driver is found,
and regenerate xorg.conf with that.
Lightly tested patch for that follows.  I'd appreciate review
(xserver-xorg.postinst makes my head hurt) and testing.  (It seems that
the window for 5.0.2 will close soon, so the sooner the better.)

Thanks,
Julien

diff --git a/debian/changelog b/debian/changelog
index 9875bbf..312e98f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.3+19) UNRELEASED; urgency=low
+
+  * xserver-xorg.postinst: default to the fbdev driver on sparc, even when we
+    find PCI devices, to work around #488669.
+
+ -- Julien Cristau <jcristau@debian.org>  Mon, 25 May 2009 14:58:42 +0200
+
 xorg (1:7.3+18) unstable; urgency=low
 
   [ Debconf translations ]
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index db18f53..5beb891 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -175,10 +175,10 @@ discover_sparc_video () {
         card='Sun TCX framebuffer' 
         driver='suntcx'
 	;;
-      'SUNW,m64B' )
-        card='ATI Technologies 3D Rage Pro or similar'
-        driver='ati'
-        ;;
+#      'SUNW,m64B' )
+#        card='ATI Technologies 3D Rage Pro or similar'
+#        driver='ati'
+#        ;;
       'SUNW,ffb' )
         card='Sun Creator3D framebuffer or similar'
         driver='sunffb'
@@ -187,10 +187,10 @@ discover_sparc_video () {
         card='Sun Elite3D framebuffer or similar'
         driver='sunffb'
         ;;
-      'TSI,gfxp' )
-        card='PGX32 framebuffer or similar'
-        driver='glint'
-        ;;
+#      'TSI,gfxp' )
+#        card='PGX32 framebuffer or similar'
+#        driver='glint'
+#        ;;
       * )
         card='Unknown'
         server='unknown'
@@ -537,6 +537,9 @@ if [ "$ARCH" = "sparc" ]; then
       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}')
+      else
+        DRIVERS=fbdev
+        DRIVERS_LIST=fbdev
       fi
       if [ $MULTIHEAD -gt 1 ]; then
         MULTIHEAD=yes
@@ -928,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.