From b4c227022820c0da81428ffcb6c7a64861a1ccd4 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Thu, 14 Mar 2013 16:54:48 +0000
Subject: [PATCH] Import patches-unapplied version 2.114 to
 ubuntu/raring-proposed

Imported using git-ubuntu import.

Changelog parent: 0c9843a4df3f1affaf16bb8145e02927561402fd

New changelog entries:
  * Revert changes in 2.113.  This needs to be done in cdimage/debian-cd
    instead.
---
 debian/changelog       |  7 +++++++
 live-build/auto/config | 10 ----------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3e18d11a..0aa94323 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.114) raring; urgency=low
+
+  * Revert changes in 2.113.  This needs to be done in cdimage/debian-cd
+    instead.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 14 Mar 2013 16:54:48 +0000
+
 livecd-rootfs (2.113) raring; urgency=low
 
   * live-build/auto/config: Set gfxboot default language to zh_CN for
diff --git a/live-build/auto/config b/live-build/auto/config
index 437c0254..f153a055 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -84,7 +84,6 @@ LIVE_TASK=
 PREINSTALLED=false
 PREINSTALL_POOL=
 PREINSTALL_POOL_SEEDS=
-ISOLINUX_LANG=
 
 CHROOT_HOOKS=
 BINARY_HOOKS=
@@ -245,7 +244,6 @@ case $PROJECT in
 		add_package install ubuntukylin-default-settings
 		LIVE_TASK='ubuntu-live'
 		COMPONENTS='main restricted universe'
-		ISOLINUX_LANG=zh_CN
 		;;
 
 	base)
@@ -390,14 +388,6 @@ EOF
 		;;
 esac
 
-if [ "$ISOLINUX_LANG" ]; then
-	cat > config/hooks/100-default-language.binary <<EOF
-#! /bin/sh
-set -e
-echo "$ISOLINUX_LANG" > binary/isolinux/lang
-EOF
-fi
-
 if $BINARY_REMOVE_LINUX; then
 	cat > config/binary_rootfs/excludes << EOF
 boot/vmlinu?-*