[SCM] live-manual branch, debian, updated. debian/2.0_a5-1-13-g7e5666f
Daniel Baumann
daniel at debian.org
Thu Sep 9 07:43:00 UTC 2010
The following commit has been merged in the debian branch:
commit 7e5666f5ecb7baca1e7aea3d07c8cc99f0a816bb
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Sep 9 09:40:26 2010 +0200
Updating autobuild related things to sisu pathes.
diff --git a/Makefile b/Makefile
index df090d9..67ffdf4 100644
--- a/Makefile
+++ b/Makefile
@@ -35,16 +35,21 @@ autobuild: clean build
for LANGUAGE in en $(shell cd manual/po && ls); \
do \
+ mkdir -p build/$${LANGUAGE}/epub; \
+ cp manual/$${LANGUAGE}/build/$${LANGUAGE}/epub/live-manual.epub build/$${LANGUAGE}/epub; \
mkdir -p build/$${LANGUAGE}/html; \
- cp manual/$${LANGUAGE}/build/$${LANGUAGE}/epub/live-manual.epub build/$${LANGUAGE}; \
cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/[0-9]*.html manual/$${LANGUAGE}/build/$${LANGUAGE}/index.html build/$${LANGUAGE}/html; \
- cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/opendocument.odt build/$${LANGUAGE}/live-manual.odt; \
- cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/doc.html build/$${LANGUAGE}/live-manual.html; \
- cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/plain.txt build/$${LANGUAGE}/live-manual.txt; \
- cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/landscape.a4.pdf build/$${LANGUAGE}/live-manual.landscape-a4.pdf; \
- cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/portrait.a4.pdf build/$${LANGUAGE}/live-manual.portrait-a4.pdf; \
- cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/landscape.letter.pdf build/$${LANGUAGE}/live-manual.landscape-letter.pdf; \
- cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/portrait.letter.pdf build/$${LANGUAGE}/live-manual.portrait-letter.pdf; \
+ mkdir -p build/$${LANGUAGE}/html-single; \
+ cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/doc.html build/$${LANGUAGE}/html-single/live-manual.html; \
+ mkdir -p build/$${LANGUAGE}/odf; \
+ cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/opendocument.odt build/$${LANGUAGE}/odf/live-manual.odt; \
+ mkdir -p build/$${LANGUAGE}/pdf; \
+ cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/landscape.a4.pdf build/$${LANGUAGE}/pdf/live-manual.landscape-a4.pdf || true; \
+ cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/portrait.a4.pdf build/$${LANGUAGE}/pdf/live-manual.portrait-a4.pdf || true; \
+ cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/landscape.letter.pdf build/$${LANGUAGE}/pdf/live-manual.landscape-letter.pdf || true; \
+ cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/portrait.letter.pdf build/$${LANGUAGE}/pdf/live-manual.portrait-letter.pdf || true; \
+ mkdir -p build/$${LANGUAGE}/txt; \
+ cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/plain.txt build/$${LANGUAGE}/txt/live-manual.txt; \
sed -e "s|@DATE_BUILD@|$(shell LC_ALL=C date -R)|" \
-e "s|@DATE_CHANGE@|$(shell LC_ALL=C git log | grep -m1 Date | awk -FDate: '{ print $2 }' | sed -e 's|^ *||g')|" \
manual/$${LANGUAGE}/index.html.in > build/$${LANGUAGE}/index.html; \
@@ -73,7 +78,7 @@ install:
mkdir -p $(DESTDIR)/usr/share/doc/live-manual/epub; \
cp manual/$${LANGUAGE}/build/$${LANGUAGE}/epub/live-manual.epub $(DESTDIR)/usr/share/doc/live-manual/epub/live-manual.$${LANGUAGE}.epub; \
mkdir -p $(DESTDIR)/usr/share/doc/live-manual/html/$${LANGUAGE}; \
- cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/[0-9]*.html manual/$${LANGUAGE}/build/$${LANGUAGE}/index.html $(DESTDIR)/usr/share/doc/live-manual/html/$${LANGUAGE}; \
+ cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/[0-9]*.html manual/$${LANGUAGE}/build/$${LANGUAGE}/index.html build/$${LANGUAGE}/html; \
cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/doc.html $(DESTDIR)/usr/share/doc/live-manual/html/live-manual.$${LANGUAGE}.html; \
mkdir -p $(DESTDIR)/usr/share/doc/live-manual/odf; \
cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/opendocument.odt $(DESTDIR)/usr/share/doc/live-manual/odf/live-manual.$${LANGUAGE}.odt; \
diff --git a/manual/de/index.html.in b/manual/de/index.html.in
index 85e68a4..5e4bb34 100644
--- a/manual/de/index.html.in
+++ b/manual/de/index.html.in
@@ -39,9 +39,14 @@ im Handbuch gefunden werden.
<dd>
<ul>
+ <li>› <a href="epub/live-manual.epub">EPUB</a></li>
<li>› <b><a href="html/">HTML</a></b></li>
<li>› <a href="html-single/live-manual.html">HTML (einzelne Seite)</a></li>
- <li>› <a href="pdf/live-manual.pdf">PDF</a></li>
+ <li>› <a href="odf/live-manual.odt">ODF</a></li>
+ <li>› PDF: <a href="pdf/live-manual.portrait-a4.pdf">portrait-a4</a> <a
+href="pdf/live-manual.landscape-a4.pdf">landscape-a4</a> <a
+href="pdf/live-manual.portrait-letter.pdf">portrait-letter</a> <a
+href="pdf/live-manual.landscape-letter.pdf">landscape-letter</a></li>
<li>› <a href="txt/live-manual.txt">Text</a></li>
</ul>
diff --git a/manual/de/live-manual.ssm b/manual/de/live-manual.ssm
index 0f27d51..a247788 100644
--- a/manual/de/live-manual.ssm
+++ b/manual/de/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2010-09-07
+ :published: 2010-09-09
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/en/index.html.in b/manual/en/index.html.in
index 49d42fa..091b074 100644
--- a/manual/en/index.html.in
+++ b/manual/en/index.html.in
@@ -34,9 +34,11 @@
<dd>
<ul>
+ <li>› <a href="epub/live-manual.epub">EPUB</a></li>
<li>› <b><a href="html/">HTML</a></b></li>
<li>› <a href="html-single/live-manual.html">HTML (single page)</a></li>
- <li>› <a href="pdf/live-manual.pdf">PDF</a></li>
+ <li>› <a href="odf/live-manual.odt">ODF</a></li>
+ <li>› PDF: <a href="pdf/live-manual.portrait-a4.pdf">portrait-a4</a> <a href="pdf/live-manual.landscape-a4.pdf">landscape-a4</a> <a href="pdf/live-manual.portrait-letter.pdf">portrait-letter</a> <a href="pdf/live-manual.landscape-letter.pdf">landscape-letter</a></li>
<li>› <a href="txt/live-manual.txt">Plain text</a></li>
</ul>
diff --git a/manual/en/live-manual.ssm b/manual/en/live-manual.ssm
index 0f27d51..a247788 100644
--- a/manual/en/live-manual.ssm
+++ b/manual/en/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2010-09-07
+ :published: 2010-09-09
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/po/de/index.html.in.po b/manual/po/de/index.html.in.po
index 737708d..a6160d5 100644
--- a/manual/po/de/index.html.in.po
+++ b/manual/po/de/index.html.in.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0~a3\n"
-"POT-Creation-Date: 2010-06-06 18:09+0300\n"
+"POT-Creation-Date: 2010-09-09 09:38+0300\n"
"PO-Revision-Date: 2010-06-06 15:21+0300\n"
"Last-Translator: Daniel Baumann <daniel at debian.org>\n"
"Language-Team: none\n"
@@ -62,43 +62,57 @@ msgstr "Verfügbare Formate"
#. type: Content of: <html><body><div><dl><dd><ul><li>
#: en/index.html.in:37
+msgid "› <a href=\"epub/live-manual.epub\">EPUB</a>"
+msgstr "› <a href=\"epub/live-manual.epub\">EPUB</a>"
+
+#. type: Content of: <html><body><div><dl><dd><ul><li>
+#: en/index.html.in:38
msgid "› <b><a href=\"html/\">HTML</a></b>"
msgstr "› <b><a href=\"html/\">HTML</a></b>"
#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: en/index.html.in:38
+#: en/index.html.in:39
msgid ""
"› <a href=\"html-single/live-manual.html\">HTML (single page)</a>"
msgstr ""
"› <a href=\"html-single/live-manual.html\">HTML (einzelne Seite)</a>"
#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: en/index.html.in:39
-msgid "› <a href=\"pdf/live-manual.pdf\">PDF</a>"
-msgstr "› <a href=\"pdf/live-manual.pdf\">PDF</a>"
+#: en/index.html.in:40
+msgid "› <a href=\"odf/live-manual.odt\">ODF</a>"
+msgstr "› <a href=\"odf/live-manual.odt\">ODF</a>"
#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: en/index.html.in:40
+#: en/index.html.in:41
+msgid ""
+"› PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">portrait-a4</a> <a "
+"href=\"pdf/live-manual.landscape-a4.pdf\">landscape-a4</a> <a href=\"pdf/"
+"live-manual.portrait-letter.pdf\">portrait-letter</a> <a href=\"pdf/live-"
+"manual.landscape-letter.pdf\">landscape-letter</a>"
+msgstr ""
+
+#. type: Content of: <html><body><div><dl><dd><ul><li>
+#: en/index.html.in:42
msgid "› <a href=\"txt/live-manual.txt\">Plain text</a>"
msgstr "› <a href=\"txt/live-manual.txt\">Text</a>"
#. type: Content of: <html><body><div><dl><dd><p>
-#: en/index.html.in:44
+#: en/index.html.in:46
msgid "Last changed: @DATE_CHANGE@"
msgstr "Letzte Änderung: @DATE_CHANGE@"
#. type: Content of: <html><body><div><dl><dd><p>
-#: en/index.html.in:45
+#: en/index.html.in:47
msgid "Last built: @DATE_BUILD@"
msgstr "Letzte Aktualisierung: @DATE_BUILD@"
#. type: Content of: <html><body><div><dl><dt><h3>
-#: en/index.html.in:49
+#: en/index.html.in:51
msgid "Source"
msgstr "Quellen"
#. type: Content of: <html><body><div><dl><dd><p>
-#: en/index.html.in:53
+#: en/index.html.in:55
msgid ""
"The sources for this manual is available in a <a href=\"http://git.or.cz/"
"\">git</a> repository at live.debian.net."
@@ -107,7 +121,7 @@ msgstr ""
"\">Git</a> Repository auf live.debian.net verfügbar."
#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: en/index.html.in:57
+#: en/index.html.in:59
msgid ""
"Browse: <a href=\"http://live.debian.net/gitweb/?p=live-manual.git"
"\"><small><tt>http://live.debian.net/gitweb/?p=live-manual.git</tt></small></"
@@ -118,7 +132,7 @@ msgstr ""
"a>"
#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: en/index.html.in:58
+#: en/index.html.in:60
msgid ""
"Git: <a href=\"git://live.debian.net/git/live-manual.git\"><small><tt>git://"
"live.debian.net/git/live-manual.git</tt></small></a>"
@@ -127,7 +141,7 @@ msgstr ""
"live.debian.net/git/live-manual.git</tt></small></a>"
#. type: Content of: <html><body><div><p>
-#: en/index.html.in:68
+#: en/index.html.in:70
msgid ""
"<a href=\"http://live.debian.net/\">Debian Live</a> <<a href=\"mailto:"
"debian-live at lists.debian.org\">debian-live at lists.debian.org</a>> - <a "
diff --git a/manual/po/de/live-manual.ssm.po b/manual/po/de/live-manual.ssm.po
index b3706ec..407ebb8 100644
--- a/manual/po/de/live-manual.ssm.po
+++ b/manual/po/de/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-07 19:07+0300\n"
+"POT-Creation-Date: 2010-09-09 09:38+0300\n"
"PO-Revision-Date: 2010-08-14 21:32+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2010-09-07\n"
+" :published: 2010-09-09\n"
msgstr ""
#. type: Plain text
diff --git a/manual/pot/index.html.in.pot b/manual/pot/index.html.in.pot
index b633417..7502c4d 100644
--- a/manual/pot/index.html.in.pot
+++ b/manual/pot/index.html.in.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-07 10:55+0300\n"
+"POT-Creation-Date: 2010-09-09 09:38+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"
@@ -57,49 +57,63 @@ msgstr ""
#. type: Content of: <html><body><div><dl><dd><ul><li>
#: en/index.html.in:37
-msgid "› <b><a href=\"html/\">HTML</a></b>"
+msgid "› <a href=\"epub/live-manual.epub\">EPUB</a>"
msgstr ""
#. type: Content of: <html><body><div><dl><dd><ul><li>
#: en/index.html.in:38
-msgid ""
-"› <a href=\"html-single/live-manual.html\">HTML (single page)</a>"
+msgid "› <b><a href=\"html/\">HTML</a></b>"
msgstr ""
#. type: Content of: <html><body><div><dl><dd><ul><li>
#: en/index.html.in:39
-msgid "› <a href=\"pdf/live-manual.pdf\">PDF</a>"
+msgid ""
+"› <a href=\"html-single/live-manual.html\">HTML (single page)</a>"
msgstr ""
#. type: Content of: <html><body><div><dl><dd><ul><li>
#: en/index.html.in:40
+msgid "› <a href=\"odf/live-manual.odt\">ODF</a>"
+msgstr ""
+
+#. type: Content of: <html><body><div><dl><dd><ul><li>
+#: en/index.html.in:41
+msgid ""
+"› PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">portrait-a4</a> <a "
+"href=\"pdf/live-manual.landscape-a4.pdf\">landscape-a4</a> <a href=\"pdf/"
+"live-manual.portrait-letter.pdf\">portrait-letter</a> <a href=\"pdf/live-"
+"manual.landscape-letter.pdf\">landscape-letter</a>"
+msgstr ""
+
+#. type: Content of: <html><body><div><dl><dd><ul><li>
+#: en/index.html.in:42
msgid "› <a href=\"txt/live-manual.txt\">Plain text</a>"
msgstr ""
#. type: Content of: <html><body><div><dl><dd><p>
-#: en/index.html.in:44
+#: en/index.html.in:46
msgid "Last changed: @DATE_CHANGE@"
msgstr ""
#. type: Content of: <html><body><div><dl><dd><p>
-#: en/index.html.in:45
+#: en/index.html.in:47
msgid "Last built: @DATE_BUILD@"
msgstr ""
#. type: Content of: <html><body><div><dl><dt><h3>
-#: en/index.html.in:49
+#: en/index.html.in:51
msgid "Source"
msgstr ""
#. type: Content of: <html><body><div><dl><dd><p>
-#: en/index.html.in:53
+#: en/index.html.in:55
msgid ""
"The sources for this manual is available in a <a href=\"http://git.or.cz/"
"\">git</a> repository at live.debian.net."
msgstr ""
#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: en/index.html.in:57
+#: en/index.html.in:59
msgid ""
"Browse: <a href=\"http://live.debian.net/gitweb/?p=live-manual.git"
"\"><small><tt>http://live.debian.net/gitweb/?p=live-manual.git</tt></small></"
@@ -107,14 +121,14 @@ msgid ""
msgstr ""
#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: en/index.html.in:58
+#: en/index.html.in:60
msgid ""
"Git: <a href=\"git://live.debian.net/git/live-manual.git\"><small><tt>git://"
"live.debian.net/git/live-manual.git</tt></small></a>"
msgstr ""
#. type: Content of: <html><body><div><p>
-#: en/index.html.in:68
+#: en/index.html.in:70
msgid ""
"<a href=\"http://live.debian.net/\">Debian Live</a> <<a href=\"mailto:"
"debian-live at lists.debian.org\">debian-live at lists.debian.org</a>> - <a "
diff --git a/manual/pot/live-manual.ssm.pot b/manual/pot/live-manual.ssm.pot
index 9bcf6cb..c7a259c 100644
--- a/manual/pot/live-manual.ssm.pot
+++ b/manual/pot/live-manual.ssm.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-07 19:07+0300\n"
+"POT-Creation-Date: 2010-09-09 09:38+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"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2010-09-07\n"
+" :published: 2010-09-09\n"
msgstr ""
#. type: Plain text
--
live-manual
More information about the debian-live-changes
mailing list