[SCM] live-config branch, debian-next, updated. debian/3.0_a4-1-2-gae77f1d

Daniel Baumann daniel at debian.org
Thu Sep 2 20:34:15 UTC 2010 

The following commit has been merged in the debian-next branch:
commit ae77f1da89b0920da87c9fd5bef1b097bce572b9
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Sep 2 22:31:54 2010 +0200

    Updating live-installer-launcher script for debian-installer-launcher rename.

diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index 11f9898..de01fc4 100644
--- a/manpages/de/live-config.de.7
+++ b/manpages/de/live-config.de.7
@@ -291,8 +291,8 @@ benutzt wird.
 schaltet den KDE Migration Wizard ab (squeeze und neuer).
 .IP \fBkde\-services\fP 4
 schaltet ein paar ungewollte KDE Services ab (squeeze und neuer).
-.IP \fBlive\-installer\-launcher\fP 4
-fügt live\-installer\-launcher auf dem Benutzer Desktop hinzu.
+.IP \fBdebian\-installer\-launcher\fP 4
+fügt debian\-installer\-launcher auf dem Benutzer Desktop hinzu.
 .IP \fBmodule\-init\-tools\fP 4
 lädt automatisch gewisse Module auf bestimmten Architekturen.
 .IP \fBpolicykit\fP 4
diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index 9f6ed38..a3211fd 100644
--- a/manpages/en/live-config.7
+++ b/manpages/en/live-config.7
@@ -189,8 +189,8 @@ makes update\-initramfs to also update the live media when using persistency.
 disables kde migration wizard (squeeze and newer).
 .IP "\fBkde\-services\fR" 4
 disables some unwanted KDE services (squeeze and newer).
-.IP "\fBlive\-installer\-launcher\fR" 4
-adds live\-installer\-launcher on users desktop.
+.IP "\fBdebian\-installer\-launcher\fR" 4
+adds debian\-installer\-launcher on users desktop.
 .IP "\fBmodule\-init\-tools\fR" 4
 automatically load some modules on some architectures.
 .IP "\fBpolicykit\fR" 4
diff --git a/manpages/fr/live-config.fr.7 b/manpages/fr/live-config.fr.7
index 5afed29..d463316 100644
--- a/manpages/fr/live-config.fr.7
+++ b/manpages/fr/live-config.fr.7
@@ -292,8 +292,8 @@ persistance.
 désactive l'assistant de migration de kde (squeeze et plus récent).
 .IP \fBkde\-services\fP 4
 désactive des services de KDE non souhaités (squeeze et plus récent).
-.IP \fBlive\-installer\-launcher\fP 4
-ajoute l'installeur (live\-installer\-launcher) sur le bureau des
+.IP \fBdebian\-installer\-launcher\fP 4
+ajoute l'installeur (debian\-installer\-launcher) sur le bureau des
 utilisateurs.
 .IP \fBmodule\-init\-tools\fP 4
 charge automatiquement certains modules sur certaines architectures.
diff --git a/manpages/po/de/live-config.7.po b/manpages/po/de/live-config.7.po
index eb66845..23d0b3b 100644
--- a/manpages/po/de/live-config.7.po
+++ b/manpages/po/de/live-config.7.po
@@ -1163,13 +1163,13 @@ msgstr "schaltet ein paar ungewollte KDE Services ab (squeeze und neuer)."
 #. type: IP
 #: en/live-config.7:192
 #, no-wrap
-msgid "B<live-installer-launcher>"
-msgstr "B<live-installer-launcher>"
+msgid "B<debian-installer-launcher>"
+msgstr "B<debian-installer-launcher>"
 
 #. type: Plain text
 #: en/live-config.7:194
-msgid "adds live-installer-launcher on users desktop."
-msgstr "fügt live-installer-launcher auf dem Benutzer Desktop hinzu."
+msgid "adds debian-installer-launcher on users desktop."
+msgstr "fügt debian-installer-launcher auf dem Benutzer Desktop hinzu."
 
 #. type: IP
 #: en/live-config.7:194
diff --git a/manpages/po/fr/live-config.7.po b/manpages/po/fr/live-config.7.po
index 7b68d8f..ed12d24 100644
--- a/manpages/po/fr/live-config.7.po
+++ b/manpages/po/fr/live-config.7.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-config 3.0~a4\n"
-"POT-Creation-Date: 2010-09-02 21:25+0300\n"
+"POT-Creation-Date: 2010-09-02 22:30+0300\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
 "Last-Translator: Thierry Lépicier <thierry.lepicier at free.fr>\n"
 "Language-Team: none\n"
@@ -1164,14 +1164,15 @@ msgstr "désactive des services de KDE non souhaités (squeeze et plus récent).
 #. type: IP
 #: en/live-config.7:192
 #, no-wrap
-msgid "B<live-installer-launcher>"
-msgstr "B<live-installer-launcher>"
+msgid "B<debian-installer-launcher>"
+msgstr "B<debian-installer-launcher>"
 
 #. type: Plain text
 #: en/live-config.7:194
