[SCM] live-config branch, debian-next, updated. debian/3.0_a1-1-3-geca8077

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit eca8077dd8fda4928f8a35654b67d8f9c5b51e1e
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Aug 11 15:48:19 2010 +0200

    Using dpkg-reconfigure instead of dexconf in xserver-xorg script (Closes: #592510).

diff --git a/scripts/config/115-xserver-xorg b/scripts/config/115-xserver-xorg
index ff56cfd..8493925 100755
--- a/scripts/config/115-xserver-xorg
+++ b/scripts/config/115-xserver-xorg
@@ -75,12 +75,10 @@ Configure_xserver_xorg ()
 		debconf-set-selections < /tmp/debconf.live
 		rm -f /tmp/debconf.live
 
-		dexconf
-
-#		dpkg-reconfigure -f non-interactive -p critical \
-#			xserver-xorg 2>&1 \
-#			| grep -v "overwriting possibly-customised configuration" \
-#			| grep -v "file; backup in /etc/X11/xorg.conf"
+		dpkg-reconfigure -f non-interactive -p critical \
+			xserver-xorg 2>&1 \
+			| grep -v "overwriting possibly-customised configuration" \
+			| grep -v "file; backup in /etc/X11/xorg.conf" || true
 
 		# Creating state file
 		touch /var/lib/live/config/xserver-xorg

-- 
live-config