[SCM] live-tools branch, upstream, updated. upstream/3.0_b1-1-geea58c6

Daniel Baumann daniel at debian.org
Tue Jun 5 11:58:37 UTC 2012


The following commit has been merged in the upstream branch:
commit eea58c62c5377db5d905ec76e86b1fa177f0cabd
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Jun 5 13:57:10 2012 +0200

    Adding upstream version 3.0.0.

diff --git a/VERSION b/VERSION
index cd57b67..7c69763 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~b1-1
+3.0.0-1
diff --git a/manpages/Makefile b/manpages/Makefile
index 6dee660..defb121 100644
--- a/manpages/Makefile
+++ b/manpages/Makefile
@@ -20,7 +20,7 @@ po4a.cfg:
 
 	for MANPAGE in en/*; \
 	do \
-		SECTION="$$(basename $${MANPAGE} | awk -F. '{ print $$2 }')"; \
+		SECTION="$$(basename $${MANPAGE} | sed -e 's|\.|\n|g' | tail -n1)"; \
 		echo "[type: man] $${MANPAGE} \$$lang:\$$lang/$$(basename $${MANPAGE} .$${SECTION}).\$$lang.$${SECTION}" >> po4a.cfg; \
 	done
 
diff --git a/manpages/bin/update-version.sh b/manpages/bin/update-version.sh
index 698dd60..daf73a7 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\\\-TOOLS"
 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-tools.de.7 b/manpages/de/live-tools.de.7
index 0c921e5..dced5b8 100644
--- a/manpages/de/live-tools.de.7
+++ b/manpages/de/live-tools.de.7
@@ -11,7 +11,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-TOOLS 7 06.04.2012 3.0~b1\-1 "Debian Live Projekt"
+.TH LIVE\-TOOLS 7 05.06.2012 3.0.0\-1 "Debian Live Projekt"
 
 .SH NAME
 \fBlive\-tools\fP \- System Support Skripte
diff --git a/manpages/en/live-tools.7 b/manpages/en/live-tools.7
index 178f286..3e9c732 100644
--- a/manpages/en/live-tools.7
+++ b/manpages/en/live-tools.7
@@ -6,7 +6,7 @@
 .\" under certain conditions; see COPYING for details.
 .\"
 .\"
-.TH LIVE\-TOOLS 7 2012\-04\-06 3.0~b1-1 "Debian Live Project"
+.TH LIVE\-TOOLS 7 2012\-06\-05 3.0.0-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-tools\fR \- System Support Scripts
diff --git a/manpages/po/de/live-tools.7.po b/manpages/po/de/live-tools.7.po
index f398bf8..86c27f8 100644
--- a/manpages/po/de/live-tools.7.po
+++ b/manpages/po/de/live-tools.7.po
@@ -1,11 +1,11 @@
 # German translations for live-tools package
-# 2006-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-tools package.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-tools 3.0~b1\n"
-"POT-Creation-Date: 2012-04-06 13:44+0300\n"
+"Project-Id-Version: live-tools 3.0.0-1\n"
+"POT-Creation-Date: 2012-06-05 13:54+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-TOOLS"
 #. type: TH
 #: en/live-tools.7:9
 #, no-wrap
-msgid "2012-04-06"
-msgstr "06.04.2012"
+msgid "2012-06-05"
+msgstr "05.06.2012"
 
 #. type: TH
 #: en/live-tools.7:9
 #, no-wrap
-msgid "3.0~b1-1"
-msgstr "3.0~b1-1"
+msgid "3.0.0-1"
+msgstr "3.0.0-1"
 
 #. type: TH
 #: en/live-tools.7:9
diff --git a/manpages/pot/live-tools.7.pot b/manpages/pot/live-tools.7.pot
index 2197892..786c521 100644
--- a/manpages/pot/live-tools.7.pot
+++ b/manpages/pot/live-tools.7.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-config VERSION\n"
-"POT-Creation-Date: 2012-04-06 13:44+0300\n"
+"POT-Creation-Date: 2012-06-05 13:54+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-tools.7:9
 #, no-wrap
-msgid "2012-04-06"
+msgid "2012-06-05"
 msgstr ""
 
 #. type: TH
 #: en/live-tools.7:9
 #, no-wrap
-msgid "3.0~b1-1"
+msgid "3.0.0-1"
 msgstr ""
 
 #. type: TH

-- 
live-tools



More information about the debian-live-changes mailing list