[SCM] live-config branch, upstream, updated. upstream/3.0_a38-1-gfd939f6
Daniel Baumann
daniel at debian.org
Wed Jun 6 17:15:14 UTC 2012
The following commit has been merged in the upstream branch:
commit fd939f6d4e98bd1aea10975f5e8c0bb206dc3811
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Jun 6 19:14:22 2012 +0200
Adding upstream version 3.0~a39.
diff --git a/Makefile b/Makefile
index 9af1961..ae3d0c9 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ SHELL := sh -e
LANGUAGES = $(shell cd manpages/po && ls)
-SCRIPTS = bin/* scripts/*.sh scripts/*/*
+SCRIPTS = backends/*/*.init bin/* scripts/*.sh scripts/*/*
all: build
@@ -48,6 +48,19 @@ build:
@echo "Nothing to build."
install:
+ # Installing backends
+ mkdir -p $(DESTDIR)/etc/init.d
+ cp backends/sysvinit/live-config.init $(DESTDIR)/etc/init.d/live-config
+ cp backends/sysvinit/live.init $(DESTDIR)/etc/init.d/live
+
+ mkdir -p $(DESTDIR)/etc/init
+ cp backends/upstart/live-config.upstart $(DESTDIR)/etc/init/live-config.conf
+
+ mkdir -p $(DESTDIR)/etc/systemd/system
+ cp backends/systemd/live-config.systemd $(DESTDIR)/etc/systemd/system/live-config.service
+ mkdir -p $(DESTDIR)/etc/systemd/system/runlevel1.target.wants
+ ln -s ../live-config.service $(DESTDIR)/etc/systemd/system/runlevel1.target.wants/live-config.service
+
# Installing scripts
mkdir -p $(DESTDIR)/lib/live
cp -r scripts/config.sh scripts/config $(DESTDIR)/lib/live
@@ -76,6 +89,22 @@ install:
done
uninstall:
+ # Uininstalling backends
+ rm -f $(DESTDIR)/etc/init.d/live
+ rm -f $(DESTDIR)/etc/init.d/live-config
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/etc/init.d > /dev/null 2>&1 || true
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/etc > /dev/null 2>&1 || true
+
+ rm -f $(DESTDIR)/etc/init/live-config.conf
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/etc/init > /dev/null 2>&1 || true
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/etc > /dev/null 2>&1 || true
+
+ rm -f $(DESTDIR)/etc/systemd/system/live-config.service
+ rm -f $(DESTDIR)/etc/systemd/system/runlevel1.target.wants/live-config.service
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/etc/systemd/system/runlevel1.target.wants > /dev/null 2>&1 || true
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/etc/systemd/system > /dev/null 2>&1 || true
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/etc/systemd > /dev/null 2>&1 || true
+
# Uninstalling scripts
rm -f $(DESTDIR)/lib/live/boot-init.sh
diff --git a/VERSION b/VERSION
index cf9496d..1e477bf 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~a38-1
+3.0~a39-1
diff --git a/backends/systemd/live-config.systemd b/backends/systemd/live-config.systemd
new file mode 100644
index 0000000..b9afb88
--- /dev/null
+++ b/backends/systemd/live-config.systemd
@@ -0,0 +1,15 @@
+## Debian Live - System Configuration Scripts
+##
+## live-config contains the scripts that configure a Debian Live system during
+## the boot process (late userspace).
+##
+## This is the systemd service for live-config.
+
+
+[Unit]
+Description=live-config contains the scripts that configure a Debian Live system during the boot process (late userspace).
+
+[Service]
+ExecStart=/lib/live/config.sh
+Type=finish
+ValidNoProcess=yes
diff --git a/backends/sysvinit/live-config.init b/backends/sysvinit/live-config.init
new file mode 100755
index 0000000..6211634
--- /dev/null
+++ b/backends/sysvinit/live-config.init
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+## live-config contains the scripts that configure a Debian Live system during
+## the boot process (late userspace).
+##
+## This is the sysvinit script for live-config.
+
+
+### BEGIN INIT INFO
+# Provides: live-config
+# Required-Start:
+# Required-Stop:
+# Should-Start:
+# Should-Stop:
+# Default-Start: S
+# Default-Stop:
+# Short-Description: Debian Live - System Configuration Scripts
+# Description: live-config contains the scripts that configure a Debian
+# Live system during the boot process (late userspace).
+# X-Start-Before: mountkernfs
+# X-Stop-After:
+# X-Interactive: true
+### END INIT INFO
+
+case "${1}" in
+ start)
+ if [ -e /lib/live/config.sh ]
+ then
+ /lib/live/config.sh ${@}
+ fi
+ ;;
+
+ force-reload|restart|stop)
+
+ ;;
+esac
diff --git a/backends/sysvinit/live.init b/backends/sysvinit/live.init
new file mode 100755
index 0000000..55e3076
--- /dev/null
+++ b/backends/sysvinit/live.init
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+## live-boot contains the scripts that configure a Debian Live system during
+## the boot process (early userspace).
+##
+## This is the sysvinit script for live-boot.
+
+
+### BEGIN INIT INFO
+# Provides: live-boot
+# Required-Start: $syslog bootmisc
+# Required-Stop:
+# Should-Start: $local_fs
+# Should-Stop: halt reboot
+# Default-Start: S
+# Default-Stop: 0 6
+# Short-Description: Debian Live - System Configuration Scripts
+# Description: live-boot contains the scripts that configure a Debian
+# Live system during the boot process (early userspace).
+# X-Start-Before:
+# X-Stop-After: umountroot
+# X-Interactive: true
+### END INIT INFO
+
+case "${1}" in
+ stop)
+ if [ -e /lib/live/boot-init.sh ]
+ then
+ /lib/live/boot-init.sh ${@}
+ fi
+ ;;
+
+ start|force-reload|restart)
+
+ ;;
+esac
diff --git a/backends/upstart/live-config.upstart b/backends/upstart/live-config.upstart
new file mode 100644
index 0000000..5e877d2
--- /dev/null
+++ b/backends/upstart/live-config.upstart
@@ -0,0 +1,22 @@
+## Debian Live - System Configuration Scripts
+##
+## live-config contains the scripts that configure a Debian Live system during
+## the boot process (late userspace).
+##
+## This is the upstart job for live-config.
+
+
+description "live-config"
+author "Debian Live Project <debian-live at lists.debian.org>"
+
+start on filesystem
+stop on runlevel [016]
+
+console output
+
+script
+ if [ -e /lib/live/config.sh ]
+ then
+ /lib/live/config.sh
+ fi
+end script
diff --git a/bin/boot-init.sh b/bin/boot-init.sh
index d560053..aee1eb6 100755
--- a/bin/boot-init.sh
+++ b/bin/boot-init.sh
@@ -3,12 +3,6 @@
# Exit if system was not booted by live-boot
grep -qs boot=live /proc/cmdline || exit 0
-DO_SNAPSHOT=/sbin/live-snapshot
-SNAPSHOT_CONF="/etc/live/boot.d/snapshot.conf"
-
-# Read snapshot configuration variables
-[ -r ${SNAPSHOT_CONF} ] && . ${SNAPSHOT_CONF}
-
# Define LSB log_* functions.
# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
. /lib/lsb/init-functions
@@ -82,21 +76,55 @@ device_is_USB_flash_drive()
return 1
}
-log_begin_msg "live-boot: resyncing snapshots and caching reboot files..."
+Eject ()
+{
+ # Exit if the system was booted from an ISO image rather than a physical CD
+ grep -qs find_iso= /proc/cmdline && return 0
+ # TODO: i18n
+ BOOT_DEVICE="$(get_boot_device)"
-if ! grep -qs nopersistence /proc/cmdline && grep -qs persistence /proc/cmdline
-then
- # ROOTSNAP and HOMESNAP are defined in ${SNAPSHOT_CONF} file
- if [ ! -z "${ROOTSNAP}" ]
+ if device_is_USB_flash_drive ${BOOT_DEVICE}
then
- ${DO_SNAPSHOT} --resync-string="${ROOTSNAP}"
+ # do NOT eject USB flash drives!
+ # otherwise rebooting with most USB flash drives
+ # failes because they actually remember the
+ # "ejected" state even after reboot
+ MESSAGE="Please remove the USB flash drive"
+
+ if [ "${NOPROMPT}" = "usb" ]
+ then
+ prompt=
+ fi
+
+ else
+ # ejecting is a very good idea here
+ MESSAGE="Please remove the disc, close the tray (if any)"
+
+ if [ -x /usr/bin/eject ]
+ then
+ eject -p -m /live/image >/dev/null 2>&1
+ fi
+
+ if [ "${NOPROMPT}" = "cd" ]
+ then
+ prompt=
+ fi
fi
- if [ ! -z "${HOMESNAP}" ]
+ [ "$prompt" ] || return 0
+
+ if [ -x /bin/plymouth ] && plymouth --ping
then
- ${DO_SNAPSHOT} --resync-string="${HOMESNAP}"
+ plymouth message --text="${MESSAGE} and press ENTER to continue:"
+ plymouth watch-keystroke > /dev/null
+ else
+ stty sane < /dev/console
+
+ printf "\n\n${MESSAGE} and press ENTER to continue:" > /dev/console
+
+ read x < /dev/console
fi
-fi
+}
# check for netboot
if [ ! -z "${NETBOOT}" ] || grep -qs netboot /proc/cmdline || grep -qsi root=/dev/nfs /proc/cmdline || grep -qsi root=/dev/cifs /proc/cmdline
@@ -125,6 +153,8 @@ then
esac
fi
+log_begin_msg "live-boot: caching reboot files..."
+
prompt=1
if [ "${NOPROMPT}" = "Yes" ]
then
@@ -136,63 +166,13 @@ do
cache_path "${path}"
done
-for x in $(cat /proc/cmdline)
-do
- case ${x} in
- quickreboot)
- QUICKREBOOT="Yes"
- ;;
- esac
-done
-
mount -o remount,ro /live/overlay
-if [ -z ${QUICKREBOOT} ]
+# Check if we need to eject the drive
+if grep -qs "cdrom-detect/eject=false" /proc/cmdline ||
+ grep -qs "noeject" /proc/cmdline
then
- # Exit if the system was booted from an ISO image rather than a physical CD
- grep -qs find_iso= /proc/cmdline && return 0
- # TODO: i18n
- BOOT_DEVICE="$(get_boot_device)"
-
- if device_is_USB_flash_drive ${BOOT_DEVICE}
- then
- # do NOT eject USB flash drives!
- # otherwise rebooting with most USB flash drives
- # failes because they actually remember the
- # "ejected" state even after reboot
- MESSAGE="Please remove the USB flash drive"
-
- if [ "${NOPROMPT}" = "usb" ]
- then
- prompt=
- fi
-
- else
- # ejecting is a very good idea here
- MESSAGE="Please remove the disc, close the tray (if any)"
-
- if [ -x /usr/bin/eject ]
- then
- eject -p -m /live/image >/dev/null 2>&1
- fi
-
- if [ "${NOPROMPT}" = "cd" ]
- then
- prompt=
- fi
- fi
-
- [ "$prompt" ] || return 0
-
- if [ -x /bin/plymouth ] && plymouth --ping
- then
- plymouth message --text="${MESSAGE} and press ENTER to continue:"
- plymouth watch-keystroke > /dev/null
- else
- stty sane < /dev/console
-
- printf "\n\n${MESSAGE} and press ENTER to continue:" > /dev/console
-
- read x < /dev/console
- fi
+ return
+else
+ Eject
fi
diff --git a/examples/live-config-foobar/debian/changelog b/examples/live-config-foobar/debian/changelog
index fd83209..20718a4 100644
--- a/examples/live-config-foobar/debian/changelog
+++ b/examples/live-config-foobar/debian/changelog
@@ -1,4 +1,4 @@
-live-config-foobar (1-1) unstable; urgency=low
+live-config-foobar (3-1) unstable; urgency=low
* Initial release based on the live-config-foobar example package
included in live-config.
diff --git a/examples/live-config-foobar/debian/control b/examples/live-config-foobar/debian/control
index d50157d..c6a2abd 100644
--- a/examples/live-config-foobar/debian/control
+++ b/examples/live-config-foobar/debian/control
@@ -10,7 +10,7 @@ Vcs-Git: git://git.example.org/git/live-config-foobar.git
Package: live-config-foobar
Architecture: all
-Depends: ${misc:Depends}, live-config
+Depends: ${misc:Depends}, live-config (>= 3), live-config (<< 4)
Description: Additional Configuration Scripts for Debian Live (foobar)
live-config contains the scripts needed to perform late-userspace actions
on Debian Live systems.
diff --git a/examples/live-config-foobar/debian/copyright b/examples/live-config-foobar/debian/copyright
index 2e4bdd5..edb6bfd 100644
--- a/examples/live-config-foobar/debian/copyright
+++ b/examples/live-config-foobar/debian/copyright
@@ -2,7 +2,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: live-config-foobar
Upstream-Contact: John Doe <john at example.org>
Source: http://www.example.org/foobar/
-Disclaimer:
+Comment:
This package is based on the live-config-foobar example package
included in live-config which can be optained from
http://live.debian.net/devel/live-config/.
diff --git a/manpages/bin/update-version.sh b/manpages/bin/update-version.sh
index f45d312..3a98c72 100755
--- a/manpages/bin/update-version.sh
+++ b/manpages/bin/update-version.sh
@@ -10,10 +10,15 @@
set -e
-DATE="$(LC_ALL=C date +%Y\\\\-%m\\\\-%d)"
PROGRAM="LIVE\\\-CONFIG"
VERSION="$(cat ../VERSION)"
+DATE="$(LC_ALL=C date +%Y\\\\-%m\\\\-%d)"
+
+DAY="$(LC_ALL=C date +%d)"
+MONTH="$(LC_ALL=C date +%m)"
+YEAR="$(LC_ALL=C date +%Y)"
+
echo "Updating version headers..."
for MANPAGE in en/*
@@ -22,3 +27,24 @@ do
sed -i -e "s|^.TH.*$|.TH ${PROGRAM} ${SECTION} ${DATE} ${VERSION} \"Debian Live Project\"|" ${MANPAGE}
done
+
+# European date format
+for _LANGUAGE in de es fr it
+do
+ if ls po/${_LANGUAGE}/*.po > /dev/null 2>&1
+ then
+ for _FILE in po/${_LANGUAGE}/*.po
+ do
+ sed -i -e "s|^msgstr .*.2012\"$|msgstr \"${DAY}.${MONTH}.${YEAR}\"|g" "${_FILE}"
+ done
+ fi
+done
+
+# Brazilian date format
+if ls po/pt_BR/*.po > /dev/null 2>&1
+then
+ for _FILE in po/pt_BR/*.po
+ do
+ sed -i -e "s|^msgstr .*-2012\"$|msgstr \"${DAY}-${MONTH}-${YEAR}\"|g" "${_FILE}"
+ done
+fi
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index 08dc3ac..7b33805 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 04.06.2012 3.0~a38\-1 "Debian Live Projekt"
+.TH LIVE\-CONFIG 7 06.06.2012 3.0~a39\-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 1a36956..2b7483f 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\-04 3.0~a38-1 "Debian Live Project"
+.TH LIVE\-CONFIG 7 2012\-06\-06 3.0~a39-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 31f2adb..cb1f077 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 04.06.2012 3.0~a38\-1 "Proyecto Debian Live"
+.TH LIVE\-CONFIG 7 06.06.2012 3.0~a39\-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 5423734..b1147a8 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 04.06.2012 3.0~a38\-1 "Projet Debian Live"
+.TH LIVE\-CONFIG 7 06.06.2012 3.0~a39\-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 c2396bf..dd5119e 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 04\-06\-2012 3.0~a38\-1 "Progetto Debian Live"
+.TH LIVE\-CONFIG 7 06.06.2012 3.0~a39\-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 239da8b..5f928f8 100644
--- a/manpages/po/de/live-config.7.po
+++ b/manpages/po/de/live-config.7.po
@@ -1,11 +1,11 @@
# German translations for live-config package
-# 2010-2012 Daniel Baumann <daniel at debian.org>
+# Copyright (C) 2006-2012 Daniel Baumann <daniel at debian.org>
# This file is distributed under the same license as the live-config package.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 3.0~a38-1\n"
-"POT-Creation-Date: 2012-06-04 12:43+0300\n"
+"Project-Id-Version: live-config 3.0~a39-1\n"
+"POT-Creation-Date: 2012-06-06 19:12+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-04"
-msgstr "04.06.2012"
+msgid "2012-06-06"
+msgstr "06.06.2012"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a38-1"
-msgstr "3.0~a38-1"
+msgid "3.0~a39-1"
+msgstr "3.0~a39-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 a4e83f7..dd9c62f 100644
--- a/manpages/po/es/live-config.7.po
+++ b/manpages/po/es/live-config.7.po
@@ -1,12 +1,12 @@
-# Spanish translation of live-config manpage
-# 2011-2012 Carlos Zuferri "chals" <chals at altorricon.com>
-# 2011-2012 José Luis Zabalza <jlz.3008 at gmail.com>
+# Spanish translations for live-config package
+# Copyright (C) 2011-2012 Carlos Zuferri "chals" <chals at altorricon.com>
+# Copyright (C) 2011-2012 José Luis Zabalza <jlz.3008 at gmail.com>
# This file is distributed under the same license as the live-config package.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 3.0~a38-1\n"
-"POT-Creation-Date: 2012-06-04 12:43+0300\n"
+"Project-Id-Version: live-config 3.0~a39-1\n"
+"POT-Creation-Date: 2012-06-06 19:12+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-04"
-msgstr "04.06.2012"
+msgid "2012-06-06"
+msgstr "06.06.2012"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a38-1"
-msgstr "3.0~a38-1"
+msgid "3.0~a39-1"
+msgstr "3.0~a39-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 58045a5..238b6da 100644
--- a/manpages/po/fr/live-config.7.po
+++ b/manpages/po/fr/live-config.7.po
@@ -1,13 +1,12 @@
# French translations for live-config package
-# 2010 Thierry Lépicier <thierry.lepicier at free.fr>
-# 2011-2012 Carlos Zuferri "chals" <chals at altorricon.com>
+# Copyright (C) 2010 Thierry Lépicier <thierry.lepicier at free.fr>
+# Copyright (C) 2011-2012 Carlos Zuferri "chals" <chals at altorricon.com>
# This file is distributed under the same license as the live-config package.
-# Carlos Zuferri «chals» <chals at altorricon.com>, 2012.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 3.0~a38-1\n"
-"POT-Creation-Date: 2012-06-04 12:43+0300\n"
+"Project-Id-Version: live-config 3.0~a39-1\n"
+"POT-Creation-Date: 2012-06-06 19:12+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"
@@ -26,14 +25,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2012-06-04"
-msgstr "04.06.2012"
+msgid "2012-06-06"
+msgstr "06.06.2012"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a38-1"
-msgstr "3.0~a38-1"
+msgid "3.0~a39-1"
+msgstr "3.0~a39-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 e2cc015..d4f2516 100644
--- a/manpages/po/it/live-config.7.po
+++ b/manpages/po/it/live-config.7.po
@@ -1,11 +1,11 @@
# Italian translations for live-config package
-# 2011-2012 skizzhg <skizzhg at gmx.com>
+# Copyright (C) 2011-2012 skizzhg <skizzhg at gmx.com>
# This file is distributed under the same license as the live-config package.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 3.0~a38-1\n"
-"POT-Creation-Date: 2012-06-04 12:43+0300\n"
+"Project-Id-Version: live-config 3.0~a39-1\n"
+"POT-Creation-Date: 2012-06-06 19:12+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-04"
-msgstr "04-06-2012"
+msgid "2012-06-06"
+msgstr "06.06.2012"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a38-1"
-msgstr "3.0~a38-1"
+msgid "3.0~a39-1"
+msgstr "3.0~a39-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 d547b67..0459e97 100644
--- a/manpages/po/pt_BR/live-config.7.po
+++ b/manpages/po/pt_BR/live-config.7.po
@@ -1,11 +1,11 @@
# Brazilian Portuguese translations for live-config package
-# 2010-2012 Tassia Camoes Araujo <tassia at gmail.com>
+# Copyright (C) 2010-2012 Tassia Camoes Araujo <tassia at gmail.com>
# This file is distributed under the same license as the live-config package.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 3.0~a38-1\n"
-"POT-Creation-Date: 2012-06-04 12:43+0300\n"
+"Project-Id-Version: live-config 3.0~a39-1\n"
+"POT-Creation-Date: 2012-06-06 19:12+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-04"
-msgstr "04-06-2012"
+msgid "2012-06-06"
+msgstr "06-06-2012"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a38-1"
-msgstr "3.0~a38-1"
+msgid "3.0~a39-1"
+msgstr "3.0~a39-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 a9abd28..1b04486 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-04 12:43+0300\n"
+"POT-Creation-Date: 2012-06-06 19:12+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-04"
+msgid "2012-06-06"
msgstr ""
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a38-1"
+msgid "3.0~a39-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 d40f8a2..fdf3c75 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 04\-06\-2012 3.0~a38\-1 "Projeto Debian Live"
+.TH LIVE\-CONFIG 7 06\-06\-2012 3.0~a39\-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