[SCM] live-config branch, upstream, updated. upstream/3.0.1-1-g3fe6a2b

Daniel Baumann daniel at debian.org
Tue Aug 14 09:11:18 UTC 2012


The following commit has been merged in the upstream branch:
commit 3fe6a2b0537a2f3156bc9bfd244a826124a6fc42
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Aug 14 11:11:13 2012 +0200

    Adding upstream version 3.0.2.

diff --git a/VERSION b/VERSION
index 818ac95..bd19b62 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0.1-1
+3.0.2-1
diff --git a/bin/live-debconfig b/bin/live-debconfig
deleted file mode 100755
index 69b49f7..0000000
--- a/bin/live-debconfig
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# Setup local debconf
-if [ ! -e /var/lib/live/debconfig ]
-then
-	mkdir -p /var/lib/live/debconfig
-	chmod 0700 /var/lib/live/debconfig
-fi
-
-if [ ! -e /var/lib/live/debconfig/systemrc ]
-then
-
-cat > /var/lib/live/debconfig/systemrc << EOF
-Config: configdb
-Templates: templatedb
-
-Name: config
-Driver: File
-Mode: 644
-Reject-Type: password
-Filename: /var/lib/live/debconfig/config.dat
-
-Name: passwords
-Driver: File
-Mode: 600
-Backup: false
-Required: false
-Accept-Type: password
-Filename: /var/lib/live/debconfig/passwords.dat
-
-Name: configdb
-Driver: Stack
-Stack: config, passwords
-
-Name: templatedb
-Driver: File
-Mode: 644
-Filename: /var/lib/live/debconfig/templates.dat
-EOF
-
-fi
-
-DEBCONF_SYSTEMRC="/var/lib/live/debconfig/systemrc"
-
-if [ "${1}" = "--noscripts" ]
-then
-	exit
-fi
-
-# Run debconf scripts
-for _SCRIPT in /lib/live/debconfig/*
-do
-	if [ -x "${_SCRIPT}" ]
-	then
-		# FIXME: make scripts a multiselect
-		"${_SCRIPT}"
-	fi
-done
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index b019e79..629eff8 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 10.08.2012 3.0.1\-1 "Debian Live Projekt"
+.TH LIVE\-CONFIG 7 14.08.2012 3.0.2\-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 cd0c47b..c5b50f2 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\-08\-10 3.0.1-1 "Debian Live Project"
+.TH LIVE\-CONFIG 7 2012\-08\-14 3.0.2-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 86f7711..4b0910d 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 10.08.2012 3.0.1\-1 "Proyecto Debian Live"
+.TH LIVE\-CONFIG 7 14.08.2012 3.0.2\-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 aeba99d..bc1b616 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 10.08.2012 3.0.1\-1 "Projet Debian Live"
+.TH LIVE\-CONFIG 7 14.08.2012 3.0.2\-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 7767f78..6e11fd0 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 10.08.2012 3.0.1\-1 "Progetto Debian Live"
+.TH LIVE\-CONFIG 7 14.08.2012 3.0.2\-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 ec73f19..244fdd9 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.1-1\n"
-"POT-Creation-Date: 2012-08-10 22:35+0300\n"
+"Project-Id-Version: live-config 3.0.2-1\n"
+"POT-Creation-Date: 2012-08-14 11:08+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-08-10"
-msgstr "10.08.2012"
+msgid "2012-08-14"
+msgstr "14.08.2012"
 
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "3.0.1-1"
-msgstr "3.0.1-1"
+msgid "3.0.2-1"
+msgstr "3.0.2-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 75a539b..4a9a56c 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.1-1\n"
-"POT-Creation-Date: 2012-08-10 22:35+0300\n"
+"Project-Id-Version: live-config 3.0.2-1\n"
+"POT-Creation-Date: 2012-08-14 11:08+0300\n"
 "PO-Revision-Date: 2012-07-28 22:11+0100\n"
 "Last-Translator: Carlos Zuferri <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-08-10"
-msgstr "10.08.2012"
+msgid "2012-08-14"
+msgstr "14.08.2012"
 
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "3.0.1-1"
-msgstr "3.0.1-1"
+msgid "3.0.2-1"
+msgstr "3.0.2-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 0a92903..ed22ab5 100644
--- a/manpages/po/fr/live-config.7.po
+++ b/manpages/po/fr/live-config.7.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-config 3.0.1-1\n"
-"POT-Creation-Date: 2012-08-10 22:35+0300\n"
+"Project-Id-Version: live-config 3.0.2-1\n"
+"POT-Creation-Date: 2012-08-14 11:08+0300\n"
 "PO-Revision-Date: 2012-07-28 22:13+0100\n"
 "Last-Translator: Carlos Zuferri <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-08-10"
-msgstr "10.08.2012"
+msgid "2012-08-14"
+msgstr "14.08.2012"
 
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "3.0.1-1"
-msgstr "3.0.1-1"
+msgid "3.0.2-1"
+msgstr "3.0.2-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 b9ea992..b0f9f2e 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.1-1\n"
-"POT-Creation-Date: 2012-08-10 22:35+0300\n"
+"Project-Id-Version: live-config 3.0.2-1\n"
+"POT-Creation-Date: 2012-08-14 11:08+0300\n"
 "PO-Revision-Date: 2012-08-03 17:13+0200\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-08-10"
-msgstr "10.08.2012"
+msgid "2012-08-14"
+msgstr "14.08.2012"
 
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "3.0.1-1"
-msgstr "3.0.1-1"
+msgid "3.0.2-1"
+msgstr "3.0.2-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 eea301e..894e17e 100644
--- a/manpages/po/pt_BR/live-config.7.po
+++ b/manpages/po/pt_BR/live-config.7.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-config 3.0.1-1\n"
-"POT-Creation-Date: 2012-08-10 22:35+0300\n"
+"Project-Id-Version: live-config 3.0.2-1\n"
+"POT-Creation-Date: 2012-08-14 11:08+0300\n"
 "PO-Revision-Date: 2012-07-28 11:38-0400\n"
 "Last-Translator: Tiago Bortoletto Vaz <tiago at debian.org>\n"
 "Language-Team: none\n"
@@ -25,14 +25,14 @@ msgstr "LIVE-CONFIG"
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "2012-08-10"
-msgstr "10-08-2012"
+msgid "2012-08-14"
+msgstr "14-08-2012"
 
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "3.0.1-1"
-msgstr "3.0.1-1"
+msgid "3.0.2-1"
+msgstr "3.0.2-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 af9abd9..b5cfd44 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-08-10 22:35+0300\n"
+"POT-Creation-Date: 2012-08-14 11:08+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-08-10"
+msgid "2012-08-14"
 msgstr ""
 
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "3.0.1-1"
+msgid "3.0.2-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 0b34a37..a99e492 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 10\-08\-2012 3.0.1\-1 "Projeto Debian Live"
+.TH LIVE\-CONFIG 7 14\-08\-2012 3.0.2\-1 "Projeto Debian Live"
 
 .SH NOME
 \fBlive\-config\fP \- Scripts para Configuração do Sistema

-- 
live-config



More information about the debian-live-changes mailing list