[SCM] live-manual branch, debian, updated. debian/3.0_a9-1-42-gc85f6f4
chals
chals at altorricon.com
Mon Feb 6 22:41:52 UTC 2012
The following commit has been merged in the debian branch:
commit 7d5330e636724da5ee528161810401f929c5fd7f
Author: chals <chals at altorricon.com>
Date: Thu Dec 22 19:50:04 2011 +0100
Fixing 'install' target so that debs build properly.
diff --git a/Makefile b/Makefile
index ea92709..987f6cf 100644
--- a/Makefile
+++ b/Makefile
@@ -81,7 +81,8 @@ install:
FROMDIR=$(CURDIR)/build/manual; \
TODIR=$(DESTDIR)/usr/share/doc/live-manual; \
cd $${FROMDIR} && rm -rf manifest index.html toc.html; \
- cp -ra $${FROMDIR} $${TODIR}; \
+ mkdir -p $${TODIR}; \
+ cp -a $(CURDIR)/build/manual/* $(DESTDIR)/usr/share/doc/live-manual
diff --git a/debian/live-manual-odf.install b/debian/live-manual-odf.install
index 24da313..2d50f42 100644
--- a/debian/live-manual-odf.install
+++ b/debian/live-manual-odf.install
@@ -1 +1 @@
-usr/share/doc/live-manual/odf
+usr/share/doc/live-manual/odt
diff --git a/manual/de/live-manual.ssm b/manual/de/live-manual.ssm
index 3a5c4f1..05e21a7 100644
--- a/manual/de/live-manual.ssm
+++ b/manual/de/live-manual.ssm
@@ -9,7 +9,7 @@
:license: Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU General Public License, wie von der Free Software Foundation veröffentlicht, weitergeben und/oder modifizieren, entweder gemäss Version 3 der Lizenz oder (nach Ihrer Option) jeder späteren Version.<br><br>Die Veröffentlichung dieses Programms erfolgt in der Hoffnung, dass es Ihnen von Nutzen sein wird, aber OHNE IRGENDEINE GARANTIE, sogar ohne die implizite Garantie der MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK. Details finden Sie in der GNU General Public License.<br><br>Sie sollten ein Exemplar der GNU General Public License zusammen mit diesem Programm erhalten haben. Falls nicht, siehe <http://www.gnu.org/licenses/>.<br><br>Der komplette Text der GNU General Public License kann in der Datei /usr/share/common-licenses/GPL-3 gefunden werden.
@date:
- :published: 2011-12-19
+ :published: 2011-12-22
@publisher: Debian Live Projekt <debian-live at lists.debian.org>
diff --git a/manual/en/live-manual.ssm b/manual/en/live-manual.ssm
index e1197cd..231b676 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>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2011-12-19
+ :published: 2011-12-22
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/es/live-manual.ssm b/manual/es/live-manual.ssm
index 6f08f06..a2c25a5 100644
--- a/manual/es/live-manual.ssm
+++ b/manual/es/live-manual.ssm
@@ -9,7 +9,7 @@
:license: Este programa es software libre: puede ser redistribuido y / o modificado bajo los términos de la GNU General Public License publicada por la Free Software Foundation, bien de la versión 3 de la Licencia, o (a su elección) cualquier versión posterior. <br><br> Este programa se distribuye con la esperanza de que sea útil, pero SIN NINGUNA GARANTÍA, incluso sin la garantía implícita de COMERCIALIZACIÓN o IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Consulte la GNU General Public License para más detalles. <br><br> Debería haber recibido una copia de la General Public License GNU junto con este programa. Si no, vea http://www.gnu.org/licenses/. <br><br> El texto completo de la GNU Licencia Pública General se pueden encontrar en /usr/share/common-licenses/GPL-3
@date:
- :published: 2011-12-19
+ :published: 2011-12-22
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/fr/live-manual.ssm b/manual/fr/live-manual.ssm
index a2cdf72..903e948 100644
--- a/manual/fr/live-manual.ssm
+++ b/manual/fr/live-manual.ssm
@@ -9,7 +9,7 @@
:license: Ce programme est un logiciel libre; vous pouvez le redistribuer ou le modifier suivant les termes de la Licence Générale Publique GNU telle que publiée par la Free Software Foundation: soit la version 3 de cette licence, soit (à votre gré) toute version ultérieure.<br><br>Ce programme est distribué dans l’espoir qu’il vous sera utile, mais SANS AUCUNE GARANTIE: sans même la garantie implicite de COMMERCIALISABILITÉ ni d’ADÉQUATION À UN OBJECTIF PARTICULIER. Consultez la Licence Générale Publique GNU pour plus de détails.<br><br>Vous devriez avoir reçu une copie de la Licence Générale Publique GNU avec ce programme ; si ce n’est pas le cas, consultez http://www.gnu.org/licenses/. <br><br>Le texte complet de la Licence Générale Publique GNU peut être trouvé dans le fichier / usr/share/common-licenses/GPL-3
@date:
- :published: 2011-12-19
+ :published: 2011-12-22
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/it/live-manual.ssm b/manual/it/live-manual.ssm
index 0f36f2b..867d953 100644
--- a/manual/it/live-manual.ssm
+++ b/manual/it/live-manual.ssm
@@ -9,7 +9,7 @@
:license: Questo programma è software libero: è possibile ridistribuirlo e modificarlo secondo i termini della GNU General Public License come pubblicata dalla Free Software Foundation, sia la versione 3 della licenza o (a scelta) una versione successiva.<br><br>Questo programma è distribuito nella speranza che possa essere utile, ma SENZA ALCUNA GARANZIA, nemmeno la garanzia implicita di COMMERCIABILITÀ o IDONEITÀ PER UN PARTICOLARE SCOPO. Vedere la GNU General Public License per ulteriori dettagli.<br><br>Si dovrebbe aver ricevuto una copia della GNU General Public License con questo programma. In caso contrario, vedere http://www.gnu.org/licenses/. <br><br>Il testo completo della GNU General Public License può essere trovato nel file /usr/share/common-licenses/GPL-3.
@date:
- :published: 2011-12-19
+ :published: 2011-12-22
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/po/de/live-manual.ssm.po b/manual/po/de/live-manual.ssm.po
index eb62e3b..c63dc2d 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: 2011-12-19 14:21+0100\n"
+"POT-Creation-Date: 2011-12-22 19:48+0100\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -48,7 +48,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-12-19\n"
+" :published: 2011-12-22\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/es/live-manual.ssm.po b/manual/po/es/live-manual.ssm.po
index 1d503fe..b85661c 100644
--- a/manual/po/es/live-manual.ssm.po
+++ b/manual/po/es/live-manual.ssm.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-12-19 14:21+0100\n"
+"POT-Creation-Date: 2011-12-22 19:48+0100\n"
"PO-Revision-Date: 2011-03-12 08:00-0000\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com\n"
@@ -53,7 +53,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-12-19\n"
+" :published: 2011-12-22\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/fr/live-manual.ssm.po b/manual/po/fr/live-manual.ssm.po
index 3c90e96..855a790 100644
--- a/manual/po/fr/live-manual.ssm.po
+++ b/manual/po/fr/live-manual.ssm.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-12-19 14:21+0100\n"
+"POT-Creation-Date: 2011-12-22 19:48+0100\n"
"PO-Revision-Date: 2011-06-19 16:32+0200\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -49,7 +49,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-12-19\n"
+" :published: 2011-12-22\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/it/live-manual.ssm.po b/manual/po/it/live-manual.ssm.po
index f3b921f..2e64fbc 100644
--- a/manual/po/it/live-manual.ssm.po
+++ b/manual/po/it/live-manual.ssm.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-12-19 14:21+0100\n"
+"POT-Creation-Date: 2011-12-22 19:48+0100\n"
"PO-Revision-Date: 2011-03-11 10:33+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -49,7 +49,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-12-19\n"
+" :published: 2011-12-22\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/pt_BR/live-manual.ssm.po b/manual/po/pt_BR/live-manual.ssm.po
index 6067412..a9a0211 100644
--- a/manual/po/pt_BR/live-manual.ssm.po
+++ b/manual/po/pt_BR/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-12-19 14:21+0100\n"
+"POT-Creation-Date: 2011-12-22 19:48+0100\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-12-19\n"
+" :published: 2011-12-22\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/live-manual.ssm.po b/manual/po/ro/live-manual.ssm.po
index 7e429fb..55227a9 100644
--- a/manual/po/ro/live-manual.ssm.po
+++ b/manual/po/ro/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-12-19 14:21+0100\n"
+"POT-Creation-Date: 2011-12-22 19:48+0100\n"
"PO-Revision-Date: 2010-10-23 00:04+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -46,7 +46,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-12-19\n"
+" :published: 2011-12-22\n"
msgstr ""
#. type: Plain text
diff --git a/manual/pot/live-manual.ssm.pot b/manual/pot/live-manual.ssm.pot
index 6e8c61e..f353b5c 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: 2011-12-19 14:21+0100\n"
+"POT-Creation-Date: 2011-12-22 19:48+0100\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: 2011-12-19\n"
+" :published: 2011-12-22\n"
msgstr ""
#. type: Plain text
diff --git a/manual/pt_BR/live-manual.ssm b/manual/pt_BR/live-manual.ssm
index e1197cd..231b676 100644
--- a/manual/pt_BR/live-manual.ssm
+++ b/manual/pt_BR/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>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2011-12-19
+ :published: 2011-12-22
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/ro/live-manual.ssm b/manual/ro/live-manual.ssm
index e1197cd..231b676 100644
--- a/manual/ro/live-manual.ssm
+++ b/manual/ro/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>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2011-12-19
+ :published: 2011-12-22
@publisher: Debian Live Project <debian-live at lists.debian.org>
--
live-manual
More information about the debian-live-changes
mailing list