-msgid "adds live-installer-launcher on users desktop."
+msgid "adds debian-installer-launcher on users desktop."
 msgstr ""
-"ajoute l'installeur (live-installer-launcher) sur le bureau des utilisateurs."
+"ajoute l'installeur (debian-installer-launcher) sur le bureau des "
+"utilisateurs."
 
 #. type: IP
 #: en/live-config.7:194
diff --git a/manpages/po/pt_BR/live-config.7.po b/manpages/po/pt_BR/live-config.7.po
index 743661c..d0581c6 100644
--- a/manpages/po/pt_BR/live-config.7.po
+++ b/manpages/po/pt_BR/live-config.7.po
@@ -1152,14 +1152,14 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:192
 #, no-wrap
-msgid "B<live-installer-launcher>"
-msgstr "B<live-installer-launcher>"
+msgid "B<debian-installer-launcher>"
+msgstr "B<debian-installer-launcher>"
 
 #. type: Plain text
 #: en/live-config.7:194
-msgid "adds live-installer-launcher on users desktop."
+msgid "adds debian-installer-launcher on users desktop."
 msgstr ""
-"adiciona o instalador (live-installer-launcher) na área de trabalho dos "
+"adiciona o instalador (debian-installer-launcher) na área de trabalho dos "
 "usuários."
 
 #. type: IP
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index cb69d2e..fb53222 100644
--- a/manpages/pot/live-config.7.pot
+++ b/manpages/pot/live-config.7.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-config VERSION\n"
-"POT-Creation-Date: 2010-09-02 21:25+0300\n"
+"POT-Creation-Date: 2010-09-02 22:30+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -1017,12 +1017,12 @@ msgstr ""
 #. type: IP
 #: en/live-config.7:192
 #, no-wrap
-msgid "B<live-installer-launcher>"
+msgid "B<debian-installer-launcher>"
 msgstr ""
 
 #. type: Plain text
 #: en/live-config.7:194
-msgid "adds live-installer-launcher on users desktop."
+msgid "adds debian-installer-launcher on users desktop."
 msgstr ""
 
 #. type: IP
diff --git a/manpages/pt_BR/live-config.pt_BR.7 b/manpages/pt_BR/live-config.pt_BR.7
index 3f23709..294fb9e 100644
--- a/manpages/pt_BR/live-config.pt_BR.7
+++ b/manpages/pt_BR/live-config.pt_BR.7
@@ -280,8 +280,8 @@ persistência for usada.
 desabilita o assitente de migração do kde.
 .IP \fBkde\-services\fP 4
 desabilita alguns serviços do KDE não desejados (squeeze e mais recentes).
-.IP \fBlive\-installer\-launcher\fP 4
-adiciona o instalador (live\-installer\-launcher) na área de trabalho dos
+.IP \fBdebian\-installer\-launcher\fP 4
+adiciona o instalador (debian\-installer\-launcher) na área de trabalho dos
 usuários.
 .IP \fBmodule\-init\-tools\fP 4
 carrega alguns módulos automaticamente em algumas arquiteturas.
diff --git a/scripts/config/108-live-installer-launcher b/scripts/config/108-debian-installer-launcher
similarity index 55%
rename from scripts/config/108-live-installer-launcher
rename to scripts/config/108-debian-installer-launcher
index 68c67b5..2894f5b 100755
--- a/scripts/config/108-live-installer-launcher
+++ b/scripts/config/108-debian-installer-launcher
@@ -8,27 +8,27 @@
 ## under certain conditions; see COPYING for details.
 
 
-Live_installer_launcher ()
+Debian_installer_launcher ()
 {
 	# Checking if package is installed or already configured
-	if [ ! -e /var/lib/dpkg/info/live-installer-launcher.list ] || \
-	   [ -e /var/lib/live/config/live-installer-launcher ]
+	if [ ! -e /var/lib/dpkg/info/debian-installer-launcher.list ] || \
+	   [ -e /var/lib/live/config/debian-installer-launcher ]
 	then
 		return
 	fi
 
-	echo -n " live-installer-launcher"
+	echo -n " debian-installer-launcher"
 
-	Configure_live_installer_launcher
+	Configure_debian_installer_launcher
 }
 
-Configure_live_installer_launcher ()
+Configure_debian_installer_launcher ()
 {
-	install -D -o ${LIVE_USERNAME} -g ${LIVE_USERNAME} /usr/share/applications/live-installer-launcher.desktop /home/${LIVE_USERNAME}/Desktop/live-installer-launcher.desktop
+	install -D -o ${LIVE_USERNAME} -g ${LIVE_USERNAME} /usr/share/applications/debian-installer-launcher.desktop /home/${LIVE_USERNAME}/Desktop/debian-installer-launcher.desktop
 	chown ${LIVE_USERNAME}:${LIVE_USERNAME} /home/${LIVE_USERNAME}/Desktop -R
 
 	# Creating state file
-	touch /var/lib/live/config/live-installer-launcher
+	touch /var/lib/live/config/debian-installer-launcher
 }
 
-Live_installer_launcher
+Debian_installer_launcher

-- 
live-config

More information about the debian-live-changes mailing list