[debian-edu-commits] [Git][debian-edu/debian-edu-doc][master] 2 commits: Adjust documentation/common/Makefile.common:

[WolfgangSchweer]

WolfgangSchweer pushed to branch master at Debian Edu / debian-edu-doc


Commits:
2dae64f3 by Wolfgang Schweer at 2020-02-27T17:51:59+01:00
Adjust documentation/common/Makefile.common:

Add two more sed commands to make EPUB metadata (in .opf and .ncx files)
independent from any specific environment influence at generation time.

It seems that the content identifier string is arch dependent.
Thanks to jenkins.debian.net/diffoscope.

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -
971189aa by Wolfgang Schweer at 2020-02-27T18:03:24+01:00
(de) debian-edu-buster-manual: trivial copyright related update.

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -


3 changed files:

- debian/changelog
- documentation/common/Makefile.common
- documentation/debian-edu-buster/debian-edu-buster-manual.de.po


Changes:

=====================================
debian/changelog
=====================================
@@ -1,5 +1,6 @@
 debian-edu-doc (2.11.3) UNRELEASED; urgency=medium
 
+  [ Holger Levsen ]
   * Update Debian Edu ITIL manual from the wiki.
   * Update Audacity manual from the wiki.
   * Update Rosegarden manual from the wiki.
@@ -18,6 +19,11 @@ debian-edu-doc (2.11.3) UNRELEASED; urgency=medium
     lintian. Added jdupes to build-depends accordingly.
   * d/mail_stats_to_list: trivial improvements.
 
+  [ Wolfgang Schweer ]
+  * documentation/common/Makefile.common:
+    - Add two more sed commands to make EPUB metadata (in .opf and .ncx files)
+      independent from any specific environment influence at generation time.
+
  -- Holger Levsen <holger at debian.org>  Wed, 26 Feb 2020 15:30:07 +0100
 
 debian-edu-doc (2.11.2) unstable; urgency=medium


=====================================
documentation/common/Makefile.common
=====================================
@@ -231,7 +231,9 @@ install: build
 			unzip -q $(name).epub -d epub ; \
 			sed -i 's#_idm[0-9]\{14\}#_idm1234567#' epub/OEBPS/content.opf ; \
 			sed -i 's#_idm[0-9]\{14\}#_idm1234567#' epub/OEBPS/toc.ncx ; \
-			find epub -exec touch -d @0 '{}' \; ; \
+			sed -i 's#_idp[0-9]\{10\}#_idp12345678#' epub/OEBPS/content.opf ; \
+			sed -i 's#_idp[0-9]\{10\}#_idp12345678#' epub/OEBPS/toc.ncx ; \
+​			find epub -exec touch -d @0 '{}' \; ; \
 			rm $(name).epub ; \
 			zip -q -r $(name).epub epub/ ; \
 			rm -rf epub/ ; \


=====================================
documentation/debian-edu-buster/debian-edu-buster-manual.de.po
=====================================
@@ -17,7 +17,7 @@ msgstr ""
 "Project-Id-Version: debian-edu-buster-manual.de\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-02-25 17:50+0000\n"
-"PO-Revision-Date: 2020-02-05 21:42+0100\n"
+"PO-Revision-Date: 2020-02-27 18:02+0100\n"
 "Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
 "Language: de\n"
@@ -26,7 +26,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Poedit 2.2.4\n"
+"X-Generator: Poedit 2.3\n"
 
 #. type: Attribute 'lang' of: <article>
 msgid "en"
@@ -10100,19 +10100,14 @@ msgstr ""
 "lizenziert."
 
 #. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid ""
-#| "The Polish translation is copyrighted by Stanisław Krukowski (2016, "
-#| "2017), Wiktor Wandachowicz (2019) and Adrian Bystrek (2019) and is "
-#| "released under the GPL v2 or any later version."
 msgid ""
 "The Polish translation is copyrighted by Stanisław Krukowski (2016, 2017), "
 "Wiktor Wandachowicz (2019), Adrian Bystrek (2019) and Michal Biesiada (2020) "
 "and is released under the GPL v2 or any later version."
 msgstr ""
 "Die polnische Übersetzung wurde verfasst von Stanisław Krukowski (2016, "
-"2017), Wiktor Wandachowicz (2019) und Adrian Bystrek (2019) und ist unter "
-"der GPL v2 oder einer späteren Version lizenziert."
+"2017), Wiktor Wandachowicz (2019), Adrian Bystrek (2019) und Michal Biesiada "
+"(2020) und ist unter der GPL v2 oder einer späteren Version lizenziert."
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -10281,8 +10276,8 @@ msgstr ""
 "translations finden Sie Informationen, wie Sie eine neue PO-Datei für Ihre "
 "Sprache anlegen und wie Übersetzungen aktualisiert werden."
 
-#.  <remark>
-#. status ignore</remark> 
+#. <remark>
+#. status ignore</remark>
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Please keep in mind that this manual is still under development, so don't "



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/4065a9c276c7f9142f132cc66f8a92f2f0561694...971189aa7c9648e61d4d4be3ecc6c1fd85784f9c

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/4065a9c276c7f9142f132cc66f8a92f2f0561694...971189aa7c9648e61d4d4be3ecc6c1fd85784f9c
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20200227/25298231/attachment-0001.html>