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

Imported using git-ubuntu import.

Changelog parent: 0c9843a4df

New changelog entries:
  * Revert changes in 2.113.  This needs to be done in cdimage/debian-cd
    instead.
impish
Colin Watson 12 years ago committed by usd-importer
parent 0c9843a4df
commit b4c2270228

7
debian/changelog vendored

@ -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

@ -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?-*

Loading…
Cancel
Save