[SCM] live-config branch, debian-next, updated. debian/3.0_a43-1-2-g2164f50

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 2164f50398a37ba65742e3dbcdd0010ca150dc90
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Jul 18 23:55:08 2012 +0200

    Sorting keyboard-configuration handling alphabetically.

diff --git a/scripts/config/0160-keyboard-configuration b/scripts/config/0160-keyboard-configuration
index 6e81e13..fa58b07 100755
--- a/scripts/config/0160-keyboard-configuration
+++ b/scripts/config/0160-keyboard-configuration
@@ -46,13 +46,6 @@ Keyboard_configuration ()
 
 Configure_keyboard_configuration ()
 {
-	if [ -n "${LIVE_KEYBOARD_MODEL}" ]
-	then
-		echo "keyboard-configuration keyboard-configuration/modelcode select ${LIVE_KEYBOARD_MODEL}" >> /tmp/debconf.live
-
-		sed -i -e "s|^XKBMODEL=.*$|XKBMODEL=\"${LIVE_KEYBOARD_MODEL}\"|" /etc/default/keyboard
-	fi
-
 	if [ -n "${LIVE_KEYBOARD_LAYOUTS}" ]
 	then
 		echo "keyboard-configuration keyboard-configuration/layoutcode select ${LIVE_KEYBOARD_LAYOUTS}" >> /tmp/debconf.live
@@ -60,11 +53,11 @@ Configure_keyboard_configuration ()
 		sed -i -e "s|^XKBLAYOUT=.*$|XKBLAYOUT=\"${LIVE_KEYBOARD_LAYOUTS}\"|" /etc/default/keyboard
 	fi
 
-	if [ -n "${LIVE_KEYBOARD_VARIANT}" ]
+	if [ -n "${LIVE_KEYBOARD_MODEL}" ]
 	then
-		echo "keyboard-configuration keyboard-configuration/variantcode select ${LIVE_KEYBOARD_VARIANT}" >> /tmp/debconf.live
+		echo "keyboard-configuration keyboard-configuration/modelcode select ${LIVE_KEYBOARD_MODEL}" >> /tmp/debconf.live
 
-		sed -i -e "s|^XKBVARIANT=.*$|XKBVARIANT=\"${LIVE_KEYBOARD_VARIANT}\"|" /etc/default/keyboard
+		sed -i -e "s|^XKBMODEL=.*$|XKBMODEL=\"${LIVE_KEYBOARD_MODEL}\"|" /etc/default/keyboard
 	fi
 
 	if [ -n "${LIVE_KEYBOARD_OPTIONS}" ]
@@ -74,6 +67,13 @@ Configure_keyboard_configuration ()
 		sed -i -e "s|^XKBOPTIONS=.*$|XKBOPTIONS=\"${LIVE_KEYBOARD_OPTIONS}\"|" /etc/default/keyboard
 	fi
 
+	if [ -n "${LIVE_KEYBOARD_VARIANT}" ]
+	then
+		echo "keyboard-configuration keyboard-configuration/variantcode select ${LIVE_KEYBOARD_VARIANT}" >> /tmp/debconf.live
+
+		sed -i -e "s|^XKBVARIANT=.*$|XKBVARIANT=\"${LIVE_KEYBOARD_VARIANT}\"|" /etc/default/keyboard
+	fi
+
 	if [ -e /tmp/debconf.live ]
 	then
 		debconf-set-selections < /tmp/debconf.live

-- 
live-config