Merge lp:~vorlon/debian-cd/drop-archaic-install_languages into lp:~ubuntu-cdimage/debian-cd/ubun3

[Steve Langasek]

[Dimitri John Ledkov (xnox)]

review: Approve

=== modified file 'tools/boot/groovy/boot-amd64'
--- tools/boot/groovy/boot-amd64	2020-04-24 14:51:48 +0000
+++ tools/boot/groovy/boot-amd64	2020-05-21 22:05:16 +0000
@@ -191,8 +191,6 @@
 	;;
 esac
 
-#install_languages $CDDIR
-
 # Only disk one gets the extra files installed
 #
 if [ "$NN" = "1" ]; then
 
=== modified file 'tools/boot/groovy/boot-arm64'
--- tools/boot/groovy/boot-arm64	2020-04-24 14:51:48 +0000
+++ tools/boot/groovy/boot-arm64	2020-05-21 22:05:16 +0000
@@ -123,8 +123,6 @@
     echo -n "-append_partition 2 0xef $CDDIR/boot/grub/efi.img -e boot/grub/efi.img -no-emul-boot " >> $N.mkisofs_opts
 fi
 
-#install_languages $CDDIR
-
 # Only disk one gets the extra files installed
 #
 if [ "$NN" = "1" ]; then
 
=== modified file 'tools/boot/groovy/boot-ppc64el'
--- tools/boot/groovy/boot-ppc64el	2020-04-24 14:51:48 +0000
+++ tools/boot/groovy/boot-ppc64el	2020-05-21 22:05:16 +0000
@@ -32,8 +32,6 @@
 	exit 0
 fi
 
-install_languages $CDDIR
-
 echo -n "--netatalk -hfs -probe -map $BASEDIR/data/hfs.map" \
         > $N.mkisofs_opts
 echo -n " -chrp-boot -iso-level 4" >> $N.mkisofs_opts
 
=== modified file 'tools/boot/groovy/common.sh'
--- tools/boot/groovy/common.sh	2020-04-24 14:51:48 +0000
+++ tools/boot/groovy/common.sh	2020-05-21 22:05:16 +0000
@@ -3,19 +3,6 @@
 # by the various boot-<arch> scripts.
 
 
-# install_languages decompacts the language packs, you should give the path
-# to the CD temporary tree.
-# This function should be called for all bootable images.
-install_languages() {
-    # Param $1 is the CD directory
-    if [ -f "$MIRROR/dists/$DI_CODENAME/main/disks-$ARCH/current/xlp.tgz" ]
-    then
-	mkdir $1/.xlp
-	(cd $1/.xlp; \
-	tar zxf $MIRROR/dists/$DI_CODENAME/main/disks-$ARCH/current/xlp.tgz )
-    fi
-}
-
 default_preseed() {
     case $PROJECT in
 	ubuntu|ubuntukylin)