[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#771435: marked as done (debian-edu-doc: fails to use language specific images in EPUB manuals)

Your message dated Wed, 03 Dec 2014 21:21:44 +0000
with message-id <E1XwHMm-0003p4-35@franck.debian.org>
and subject line Bug#771435: fixed in debian-edu-doc 1.6~20141203~8.0+edu0~alpha1
has caused the Debian Bug report #771435,
regarding debian-edu-doc: fails to use language specific images in EPUB manuals
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org

771435: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=771435
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message ---
Source: debian-edu-doc
Severity: normal
Tags: patch pending

For some manuals language specific images are available and are used 
with HTML and PDF manuals. All EPUB manuals do only show the default 
(en) ones.

The fix has been tested and submitted to git.

diff --git a/documentation/common/Makefile.common b/documentation/common/Makefile.common
index 369f1e2..09e9b9c 100644
--- a/documentation/common/Makefile.common
+++ b/documentation/common/Makefile.common
@@ -58,7 +58,15 @@ build-epub:
 	-for LINGUA in $(LANGUAGES) ; do \
 		echo "Creating epub for $$LINGUA"; \
 		po4a --translate-only $(name).$$LINGUA.xml po4a.cfg ; \
+		mkdir images-tmp ; \
+		cp images/*.* images-tmp/ ; \
+		if [ -e images/$$LINGUA ] ; then \
+		    cp -v images/$$LINGUA/*.* images-tmp/ ; \
+		fi ; \
+		sed -i "s#./images#./images-tmp#g" $(name).$$LINGUA.xml ; \
 		$(DBTOEPUB) $(name).$$LINGUA.xml ; \
+		sed -i "s#./images-tmp#./images/#g" $(name).$$LINGUA.xml ; \
+		rm -rf images-tmp/ ; \


Attachment: signature.asc
Description: Digital signature

--- End Message ---
--- Begin Message ---
Source: debian-edu-doc
Source-Version: 1.6~20141203~8.0+edu0~alpha1

We believe that the bug you reported is fixed in the latest version of
debian-edu-doc, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 771435@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
Holger Levsen <holger@debian.org> (supplier of updated debian-edu-doc package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)

Hash: SHA512

Format: 1.8
Date: Wed, 03 Dec 2014 20:39:12 +0100
Source: debian-edu-doc
Binary: debian-edu-doc-en debian-edu-doc-da debian-edu-doc-nl debian-edu-doc-de debian-edu-doc-es debian-edu-doc-nb debian-edu-doc-it debian-edu-doc-fr
Architecture: source all
Version: 1.6~20141203~8.0+edu0~alpha1
Distribution: unstable
Urgency: medium
Maintainer: Debian Edu Developers <debian-edu@lists.debian.org>
Changed-By: Holger Levsen <holger@debian.org>
 debian-edu-doc-da - Danish documentation from the Debian Edu project
 debian-edu-doc-de - German documentation from the Debian Edu project
 debian-edu-doc-en - English documentation from the Debian Edu project
 debian-edu-doc-es - Spanish documentation from the Debian Edu project
 debian-edu-doc-fr - French documentation from the Debian Edu project
 debian-edu-doc-it - Italian documentation from the Debian Edu project
 debian-edu-doc-nb - Bokmål documentation from the Debian Edu project
 debian-edu-doc-nl - Dutch documentation from the Debian Edu project
Closes: 768439 771174 771231 771345 771435
 debian-edu-doc (1.6~20141203~8.0+edu0~alpha1) unstable; urgency=medium
   [ Wolfgang Schweer ]
   * documentation/scripts/get_manual: Extend regex to replace all occurrences
     of '~' (and not just '~alpha') in XML section ids with '+', so that PDF
     generation succeeds. (Closes: #768439).
   * Makefile.common:
     - Enable EPUB generation for default language en. (Closes: #771174).
     - Store images in manual specific directories instead of a common one to
       avoid linking to wrong images for the jessie and wheezy HTML manuals.
       (Closes: #771345).
     - If available use language specific images in EPUB manuals instead of
       default (en) ones. (Closes: #771435).
   * Update manuals and images from the wiki.
   * (it) Fix typos in wheezy and jessie manual translations.
   * (en, de, fr) Update jessie network architecture images.
   * (nb, nl) Fix po files by updating both using msgmerge.
   [ Petter Reinholdtsen ]
   * Update audacity manual and images from the wiki.
   [ Jessie Manual translation updates ]
   * German (Wolfgang Schweer)
   * Dutch (Frans Spiesschaert) (Closes: #771231)
   * Norwegian (Ingrid Irvin, Ole-Erik Yrvin, Hans Arthur Kielland
     Aanesen, Knut Yrvin, Stefan Mitchell-Lauridsen, Ragnar Wisløff,
     FourFire Le'bard) reaching 98%!
   * French (Cédric Boutillier)
   * Italian (Claudio Carboncini)
   [ Wheezy Manual translation updates ]
   * German (Wolfgang Schweer)
   * Dutch (Frans Spiesschaert)
   * Norwegian (Ingrid Irvin)
   [ Audacity manual translation updates ]
   * Norwegian Bokmål (Jon Nordby)
   [ Rosegarden Manual translation updates ]
   * Norwegian Bokmål (Knut Yrvin, Petter Reinholdtsen)
 28fd5cf3b79874172676e206393b91eff21834fb 2598 debian-edu-doc_1.6~20141203~8.0+edu0~alpha1.dsc
 bb23c38bb9060df5173dc6509dd8334ebf682bc9 40619079 debian-edu-doc_1.6~20141203~8.0+edu0~alpha1.tar.gz
 ab5a342ca0422de08b801f75f6a767ea3c96acbd 34311006 debian-edu-doc-en_1.6~20141203~8.0+edu0~alpha1_all.deb
 f6fe6f0e5cccc6f67bb93c1298c960aec1e6a735 14426094 debian-edu-doc-da_1.6~20141203~8.0+edu0~alpha1_all.deb
 6c020aaf8a344e2b362af2ca110e7ee894d92508 23344426 debian-edu-doc-nl_1.6~20141203~8.0+edu0~alpha1_all.deb
 2361b7da258bd6901cee8d6fcd0b245b489c2cca 18692296 debian-edu-doc-de_1.6~20141203~8.0+edu0~alpha1_all.deb
 0b047f63a586cfccb604225a90be0ff09ddf75ca 22253152 debian-edu-doc-es_1.6~20141203~8.0+edu0~alpha1_all.deb
 ef98b6a2f3f60b9a852538707a92fdb4b9f2a867 26272790 debian-edu-doc-nb_1.6~20141203~8.0+edu0~alpha1_all.deb
 9354c979f8c9d8539035f1c15030364257beb791 14486026 debian-edu-doc-it_1.6~20141203~8.0+edu0~alpha1_all.deb
 2319be088cf6886a5450f2fbe0080e1aef89dbc7 28507386 debian-edu-doc-fr_1.6~20141203~8.0+edu0~alpha1_all.deb
 078587858fe15bb4ee75f11bdc923bf0e06cd94011b36e8062e9e11c7952bfc7 2598 debian-edu-doc_1.6~20141203~8.0+edu0~alpha1.dsc
 ca27fcda8caf3e2911f90a80dd106083c896b2743e9afde1be9773179100c2aa 40619079 debian-edu-doc_1.6~20141203~8.0+edu0~alpha1.tar.gz
 6280b508107f8d82d9416dfc81405ed4a9ac0f609e044e743b66e4a3ac29f93b 34311006 debian-edu-doc-en_1.6~20141203~8.0+edu0~alpha1_all.deb
 3ef7506352ee869f2e726a90f6c1fc40b3485efc9a7a959ecb77333ce82e997e 14426094 debian-edu-doc-da_1.6~20141203~8.0+edu0~alpha1_all.deb
 f260cc1684c58b94955af9e5f16ac56a5dc1c315104544487cdc29aba4c8dd24 23344426 debian-edu-doc-nl_1.6~20141203~8.0+edu0~alpha1_all.deb
 4ec26192a0dddd4f39fb10eb68928f5ec714d6894eb35528dccbbed6ee77d065 18692296 debian-edu-doc-de_1.6~20141203~8.0+edu0~alpha1_all.deb
 965ef8ef8bb950bdec9d7d00d0a9cb5e16849678916adc543d59ae5ad886c630 22253152 debian-edu-doc-es_1.6~20141203~8.0+edu0~alpha1_all.deb
 1f36a1159d791df3431c7259ffb8ac8f306bb09817853d4be3a07dcf5a80ab5e 26272790 debian-edu-doc-nb_1.6~20141203~8.0+edu0~alpha1_all.deb
 b06f82e1adca5be49cddb8a611c9fc4dd6f9dd0bec873709277f767662551420 14486026 debian-edu-doc-it_1.6~20141203~8.0+edu0~alpha1_all.deb
 755c5594a877f6492b7c318e9b070268a7d5e5d1423d772c2ab2d067124ce7d2 28507386 debian-edu-doc-fr_1.6~20141203~8.0+edu0~alpha1_all.deb
 fbb6df247bb2b2110c188bcf429998e1 2598 doc optional debian-edu-doc_1.6~20141203~8.0+edu0~alpha1.dsc
 a1514b988930c3633f01318a25a0781b 40619079 doc optional debian-edu-doc_1.6~20141203~8.0+edu0~alpha1.tar.gz
 e4d863571d9feb865e777911d219cccc 34311006 doc optional debian-edu-doc-en_1.6~20141203~8.0+edu0~alpha1_all.deb
 785f55b2b4c5a83a9d94c2a8e2708596 14426094 doc optional debian-edu-doc-da_1.6~20141203~8.0+edu0~alpha1_all.deb
 5819b1bb22d5aa8f207d40f9c2e684dd 23344426 doc optional debian-edu-doc-nl_1.6~20141203~8.0+edu0~alpha1_all.deb
 4e35cbd1f28922818ef50a38cd4108d4 18692296 doc optional debian-edu-doc-de_1.6~20141203~8.0+edu0~alpha1_all.deb
 61b54ab1877336337c3a59cb897cad3e 22253152 doc optional debian-edu-doc-es_1.6~20141203~8.0+edu0~alpha1_all.deb
 8d0dcb0ef253011a36c93807f3bb9591 26272790 doc optional debian-edu-doc-nb_1.6~20141203~8.0+edu0~alpha1_all.deb
 997dd0f7b9640f3cdc27a0c83bbbb143 14486026 doc optional debian-edu-doc-it_1.6~20141203~8.0+edu0~alpha1_all.deb
 d39c88a3add2eb6b5bec84c04db012e6 28507386 doc optional debian-edu-doc-fr_1.6~20141203~8.0+edu0~alpha1_all.deb

Version: GnuPG v1.4.12 (GNU/Linux)


--- End Message ---

Reply to: