Bug#535624: commited patch

[Maximiliano Curia <maxy@debian.org>]

Hi,

I've just uploaded the fixed version, it should hit lenny-proposed-updates
soon. I'm attaching the applied patch.

-- 
"If you think your users are idiots, only idiots will use it."
  -- Linus Torvalds
Saludos /\/\ /\ >< `/

diff -Naru xorg-7.3+19/debian/changelog xorg-7.3+20/debian/changelog
--- xorg-7.3+19/debian/changelog	2009-06-08 06:53:50.000000000 -0300
+++ xorg-7.3+20/debian/changelog	2009-07-30 15:46:35.465524673 -0300
@@ -1,3 +1,10 @@
+xorg (1:7.3+20) stable; urgency=low
+
+  * Non-maintainer upload, supervised by Julien Cristau.
+  * xserver-xorg.postinst: fix for the previous patch. Closes: #535624
+
+ -- Maximiliano Curia <maxy@debian.org>  Wed, 22 Jul 2009 16:26:29 -0300
+
 xorg (1:7.3+19) stable; urgency=low
 
   * xserver-xorg.postinst: default to the fbdev driver on sparc, even when we
diff -Naru xorg-7.3+19/debian/xserver-xorg.postinst.in xorg-7.3+20/debian/xserver-xorg.postinst.in
--- xorg-7.3+19/debian/xserver-xorg.postinst.in	2009-06-03 16:24:40.000000000 -0300
+++ xorg-7.3+20/debian/xserver-xorg.postinst.in	2009-07-30 15:22:57.245526254 -0300
@@ -932,7 +932,10 @@
 # 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" || \
-  [ "$ARCHITECTURE" = sparc ] && dpkg --compare-versions "$2" lt-nl 1:7.3+19; then
+  { [ "$ARCHITECTURE" = sparc ] && \
+      dpkg --compare-versions "$2" lt-nl 1:7.3+19; } || \
+  { [ -n "$(find "$XORGCONFIG" -maxdepth 0 -size 0 2>/dev/null)" ] &&  \
+      [ "$2" = 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.