[SCM] live-debconfig branch, debian-next, updated. debian/4.0_a3-1-21-g951d0dc
Daniel Baumann
daniel at debian.org
Fri Aug 17 14:54:20 UTC 2012
The following commit has been merged in the debian-next branch:
commit 951d0dc9d4d1af102ca847b4bc5dd6704278644d
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Aug 17 16:54:05 2012 +0200
Releasing debian version 4.0~a4-1.
diff --git a/VERSION b/VERSION
index 80ca3a5..ccb6a78 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.0~a3-1
+4.0~a4-1
diff --git a/debian/changelog b/debian/changelog
index 98a86b7..94580f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,43 @@
+live-debconfig (4.0~a4-1) unstable; urgency=low
+
+ [ Daniel Baumann ]
+ * Harmonizing script descriptions in live-debconfig manpage.
+
+ [ chals ]
+ * Updating the Spanish translation of two strings.
+ * Adding initial French translation for the current version.
+ * Adding initial Catalan translation for the current version.
+
+ [ Daniel Baumann ]
+ * Harmonizing po file headers.
+ * Correcting spelling typo in db_get call of the ifupdown script.
+ * Correcting /etc/default/hwclock handling in util-linux script for
+ cases where it was locally removed.
+ * Correcting version check of util-linux in util-linux script.
+ * Adding whitespace seperaters in generated resolv.conf in ifupdown
+ script.
+ * Only reading existing nameserver settings in ifupdown script from
+ /etc/resolv.conf if the file is existing.
+ * Prepeding scripts execution with custom debconf systemrc to avoid
+ needing to export the variable to make it work.
+ * Removing default values from debconf templates since defaults are
+ derived from scripts automatically and independently.
+ * Adding a workaround in ifupdown script when reading defaults for
+ nameserver addresses from resolv.conf to get rid of newlines as
+ debconf can not handle multiline return values in assignments.
+ * Evening out whitespace seperation in ifupdown script when generating
+ /etc/network/interfaces.
+ * Correcting db_setttile typo in ifupdown script.
+ * Correcting db_input typo in ifupdown script.
+ * Also removing /var/lib/live on purge if empty.
+ * Replacing /bin/true symlinks with an empty initscript to fake LSB
+ headers in sysvinit script.
+ * Replacing test for stop links in sysvinit script with ls to match on
+ wildcards.
+ * Completing insserv and update-rc.d silencing in sysvinit script.
+
+ -- Daniel Baumann <daniel.baumann at progress-technologies.net> Fri, 17 Aug 2012 16:51:10 +0200
+
live-debconfig (4.0~a3-1) unstable; urgency=low
* Reworking disabling and removal of sysvinit services in a non-
diff --git a/manpages/ca/live-debconfig.ca.7 b/manpages/ca/live-debconfig.ca.7
index b30771a..37c7b9e 100644
--- a/manpages/ca/live-debconfig.ca.7
+++ b/manpages/ca/live-debconfig.ca.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-DEBCONFIG 7 2012\-08\-17 4.0~a3\-1 "Projecte Debian Live"
+.TH LIVE\-DEBCONFIG 7 2012\-08\-17 4.0~a4\-1 "Projecte Debian Live"
.SH NOM
\fBlive\-debconfig\fP \- Scripts de Configuració del Sistema
diff --git a/manpages/ca/live-debconfig_hostname.ca.5 b/manpages/ca/live-debconfig_hostname.ca.5
index 069052b..368eeea 100644
--- a/manpages/ca/live-debconfig_hostname.ca.5
+++ b/manpages/ca/live-debconfig_hostname.ca.5
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-DEBCONFIG 5 2012\-08\-17 4.0~a3\-1 "Projecte Debian Live"
+.TH LIVE\-DEBCONFIG 5 2012\-08\-17 4.0~a4\-1 "Projecte Debian Live"
.SH NOM
\fBlive\-debconfig\fP \- script hostname
diff --git a/manpages/de/live-debconfig.de.7 b/manpages/de/live-debconfig.de.7
index 2c3a47b..620ae6e 100644
--- a/manpages/de/live-debconfig.de.7
+++ b/manpages/de/live-debconfig.de.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-DEBCONFIG 7 17.08.2012 4.0~a3\-1 "Debian Live Projekt"
+.TH LIVE\-DEBCONFIG 7 17.08.2012 4.0~a4\-1 "Debian Live Projekt"
.SH NAME
\fBlive\-debconfig\fP \- System Konfiguration Skripte
diff --git a/manpages/de/live-debconfig_hostname.de.5 b/manpages/de/live-debconfig_hostname.de.5
index 3dcf219..fa8fce5 100644
--- a/manpages/de/live-debconfig_hostname.de.5
+++ b/manpages/de/live-debconfig_hostname.de.5
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-DEBCONFIG 5 17.08.2012 4.0~a3\-1 "Debian Live Projekt"
+.TH LIVE\-DEBCONFIG 5 17.08.2012 4.0~a4\-1 "Debian Live Projekt"
.SH NAME
\fBlive\-debconfig\fP \- Hostname Skript
diff --git a/manpages/en/live-debconfig.7 b/manpages/en/live-debconfig.7
index 720e628..534f9c5 100644
--- a/manpages/en/live-debconfig.7
+++ b/manpages/en/live-debconfig.7
@@ -6,7 +6,7 @@
.\" under certain conditions; see COPYING for details.
.\"
.\"
-.TH LIVE\-DEBCONFIG 7 2012\-08\-17 4.0~a3-1 "Debian Live Project"
+.TH LIVE\-DEBCONFIG 7 2012\-08\-17 4.0~a4-1 "Debian Live Project"
.SH NAME
\fBlive\-debconfig\fR \- System Configuration Scripts
diff --git a/manpages/en/live-debconfig_hostname.5 b/manpages/en/live-debconfig_hostname.5
index bbb67ac..c1e7238 100644
--- a/manpages/en/live-debconfig_hostname.5
+++ b/manpages/en/live-debconfig_hostname.5
@@ -6,7 +6,7 @@
.\" under certain conditions; see COPYING for details.
.\"
.\"
-.TH LIVE\-DEBCONFIG 5 2012\-08\-17 4.0~a3-1 "Debian Live Project"
+.TH LIVE\-DEBCONFIG 5 2012\-08\-17 4.0~a4-1 "Debian Live Project"
.SH NAME
\fBlive\-debconfig\fR \- hostname script
diff --git a/manpages/es/live-debconfig.es.7 b/manpages/es/live-debconfig.es.7
index 177022e..8cc426b 100644
--- a/manpages/es/live-debconfig.es.7
+++ b/manpages/es/live-debconfig.es.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-DEBCONFIG 7 17.08.2012 4.0~a3\-1 "Proyecto Debian Live"
+.TH LIVE\-DEBCONFIG 7 17.08.2012 4.0~a4\-1 "Proyecto Debian Live"
.SH NOMBRE
\fBlive\-debconfig\fP \- Scripts de Configuración del Sistema
diff --git a/manpages/es/live-debconfig_hostname.es.5 b/manpages/es/live-debconfig_hostname.es.5
index eb6198f..d17510d 100644
--- a/manpages/es/live-debconfig_hostname.es.5
+++ b/manpages/es/live-debconfig_hostname.es.5
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-DEBCONFIG 5 17.08.2012 4.0~a3\-1 "Proyecto Debian Live"
+.TH LIVE\-DEBCONFIG 5 17.08.2012 4.0~a4\-1 "Proyecto Debian Live"
.SH NOMBRE
\fBlive\-debconfig\fP \- script hostname
diff --git a/manpages/fr/live-debconfig.fr.7 b/manpages/fr/live-debconfig.fr.7
index a607619..6f1520e 100644
--- a/manpages/fr/live-debconfig.fr.7
+++ b/manpages/fr/live-debconfig.fr.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-DEBCONFIG 7 2012\-08\-17 4.0~a3\-1 "Projet Debian Live"
+.TH LIVE\-DEBCONFIG 7 2012\-08\-17 4.0~a4\-1 "Projet Debian Live"
.SH NOM
\fBlive\-debconfig\fP \- Scripts de configuration du système
diff --git a/manpages/fr/live-debconfig_hostname.fr.5 b/manpages/fr/live-debconfig_hostname.fr.5
index 1ef0006..204c862 100644
--- a/manpages/fr/live-debconfig_hostname.fr.5
+++ b/manpages/fr/live-debconfig_hostname.fr.5
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-DEBCONFIG 5 2012\-08\-17 4.0~a3\-1 "Projet Debian Live"
+.TH LIVE\-DEBCONFIG 5 2012\-08\-17 4.0~a4\-1 "Projet Debian Live"
.SH NOM
\fBlive\-debconfig\fP \- script hostname
diff --git a/manpages/po/ca/live-debconfig.7.po b/manpages/po/ca/live-debconfig.7.po
index e16c8eb..d2608ca 100644
--- a/manpages/po/ca/live-debconfig.7.po
+++ b/manpages/po/ca/live-debconfig.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-debconfig VERSION\n"
-"POT-Creation-Date: 2012-08-17 00:03+0300\n"
+"Project-Id-Version: live-debconfig 4.0~a4-1\n"
+"POT-Creation-Date: 2012-08-17 16:52+0300\n"
"PO-Revision-Date: 2012-08-17 00:41+0100\n"
"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: none\n"
@@ -30,8 +30,8 @@ msgstr "2012-08-17"
#. type: TH
#: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
#, no-wrap
-msgid "4.0~a3-1"
-msgstr "4.0~a3-1"
+msgid "4.0~a4-1"
+msgstr "4.0~a4-1"
#. type: TH
#: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
diff --git a/manpages/po/ca/live-debconfig_hostname.5.po b/manpages/po/ca/live-debconfig_hostname.5.po
index f332dc3..aa9d0e6 100644
--- a/manpages/po/ca/live-debconfig_hostname.5.po
+++ b/manpages/po/ca/live-debconfig_hostname.5.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-debconfig VERSION\n"
-"POT-Creation-Date: 2012-08-17 00:03+0300\n"
+"Project-Id-Version: live-debconfig 4.0~a4-1\n"
+"POT-Creation-Date: 2012-08-17 16:52+0300\n"
"PO-Revision-Date: 2012-07-31 14:56+0200\n"
"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: none\n"
@@ -30,8 +30,8 @@ msgstr "2012-08-17"
#. type: TH
#: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
#, no-wrap
-msgid "4.0~a3-1"
-msgstr "4.0~a3-1"
+msgid "4.0~a4-1"
+msgstr "4.0~a4-1"
#. type: TH
#: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
diff --git a/manpages/po/de/live-debconfig.7.po b/manpages/po/de/live-debconfig.7.po
index 727f3be..897e2f4 100644
--- a/manpages/po/de/live-debconfig.7.po
+++ b/manpages/po/de/live-debconfig.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-debconfig 4.0~a3-1\n"
-"POT-Creation-Date: 2012-08-17 00:03+0300\n"
+"Project-Id-Version: live-debconfig 4.0~a4-1\n"
+"POT-Creation-Date: 2012-08-17 16:52+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"
@@ -30,8 +30,8 @@ msgstr "17.08.2012"
#. type: TH
#: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
#, no-wrap
-msgid "4.0~a3-1"
-msgstr "4.0~a3-1"
+msgid "4.0~a4-1"
+msgstr "4.0~a4-1"
#. type: TH
#: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
diff --git a/manpages/po/de/live-debconfig_hostname.5.po b/manpages/po/de/live-debconfig_hostname.5.po
index 9cf9476..9cb35f2 100644
--- a/manpages/po/de/live-debconfig_hostname.5.po
+++ b/manpages/po/de/live-debconfig_hostname.5.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-debconfig 4.0~a3-1\n"
-"POT-Creation-Date: 2012-08-17 00:03+0300\n"
+"Project-Id-Version: live-debconfig 4.0~a4-1\n"
+"POT-Creation-Date: 2012-08-17 16:52+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"
@@ -30,8 +30,8 @@ msgstr "17.08.2012"
#. type: TH
#: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
#, no-wrap
-msgid "4.0~a3-1"
-msgstr "4.0~a3-1"
+msgid "4.0~a4-1"
+msgstr "4.0~a4-1"
#. type: TH
#: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
diff --git a/manpages/po/es/live-debconfig.7.po b/manpages/po/es/live-debconfig.7.po
index abd7b5d..2db3dd7 100644
--- a/manpages/po/es/live-debconfig.7.po
+++ b/manpages/po/es/live-debconfig.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-debconfig 4.0~a3-1\n"
-"POT-Creation-Date: 2012-08-17 00:03+0300\n"
+"Project-Id-Version: live-debconfig 4.0~a4-1\n"
+"POT-Creation-Date: 2012-08-17 16:52+0300\n"
"PO-Revision-Date: 2012-08-17 00:17+0100\n"
"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: none\n"
@@ -30,8 +30,8 @@ msgstr "17.08.2012"
#. type: TH
#: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
#, no-wrap
-msgid "4.0~a3-1"
-msgstr "4.0~a3-1"
+msgid "4.0~a4-1"
+msgstr "4.0~a4-1"
#. type: TH
#: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
diff --git a/manpages/po/es/live-debconfig_hostname.5.po b/manpages/po/es/live-debconfig_hostname.5.po
index 1041ae0..6edd91b 100644
--- a/manpages/po/es/live-debconfig_hostname.5.po
+++ b/manpages/po/es/live-debconfig_hostname.5.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-debconfig 4.0~a3-1\n"
-"POT-Creation-Date: 2012-08-17 00:03+0300\n"
+"Project-Id-Version: live-debconfig 4.0~a4-1\n"
+"POT-Creation-Date: 2012-08-17 16:52+0300\n"
"PO-Revision-Date: 2012-07-30 14:39+0200\n"
"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: none\n"
@@ -30,8 +30,8 @@ msgstr "17.08.2012"
#. type: TH
#: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
#, no-wrap
-msgid "4.0~a3-1"
-msgstr "4.0~a3-1"
+msgid "4.0~a4-1"
+msgstr "4.0~a4-1"
#. type: TH
#: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
diff --git a/manpages/po/fr/live-debconfig.7.po b/manpages/po/fr/live-debconfig.7.po
index 9e26b7a..be25b1d 100644
--- a/manpages/po/fr/live-debconfig.7.po
+++ b/manpages/po/fr/live-debconfig.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-debconfig VERSION\n"
-"POT-Creation-Date: 2012-08-17 00:03+0300\n"
+"Project-Id-Version: live-debconfig 4.0~a4-1\n"
+"POT-Creation-Date: 2012-08-17 16:52+0300\n"
"PO-Revision-Date: 2012-08-17 00:35+0100\n"
"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: none\n"
@@ -29,8 +29,8 @@ msgstr "2012-08-17"
#. type: TH
#: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
#, no-wrap
-msgid "4.0~a3-1"
-msgstr "4.0~a3-1"
+msgid "4.0~a4-1"
+msgstr "4.0~a4-1"
#. type: TH
#: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
diff --git a/manpages/po/fr/live-debconfig_hostname.5.po b/manpages/po/fr/live-debconfig_hostname.5.po
index cac053a..411ca46 100644
--- a/manpages/po/fr/live-debconfig_hostname.5.po
+++ b/manpages/po/fr/live-debconfig_hostname.5.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-debconfig VERSION\n"
-"POT-Creation-Date: 2012-08-17 00:03+0300\n"
+"Project-Id-Version: live-debconfig 4.0~a4-1\n"
+"POT-Creation-Date: 2012-08-17 16:52+0300\n"
"PO-Revision-Date: 2012-08-17 00:35+0100\n"
"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: none\n"
@@ -29,8 +29,8 @@ msgstr "2012-08-17"
#. type: TH
#: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
#, no-wrap
-msgid "4.0~a3-1"
-msgstr "4.0~a3-1"
+msgid "4.0~a4-1"
+msgstr "4.0~a4-1"
#. type: TH
#: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
diff --git a/manpages/pot/live-debconfig.7.pot b/manpages/pot/live-debconfig.7.pot
index 01333e7..11c5ca2 100644
--- a/manpages/pot/live-debconfig.7.pot
+++ b/manpages/pot/live-debconfig.7.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-debconfig VERSION\n"
-"POT-Creation-Date: 2012-08-17 00:03+0300\n"
+"POT-Creation-Date: 2012-08-17 16:52+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"
@@ -31,7 +31,7 @@ msgstr ""
#. type: TH
#: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
#, no-wrap
-msgid "4.0~a3-1"
+msgid "4.0~a4-1"
msgstr ""
#. type: TH
diff --git a/manpages/pot/live-debconfig_hostname.5.pot b/manpages/pot/live-debconfig_hostname.5.pot
index 8611510..bc3d0b2 100644
--- a/manpages/pot/live-debconfig_hostname.5.pot
+++ b/manpages/pot/live-debconfig_hostname.5.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-debconfig VERSION\n"
-"POT-Creation-Date: 2012-08-17 00:03+0300\n"
+"POT-Creation-Date: 2012-08-17 16:52+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"
@@ -31,7 +31,7 @@ msgstr ""
#. type: TH
#: en/live-debconfig.7:9 en/live-debconfig_hostname.5:9
#, no-wrap
-msgid "4.0~a3-1"
+msgid "4.0~a4-1"
msgstr ""
#. type: TH
--
live-debconfig
More information about the debian-live-changes
mailing list