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

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 2c8cfcd60069a39390adf43acbed29e4099b64ec
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Aug 3 11:48:11 2012 +0200

    Shortening filename for xorg.conf.d file.

diff --git a/debian/live-config.postrm b/debian/live-config.postrm
index f8d577c..75a47c3 100644
--- a/debian/live-config.postrm
+++ b/debian/live-config.postrm
@@ -7,7 +7,7 @@ case "${1}" in
 		rm -f /etc/sudoers.d/live
 		rm -f /etc/profile.d/locales-all.sh
 		rm -f /etc/profile.d/zz-live.sh
-		rm -f /etc/X11/xorg.conf.d/99-live_*.conf
+		rm -f /etc/X11/xorg.conf.d/99-live.conf
 
 		rm -rf /var/lib/live/config
 		rm -rf /var/lib/live/debconfig
diff --git a/scripts/config/1150-xserver-xorg b/scripts/config/1150-xserver-xorg
index 94fcc03..fa573d3 100755
--- a/scripts/config/1150-xserver-xorg
+++ b/scripts/config/1150-xserver-xorg
@@ -93,7 +93,7 @@ Configure_xserver_xorg ()
 	if [ -n "${LIVE_XORG_DRIVER}" ]
 	then
 
-cat > /etc/X11/xorg.conf.d/99-live_driver.conf << EOF
+cat > /etc/X11/xorg.conf.d/99-live.conf << EOF
 Section "Device"
 	Identifier	"Default screen"
 	Driver		"${LIVE_XORG_DRIVER}"

-- 
live-config