[SCM] live-config branch, upstream, updated. upstream/3.0_a40-1-g0d9ff6c
Daniel Baumann
daniel at debian.org
Wed Jun 27 12:28:14 UTC 2012
The following commit has been merged in the upstream branch:
commit 0d9ff6c9a14247a5c28a5c0a0484c7137e9cae6b
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Jun 27 14:28:06 2012 +0200
Adding upstream version 3.0~a41.
diff --git a/VERSION b/VERSION
index 980c060..a56b962 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~a40-1
+3.0~a41-1
diff --git a/backends/debconf/001-hostname b/backends/debconf/0010-hostname
similarity index 100%
rename from backends/debconf/001-hostname
rename to backends/debconf/0010-hostname
diff --git a/backends/debconf/001-hostname.templates b/backends/debconf/0010-hostname.templates
similarity index 100%
rename from backends/debconf/001-hostname.templates
rename to backends/debconf/0010-hostname.templates
diff --git a/backends/debconf/002-ifupdown b/backends/debconf/0020-ifupdown
similarity index 100%
rename from backends/debconf/002-ifupdown
rename to backends/debconf/0020-ifupdown
diff --git a/backends/debconf/002-ifupdown.templates b/backends/debconf/0020-ifupdown.templates
similarity index 100%
rename from backends/debconf/002-ifupdown.templates
rename to backends/debconf/0020-ifupdown.templates
diff --git a/backends/debconf/005-sysvinit b/backends/debconf/0030-sysvinit
similarity index 100%
rename from backends/debconf/005-sysvinit
rename to backends/debconf/0030-sysvinit
diff --git a/backends/debconf/005-sysvinit.templates b/backends/debconf/0030-sysvinit.templates
similarity index 100%
rename from backends/debconf/005-sysvinit.templates
rename to backends/debconf/0030-sysvinit.templates
diff --git a/backends/debconf/004-selinux b/backends/debconf/0100-selinux
similarity index 100%
rename from backends/debconf/004-selinux
rename to backends/debconf/0100-selinux
diff --git a/backends/debconf/004-selinux.templates b/backends/debconf/0100-selinux.templates
similarity index 100%
rename from backends/debconf/004-selinux.templates
rename to backends/debconf/0100-selinux.templates
diff --git a/backends/debconf/003-openssh-server b/backends/debconf/0200-openssh-server
similarity index 75%
rename from backends/debconf/003-openssh-server
rename to backends/debconf/0200-openssh-server
index fcd54dc..7682507 100755
--- a/backends/debconf/003-openssh-server
+++ b/backends/debconf/0200-openssh-server
@@ -8,8 +8,6 @@ do
then
if [ -x /usr/bin/ssh-keygen ]
then
- echo -n "P: Creating files /etc/ssh/ssh_host_${_PROTOCOL}_key /etc/ssh/ssh_host_${_PROTOCOL}_key.pub..."
-
ssh-keygen -q -f /etc/ssh/ssh_host_${_PROTOCOL}_key -N "" -t ${_PROTOCOL}
fi
fi
diff --git a/backends/debconf/003-openssh-server.templates b/backends/debconf/0200-openssh-server.templates
similarity index 100%
rename from backends/debconf/003-openssh-server.templates
rename to backends/debconf/0200-openssh-server.templates
diff --git a/bin/live-debconfig b/bin/live-debconfig
index 04389fc..69b49f7 100755
--- a/bin/live-debconfig
+++ b/bin/live-debconfig
@@ -43,7 +43,6 @@ EOF
fi
DEBCONF_SYSTEMRC="/var/lib/live/debconfig/systemrc"
-export DEBCONF_SYSTEMRC
if [ "${1}" = "--noscripts" ]
then
diff --git a/examples/live-config-foobar/scripts/900-foobar b/examples/live-config-foobar/scripts/9000-foobar
similarity index 100%
rename from examples/live-config-foobar/scripts/900-foobar
rename to examples/live-config-foobar/scripts/9000-foobar
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index 356f3e3..1d8519e 100644
--- a/manpages/de/live-config.de.7
+++ b/manpages/de/live-config.de.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 14.06.2012 3.0~a40\-1 "Debian Live Projekt"
+.TH LIVE\-CONFIG 7 27.06.2012 3.0~a41\-1 "Debian Live Projekt"
.SH NAME
\fBlive\-config\fP \- System Konfiguration Skripte
diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index 827577d..32a01a1 100644
--- a/manpages/en/live-config.7
+++ b/manpages/en/live-config.7
@@ -6,7 +6,7 @@
.\" under certain conditions; see COPYING for details.
.\"
.\"
-.TH LIVE\-CONFIG 7 2012\-06\-14 3.0~a40-1 "Debian Live Project"
+.TH LIVE\-CONFIG 7 2012\-06\-27 3.0~a41-1 "Debian Live Project"
.SH NAME
\fBlive\-config\fR \- System Configuration Scripts
diff --git a/manpages/es/live-config.es.7 b/manpages/es/live-config.es.7
index 4853e85..3a5a818 100644
--- a/manpages/es/live-config.es.7
+++ b/manpages/es/live-config.es.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 14.06.2012 3.0~a40\-1 "Proyecto Debian Live"
+.TH LIVE\-CONFIG 7 27.06.2012 3.0~a41\-1 "Proyecto Debian Live"
.SH NOMBRE
\fBlive\-config\fP \- Scripts de configuración del sistema
diff --git a/manpages/fr/live-config.fr.7 b/manpages/fr/live-config.fr.7
index 2674d53..bbe785b 100644
--- a/manpages/fr/live-config.fr.7
+++ b/manpages/fr/live-config.fr.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 14.06.2012 3.0~a40\-1 "Projet Debian Live"
+.TH LIVE\-CONFIG 7 27.06.2012 3.0~a41\-1 "Projet Debian Live"
.SH NOM
\fBlive\-config\fP \- Scripts de configuration du système
diff --git a/manpages/it/live-config.it.7 b/manpages/it/live-config.it.7
index 7e33604..fab34ed 100644
--- a/manpages/it/live-config.it.7
+++ b/manpages/it/live-config.it.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 14.06.2012 3.0~a40\-1 "Progetto Debian Live"
+.TH LIVE\-CONFIG 7 27.06.2012 3.0~a41\-1 "Progetto Debian Live"
.SH NOME
\fBlive\-config\fP \- Script di configurazione del sistema
diff --git a/manpages/po/de/live-config.7.po b/manpages/po/de/live-config.7.po
index 8e93020..8b9bdad 100644
--- a/manpages/po/de/live-config.7.po
+++ b/manpages/po/de/live-config.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 3.0~a40-1\n"
-"POT-Creation-Date: 2012-06-14 07:57+0300\n"
+"Project-Id-Version: live-config 3.0~a41-1\n"
+"POT-Creation-Date: 2012-06-27 14:24+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Daniel Baumann <daniel at debian.org>\n"
"Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2012-06-14"
-msgstr "14.06.2012"
+msgid "2012-06-27"
+msgstr "27.06.2012"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a40-1"
-msgstr "3.0~a40-1"
+msgid "3.0~a41-1"
+msgstr "3.0~a41-1"
#. type: TH
#: en/live-config.7:9
diff --git a/manpages/po/es/live-config.7.po b/manpages/po/es/live-config.7.po
index 561d8a9..696fc7b 100644
--- a/manpages/po/es/live-config.7.po
+++ b/manpages/po/es/live-config.7.po
@@ -5,8 +5,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 3.0~a40-1\n"
-"POT-Creation-Date: 2012-06-14 07:57+0300\n"
+"Project-Id-Version: live-config 3.0~a41-1\n"
+"POT-Creation-Date: 2012-06-27 14:24+0300\n"
"PO-Revision-Date: 2012-04-07 17:19+0200\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: none\n"
@@ -25,14 +25,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2012-06-14"
-msgstr "14.06.2012"
+msgid "2012-06-27"
+msgstr "27.06.2012"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a40-1"
-msgstr "3.0~a40-1"
+msgid "3.0~a41-1"
+msgstr "3.0~a41-1"
#. type: TH
#: en/live-config.7:9
diff --git a/manpages/po/fr/live-config.7.po b/manpages/po/fr/live-config.7.po
index f529eaa..f8cb1e3 100644
--- a/manpages/po/fr/live-config.7.po
+++ b/manpages/po/fr/live-config.7.po
@@ -5,11 +5,11 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 3.0~a40-1\n"
-"POT-Creation-Date: 2012-06-14 07:57+0300\n"
+"Project-Id-Version: live-config 3.0~a41-1\n"
+"POT-Creation-Date: 2012-06-27 14:24+0300\n"
"PO-Revision-Date: 2012-04-18 15:46+0200\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
-"Language-Team: <debian-live at lists.debian.org>\n"
+"Language-Team: none\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -25,14 +25,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2012-06-14"
-msgstr "14.06.2012"
+msgid "2012-06-27"
+msgstr "27.06.2012"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a40-1"
-msgstr "3.0~a40-1"
+msgid "3.0~a41-1"
+msgstr "3.0~a41-1"
#. type: TH
#: en/live-config.7:9
diff --git a/manpages/po/it/live-config.7.po b/manpages/po/it/live-config.7.po
index f67cd61..941069e 100644
--- a/manpages/po/it/live-config.7.po
+++ b/manpages/po/it/live-config.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 3.0~a40-1\n"
-"POT-Creation-Date: 2012-06-14 07:57+0300\n"
+"Project-Id-Version: live-config 3.0~a41-1\n"
+"POT-Creation-Date: 2012-06-27 14:24+0300\n"
"PO-Revision-Date: 2011-12-06 08:01+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: none\n"
@@ -23,14 +23,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2012-06-14"
-msgstr "14.06.2012"
+msgid "2012-06-27"
+msgstr "27.06.2012"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a40-1"
-msgstr "3.0~a40-1"
+msgid "3.0~a41-1"
+msgstr "3.0~a41-1"
#. type: TH
#: en/live-config.7:9
diff --git a/manpages/po/pt_BR/live-config.7.po b/manpages/po/pt_BR/live-config.7.po
index 0f5c8fb..8828e6e 100644
--- a/manpages/po/pt_BR/live-config.7.po
+++ b/manpages/po/pt_BR/live-config.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 3.0~a40-1\n"
-"POT-Creation-Date: 2012-06-14 07:57+0300\n"
+"Project-Id-Version: live-config 3.0~a41-1\n"
+"POT-Creation-Date: 2012-06-27 14:24+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Tassia Camoes Araujo <tassia at gmail.com>\n"
"Language-Team: none\n"
@@ -23,14 +23,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2012-06-14"
-msgstr "14-06-2012"
+msgid "2012-06-27"
+msgstr "27-06-2012"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a40-1"
-msgstr "3.0~a40-1"
+msgid "3.0~a41-1"
+msgstr "3.0~a41-1"
#. type: TH
#: en/live-config.7:9
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index 7d0de50..2e7e786 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: 2012-06-14 07:57+0300\n"
+"POT-Creation-Date: 2012-06-27 14:24+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"
@@ -25,13 +25,13 @@ msgstr ""
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2012-06-14"
+msgid "2012-06-27"
msgstr ""
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a40-1"
+msgid "3.0~a41-1"
msgstr ""
#. type: TH
diff --git a/manpages/pt_BR/live-config.pt_BR.7 b/manpages/pt_BR/live-config.pt_BR.7
index 20e37c0..c4e8cf4 100644
--- a/manpages/pt_BR/live-config.pt_BR.7
+++ b/manpages/pt_BR/live-config.pt_BR.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 14\-06\-2012 3.0~a40\-1 "Projeto Debian Live"
+.TH LIVE\-CONFIG 7 27\-06\-2012 3.0~a41\-1 "Projeto Debian Live"
.SH NOME
\fBlive\-config\fP \- Scripts para Configuração do Sistema
diff --git a/scripts/config.sh b/scripts/config.sh
index 270973b..89c3176 100755
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -98,7 +98,7 @@ Cmdline ()
then
for _CONFIG in $(echo ${LIVE_CONFIGS} | sed -e 's|,| |g')
do
- _SCRIPTS="${_SCRIPTS} $(ls /lib/live/config/???-${_CONFIG} 2> /dev/null || true)"
+ _SCRIPTS="${_SCRIPTS} $(ls /lib/live/config/????-${_CONFIG} 2> /dev/null || true)"
done
fi
@@ -107,7 +107,7 @@ Cmdline ()
then
for _NOCONFIG in $(echo ${LIVE_NOCONFIGS} | sed -e 's|,| |g')
do
- _SCRIPTS="$(echo ${_SCRIPTS} | sed -e "s|$(ls /lib/live/config/???-${_NOCONFIG} 2> /dev/null || echo none)||")"
+ _SCRIPTS="$(echo ${_SCRIPTS} | sed -e "s|$(ls /lib/live/config/????-${_NOCONFIG} 2> /dev/null || echo none)||")"
done
fi
}
diff --git a/scripts/config/001-debconf b/scripts/config/0010-debconf
similarity index 100%
rename from scripts/config/001-debconf
rename to scripts/config/0010-debconf
diff --git a/scripts/config/002-hostname b/scripts/config/0020-hostname
similarity index 100%
rename from scripts/config/002-hostname
rename to scripts/config/0020-hostname
diff --git a/scripts/config/003-user-setup b/scripts/config/0030-user-setup
similarity index 100%
rename from scripts/config/003-user-setup
rename to scripts/config/0030-user-setup
diff --git a/scripts/config/004-sudo b/scripts/config/0040-sudo
similarity index 100%
rename from scripts/config/004-sudo
rename to scripts/config/0040-sudo
diff --git a/scripts/config/005-locales b/scripts/config/0050-locales
similarity index 100%
rename from scripts/config/005-locales
rename to scripts/config/0050-locales
diff --git a/scripts/config/006-locales-all b/scripts/config/0060-locales-all
similarity index 100%
rename from scripts/config/006-locales-all
rename to scripts/config/0060-locales-all
diff --git a/scripts/config/007-tzdata b/scripts/config/0070-tzdata
similarity index 100%
rename from scripts/config/007-tzdata
rename to scripts/config/0070-tzdata
diff --git a/scripts/config/008-gdm b/scripts/config/0080-gdm
similarity index 100%
rename from scripts/config/008-gdm
rename to scripts/config/0080-gdm
diff --git a/scripts/config/009-gdm3 b/scripts/config/0090-gdm3
similarity index 100%
rename from scripts/config/009-gdm3
rename to scripts/config/0090-gdm3
diff --git a/scripts/config/010-kdm b/scripts/config/0100-kdm
similarity index 100%
rename from scripts/config/010-kdm
rename to scripts/config/0100-kdm
diff --git a/scripts/config/011-lightdm b/scripts/config/0110-lightdm
similarity index 100%
rename from scripts/config/011-lightdm
rename to scripts/config/0110-lightdm
diff --git a/scripts/config/012-lxdm b/scripts/config/0120-lxdm
similarity index 100%
rename from scripts/config/012-lxdm
rename to scripts/config/0120-lxdm
diff --git a/scripts/config/013-nodm b/scripts/config/0130-nodm
similarity index 100%
rename from scripts/config/013-nodm
rename to scripts/config/0130-nodm
diff --git a/scripts/config/014-slim b/scripts/config/0140-slim
similarity index 100%
rename from scripts/config/014-slim
rename to scripts/config/0140-slim
diff --git a/scripts/config/015-xinit b/scripts/config/0150-xinit
similarity index 100%
rename from scripts/config/015-xinit
rename to scripts/config/0150-xinit
diff --git a/scripts/config/016-keyboard-configuration b/scripts/config/0160-keyboard-configuration
similarity index 100%
rename from scripts/config/016-keyboard-configuration
rename to scripts/config/0160-keyboard-configuration
diff --git a/scripts/config/017-sysvinit b/scripts/config/0170-sysvinit
similarity index 100%
rename from scripts/config/017-sysvinit
rename to scripts/config/0170-sysvinit
diff --git a/scripts/config/018-sysv-rc b/scripts/config/0180-sysv-rc
similarity index 100%
rename from scripts/config/018-sysv-rc
rename to scripts/config/0180-sysv-rc
diff --git a/scripts/config/019-upstart b/scripts/config/0190-upstart
similarity index 100%
rename from scripts/config/019-upstart
rename to scripts/config/0190-upstart
diff --git a/scripts/config/101-apport b/scripts/config/1010-apport
similarity index 100%
rename from scripts/config/101-apport
rename to scripts/config/1010-apport
diff --git a/scripts/config/102-gnome-panel-data b/scripts/config/1020-gnome-panel-data
similarity index 100%
rename from scripts/config/102-gnome-panel-data
rename to scripts/config/1020-gnome-panel-data
diff --git a/scripts/config/103-gnome-power-manager b/scripts/config/1030-gnome-power-manager
similarity index 100%
rename from scripts/config/103-gnome-power-manager
rename to scripts/config/1030-gnome-power-manager
diff --git a/scripts/config/104-gnome-screensaver b/scripts/config/1040-gnome-screensaver
similarity index 100%
rename from scripts/config/104-gnome-screensaver
rename to scripts/config/1040-gnome-screensaver
diff --git a/scripts/config/105-initramfs-tools b/scripts/config/1050-initramfs-tools
similarity index 100%
rename from scripts/config/105-initramfs-tools
rename to scripts/config/1050-initramfs-tools
diff --git a/scripts/config/106-kaboom b/scripts/config/1060-kaboom
similarity index 100%
rename from scripts/config/106-kaboom
rename to scripts/config/1060-kaboom
diff --git a/scripts/config/107-kde-services b/scripts/config/1070-kde-services
similarity index 100%
rename from scripts/config/107-kde-services
rename to scripts/config/1070-kde-services
diff --git a/scripts/config/108-debian-installer-launcher b/scripts/config/1080-debian-installer-launcher
similarity index 100%
rename from scripts/config/108-debian-installer-launcher
rename to scripts/config/1080-debian-installer-launcher
diff --git a/scripts/config/109-module-init-tools b/scripts/config/1090-module-init-tools
similarity index 100%
rename from scripts/config/109-module-init-tools
rename to scripts/config/1090-module-init-tools
diff --git a/scripts/config/110-policykit b/scripts/config/1100-policykit
similarity index 100%
rename from scripts/config/110-policykit
rename to scripts/config/1100-policykit
diff --git a/scripts/config/111-sslcert b/scripts/config/1110-sslcert
similarity index 100%
rename from scripts/config/111-sslcert
rename to scripts/config/1110-sslcert
diff --git a/scripts/config/112-update-notifier b/scripts/config/1120-update-notifier
similarity index 100%
rename from scripts/config/112-update-notifier
rename to scripts/config/1120-update-notifier
diff --git a/scripts/config/113-anacron b/scripts/config/1130-anacron
similarity index 100%
rename from scripts/config/113-anacron
rename to scripts/config/1130-anacron
diff --git a/scripts/config/114-util-linux b/scripts/config/1140-util-linux
similarity index 100%
rename from scripts/config/114-util-linux
rename to scripts/config/1140-util-linux
diff --git a/scripts/config/115-login b/scripts/config/1150-login
similarity index 100%
rename from scripts/config/115-login
rename to scripts/config/1150-login
diff --git a/scripts/config/116-xserver-xorg b/scripts/config/1160-xserver-xorg
similarity index 100%
rename from scripts/config/116-xserver-xorg
rename to scripts/config/1160-xserver-xorg
diff --git a/scripts/config/117-ureadahead b/scripts/config/1170-ureadahead
similarity index 100%
rename from scripts/config/117-ureadahead
rename to scripts/config/1170-ureadahead
diff --git a/scripts/config/118-openssh-server b/scripts/config/1180-openssh-server
similarity index 100%
rename from scripts/config/118-openssh-server
rename to scripts/config/1180-openssh-server
diff --git a/scripts/config/999-hooks b/scripts/config/9990-hooks
similarity index 100%
rename from scripts/config/999-hooks
rename to scripts/config/9990-hooks
--
live-config
More information about the debian-live-changes
mailing list