Import patches-unapplied version 2.113 to ubuntu/raring-proposed

Imported using git-ubuntu import.

Changelog parent: 5fbbc732ce85b98ff16060b43b23cbab21a1d518

New changelog entries:
  * live-build/auto/config: Set gfxboot default language to zh_CN for
    UbuntuKylin.
This commit is contained in:
Colin Watson 2013-03-14 11:53:38 +00:00 committed by usd-importer
parent 5fbbc732ce
commit 0c9843a4df
2 changed files with 17 additions and 0 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.113) raring; urgency=low
* live-build/auto/config: Set gfxboot default language to zh_CN for
UbuntuKylin.
-- Colin Watson <cjwatson@ubuntu.com> Thu, 14 Mar 2013 11:53:38 +0000
livecd-rootfs (2.112) raring; urgency=low
* live-build/auto/config: Add ubuntu-gnome project (LP: #1152818)

View File

@ -84,6 +84,7 @@ LIVE_TASK=
PREINSTALLED=false
PREINSTALL_POOL=
PREINSTALL_POOL_SEEDS=
ISOLINUX_LANG=
CHROOT_HOOKS=
BINARY_HOOKS=
@ -244,6 +245,7 @@ case $PROJECT in
add_package install ubuntukylin-default-settings
LIVE_TASK='ubuntu-live'
COMPONENTS='main restricted universe'
ISOLINUX_LANG=zh_CN
;;
base)
@ -388,6 +390,14 @@ 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?-*