Package: release.debian.org Severity: normal User: [email protected] Usertags: unblock
Please unblock package debian-installer-launcher We forgot to include the new debian-installer-launcher in our list of unblocks for live-*, so our recent build of wheezy live rc1 regressed because the previous build used the sid version of this package. Please see #702226 for details. The changelog doesn't reflect some additional changes that were committed due to changes in live-boot. However, the changes are straightforward enough. I hope it is not too much trouble to get through. unblock debian-installer-launcher/14 -- System Information: Debian Release: 7.0 APT prefers testing APT policy: (500, 'testing'), (101, 'unstable'), (1, 'experimental') Architecture: i386 (x86_64) Kernel: Linux 3.2.0-4-amd64 (SMP w/2 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash
diff -Nru debian-installer-launcher-13/debconf_kernel.sh debian-installer-launcher-14/debconf_kernel.sh --- debian-installer-launcher-13/debconf_kernel.sh 2012-06-30 13:42:50.000000000 -0300 +++ debian-installer-launcher-14/debconf_kernel.sh 2012-09-27 22:00:57.000000000 -0300 @@ -14,7 +14,7 @@ # The version of the host systems kernel need to match the kernel version used # in the debian-installer initrd. LIVE_KERNEL=$(uname -r) -DI_KERNEL=$(basename /live/installer/lib/modules/*) +DI_KERNEL=$(basename /lib/live/installer/lib/modules/*) if [ $LIVE_KERNEL != $DI_KERNEL ]; then db_subst debian-installer-launcher/kernel-mismatch/error LIVE_KERNEL "$LIVE_KERNEL" diff -Nru debian-installer-launcher-13/debian/changelog debian-installer-launcher-14/debian/changelog --- debian-installer-launcher-13/debian/changelog 2012-06-30 13:53:04.000000000 -0300 +++ debian-installer-launcher-14/debian/changelog 2012-12-10 02:02:11.000000000 -0400 @@ -1,3 +1,10 @@ +debian-installer-launcher (14) unstable; urgency=low + + [ Updated translations ] + * Catalan (ca.po) by Jordi Mallach + + -- Christian Perrier <[email protected]> Mon, 10 Dec 2012 07:02:11 +0100 + debian-installer-launcher (13) unstable; urgency=low * Switching to xz compression. diff -Nru debian-installer-launcher-13/debian/po/be.po debian-installer-launcher-14/debian/po/be.po --- debian-installer-launcher-13/debian/po/be.po 2012-06-30 13:42:50.000000000 -0300 +++ debian-installer-launcher-14/debian/po/be.po 2012-11-08 16:51:46.000000000 -0400 @@ -4,28 +4,33 @@ # DO NOT MODIFY THIS FILE DIRECTLY: SUCH CHANGES WILL BE LOST # # translation of be.po to Belarusian (Official spelling) -# # Andrei Darashenka <[email protected]>, 2005, 2006. # Nasciona Piatrouskaja <[email protected]>, 2006. # Pavel Piatruk <[email protected]>, 2006, 2007, 2008. # Hleb Rubanau <[email protected]>, 2006, 2007. # Nasciona Piatrouskaja <[email protected]>, 2006. # Paul Petruk <[email protected]>, 2007. -# Pavel Piatruk <[email protected]>, 2008, 2009. -# Viktar Siarheichyk <[email protected]>, 2010. +# Pavel Piatruk <[email protected]>, 2008, 2009, 2011. +# Viktar Siarheichyk <[email protected]>, 2010, 2011, 2012. +# Translations from iso-codes: +# Alastair McKinstry <[email protected]>, 2004. +# Alexander Nyakhaychyk <[email protected]>, 2009. +# Ihar Hrachyshka <[email protected]>, 2007, 2010. msgid "" msgstr "" "Project-Id-Version: be\n" "Report-Msgid-Bugs-To: [email protected]\n" "POT-Creation-Date: 2010-08-05 20:58+0000\n" -"PO-Revision-Date: 2010-09-28 12:37+0300\n" +"PO-Revision-Date: 2010-09-28 01:58+0300\n" "Last-Translator: Viktar Siarheichyk <[email protected]>\n" "Language-Team: Belarusian (Official spelling) <debian-l10n-belarusian@lists." "debian.org>\n" -"Language: \n" +"Language: be\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #. Type: title #. Description diff -Nru debian-installer-launcher-13/debian/po/ca.po debian-installer-launcher-14/debian/po/ca.po --- debian-installer-launcher-13/debian/po/ca.po 2012-06-30 13:42:50.000000000 -0300 +++ debian-installer-launcher-14/debian/po/ca.po 2012-12-03 22:01:22.000000000 -0400 @@ -4,17 +4,24 @@ # DO NOT MODIFY THIS FILE DIRECTLY: SUCH CHANGES WILL BE LOST # # Catalan messages for debian-installer. -# Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010 Software in the Public Interest, Inc. +# Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010, 2012 Software in the Public Interest, Inc. # This file is distributed under the same license as debian-installer. -# Jordi Mallach <[email protected]>, 2002, 2003, 2004, 2006, 2007, 2008, 2010. +# Jordi Mallach <[email protected]>, 2002, 2003, 2004, 2006, 2007, 2008, 2010, 2012. # Guillem Jover <[email protected]>, 2005, 2007. # +# Translations from iso-codes: +# Alastair McKinstry <[email protected]>, 2001. +# Free Software Foundation, Inc., 2002,2004,2006 +# Orestes Mas i Casals <[email protected]>, 2004-2006. (orestes: He usat la nomenclatura de http://www.traduim.com/) +# Softcatalà <[email protected]>, 2000-2001 +# Toni Hermoso Pulido <[email protected]>, 2010. +# Traductor: Jordi Ferré <[email protected]> msgid "" msgstr "" -"Project-Id-Version: debian-installer squeeze\n" +"Project-Id-Version: debian-installer wheezy\n" "Report-Msgid-Bugs-To: [email protected]\n" "POT-Creation-Date: 2010-08-05 20:58+0000\n" -"PO-Revision-Date: 2010-10-18 21:17+0200\n" +"PO-Revision-Date: 2012-10-18 18:34+0200\n" "Last-Translator: Jordi Mallach <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca\n" @@ -34,7 +41,7 @@ #. :sl3: #: ../debian-installer-launcher.templates:2001 msgid "Live system kernel and installer kernel don't match" -msgstr "Els nuclis del sistema autònom i de l'instaŀlador no concorden" +msgstr "Els nuclis del sistema autònom i de l'instal·lador no concorden" #. Type: error #. Description @@ -46,8 +53,8 @@ "The installer can only be used if the kernel versions of the live system " "(${LIVE_KERNEL}) and of the installer (${DI_KERNEL}) are the same." msgstr "" -"Només es pot emprar l'instaŀlador si la versió del nucli del sistema autònom " -"(${LIVE_KERNEL}) i de l'instaŀlador (${DI_KERNEL}) és la mateixa." +"Només es pot emprar l'instal·lador si la versió del nucli del sistema " +"autònom (${LIVE_KERNEL}) i de l'instal·lador (${DI_KERNEL}) és la mateixa." #. Type: error #. Description diff -Nru debian-installer-launcher-13/debian/po/dz.po debian-installer-launcher-14/debian/po/dz.po --- debian-installer-launcher-13/debian/po/dz.po 2012-06-30 13:42:50.000000000 -0300 +++ debian-installer-launcher-14/debian/po/dz.po 2012-09-22 22:01:21.000000000 -0300 @@ -9,12 +9,17 @@ # Copyright @ 2006 Free Software Foundation, Inc. # Sonam Rinchen <[email protected]>, 2006. # +# +# Translations from iso-codes: +# Free Software Foundation, Inc., 2006 +# Kinley Tshering <[email protected]>, 2006 +# msgid "" msgstr "" "Project-Id-Version: dDz.po\n" "Report-Msgid-Bugs-To: [email protected]\n" "POT-Creation-Date: 2010-08-05 20:58+0000\n" -"PO-Revision-Date: 2010-11-16 23:22-0500\n" +"PO-Revision-Date: 2012-02-29 04:41-0500\n" "Last-Translator: Jurmey Rabgay <[email protected]>\n" "Language-Team: Dzongkha <[email protected]>\n" "Language: dz\n" diff -Nru debian-installer-launcher-13/debian/rules debian-installer-launcher-14/debian/rules --- debian-installer-launcher-13/debian/rules 2012-06-30 13:47:54.000000000 -0300 +++ debian-installer-launcher-14/debian/rules 2012-06-30 22:01:17.000000000 -0300 @@ -3,12 +3,12 @@ %: dh $@ +override_dh_builddeb: + dh_builddeb -- -Zxz -z9 + override_dh_install: dh_install sed -i -e "s|@DISTRIBUTOR@|$$(lsb_release -is)|" \ -e "s|@CODENAME@|$$(lsb_release -cs)|" \ debian/debian-installer-launcher/usr/share/applications/debian-installer-launcher.desktop - -override_dh_builddeb: - dh_builddeb -- -Zxz -z9 diff -Nru debian-installer-launcher-13/debian-installer-launcher debian-installer-launcher-14/debian-installer-launcher --- debian-installer-launcher-13/debian-installer-launcher 2012-06-30 13:42:50.000000000 -0300 +++ debian-installer-launcher-14/debian-installer-launcher 2012-10-03 22:00:48.000000000 -0300 @@ -75,7 +75,7 @@ done # Default to live plugin on live systems -if [ -e /live/image ]; then +if [ -e /lib/live/mount/medium ]; then PLUGIN=live else PLUGIN=kexec diff -Nru debian-installer-launcher-13/debian-installer-launcher.8 debian-installer-launcher-14/debian-installer-launcher.8 --- debian-installer-launcher-13/debian-installer-launcher.8 2012-06-30 13:42:50.000000000 -0300 +++ debian-installer-launcher-14/debian-installer-launcher.8 2012-09-27 22:00:57.000000000 -0300 @@ -23,7 +23,7 @@ the live plugin defaults to use the GTK+ installer frontend, if available/possible. With this option, the text frontend can be enforced. If used in a GUI, a terminal-emulator will be opened to show the text installer. .SH FILES -.IP "\fB/live/installer\fR" 4 +.IP "\fB/lib/live/installer\fR" 4 .SH SEE ALSO live\-installer <\fIhttp://packages.qa.debian.org/live-installer\fR> diff -Nru debian-installer-launcher-13/debian-installer.sh debian-installer-launcher-14/debian-installer.sh --- debian-installer-launcher-13/debian-installer.sh 2012-06-30 13:42:50.000000000 -0300 +++ debian-installer-launcher-14/debian-installer.sh 2012-09-27 22:00:57.000000000 -0300 @@ -3,7 +3,7 @@ set -e in_image () { - chroot /live/installer /usr/bin/env -i LIVE_INSTALLER_MODE=1 DEBIAN_FRONTEND=$DI_FRONTEND DISPLAY=:0 TERM=$TERM $CMDLINE $@ + chroot /lib/live/installer /usr/bin/env -i LIVE_INSTALLER_MODE=1 DEBIAN_FRONTEND=$DI_FRONTEND DISPLAY=:0 TERM=$TERM $CMDLINE $@ } CMDLINE= diff -Nru debian-installer-launcher-13/plugins/live debian-installer-launcher-14/plugins/live --- debian-installer-launcher-13/plugins/live 2012-06-30 13:42:50.000000000 -0300 +++ debian-installer-launcher-14/plugins/live 2012-10-03 22:00:48.000000000 -0300 @@ -51,7 +51,7 @@ fi # Find an debian-installer initrd, preferably the gtk one - for IMAGE in /live/image/install/gtk/initrd.gz /live/image/install/initrd.gz; do + for IMAGE in /lib/live/mount/medium/install/gtk/initrd.gz /lib/live/mount/medium/install/initrd.gz; do [ -e $IMAGE ] && break done @@ -60,10 +60,10 @@ echo "Loading debian-installer..." # Create the temporary directory - mkdir -p /live/installer + mkdir -p /lib/live/installer # Unpack the initrd - cd /live/installer + cd /lib/live/installer zcat $IMAGE | cpio -id > /dev/null 2>&1 $LIVE_TERMINAL /usr/share/debian-installer-launcher/debconf_kernel.sh || return 1 @@ -93,7 +93,7 @@ # ->the sed horror could be improved (FIXME;) # string: [A-Z][a-z]: [0-9] [0-9]rce [0-9]... # we only want the [0-9]rce, but without the rce. - for PID in $(fuser -m /live/installer/var/log/syslog 2>&1 | \ + for PID in $(fuser -m /lib/live/installer/var/log/syslog 2>&1 | \ sed "s,.*: ,,g;s, ,\n,g" | grep 'rce$' | \ sed -e 's/rce//g'); do kill -9 $PID > /dev/null 2>&1 || true @@ -101,23 +101,23 @@ # Unmounting filesystems for fs in /cdrom /dev/pts /dev /proc /sys /tmp; do - umount -f /live/installer/$fs > /dev/null 2>&1 || true + umount -f /lib/live/installer/$fs > /dev/null 2>&1 || true done # Remove unpacked initrd - rm -rf /live/installer + rm -rf /lib/live/installer rm -f /tmp/debian-installer } live_run() { # Bindmount installer media - mkdir -p /live/installer/cdrom - mount -o bind /live/image /live/installer/cdrom + mkdir -p /lib/live/installer/cdrom + mount -o bind /lib/live/mount/medium /lib/live/installer/cdrom # Bindmount filesytem for fs in /dev /dev/pts /proc /sys /tmp; do - mount -o bind $fs /live/installer/$fs + mount -o bind $fs /lib/live/installer/$fs done if [ -n "$DISPLAY" ]; then
