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

Bug#919887: marked as done (debian-edu-doc: should include release date (=SOURCE_DATE_EPOCH))

Your message dated Mon, 11 Feb 2019 11:34:16 +0000
with message-id <E1gt9qq-0005Pa-0Y@fasolo.debian.org>
and subject line Bug#919887: fixed in debian-edu-doc 2.10.13
has caused the Debian Bug report #919887,
regarding debian-edu-doc: should include release date (=SOURCE_DATE_EPOCH)
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
immediately.)


-- 
919887: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=919887
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
package: debian-edu-doc
version: 2.10.12

Hi,

with the changes in 2.10.11 and 2.10.12, debian-edu-doc finally builds
reproducibly, yay.

However, the Buster manual now doesnt indicate from which time it is,
which is a bit annoying. The package of course has it, but that's
non-intuitive. Adding it as a string into
https://wiki.debian.org/DebianEdu/Documentation/Buster would work, but
also cause extra manual work constantly.

As such, I think we should teach dblatex to include the date coming from
$SOURCE_DATE_EPOCH, which is set by dpkg-dev during the build process.

With these change the date was still on the frontpage, but it was the
current date... (not SOURCE_DATE_EPOCH)

$ git diff 2.10.10..2.10.11 documentation/common debian/changelog
diff --git a/debian/changelog b/debian/changelog
index 8e8ff4e0..668d2216 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,31 @@
+debian-edu-doc (2.10.11) unstable; urgency=medium
+
[...]
+  [ Wolfgang Schweer ]
+  * documentation/common/Makefile.common:
+    - use SOURCE_DATE_EPOCH by setting SOURCE_DATE_EPOCH_TEX_PRIMITIVES=1 for
+      the dblatex call to generate the PDF and EPUB manuals. Also, in case of
+      EPUB files the generated article ID is unique and needs to be tweaked
+      and (being a zip file) strip-nondeterminism is used to get rid of the
+      remaining difference.
+      With these changes the manuals can be built reproducibly.
+  * debian/control:
+    - Add strip-nondeterminism to Build-Depends-Indep.
+
+  [ Holger Levsen ]
+  * documentation/common/Makefile.common: use SOURCE_DATE_EPOCH correctly.
[...]
+ -- Holger Levsen <holger@debian.org>  Fri, 18 Jan 2019 23:16:48 +0100
+
 debian-edu-doc (2.10.10) unstable; urgency=medium
 
   [ Translation updates ]
diff --git a/documentation/common/Makefile.common b/documentation/common/Makefile.common
index e440aa67..09fd86ed 100644
--- a/documentation/common/Makefile.common
+++ b/documentation/common/Makefile.common
@@ -10,7 +10,7 @@ LANGUAGES = $(subst $(name).,,$(subst .po,,$(wildcard *.po)))
 # Program name and option
 DBTOEPUB = dbtoepub
 XP = xsltproc --nonet --novalid --xinclude ../common/html.xsl
-DBLATEX = dblatex -T db2latex -b xetex -p ../common/dblatex.xsl
+DBLATEX = SOURCE_DATE_EPOCH=$$SOURCE_DATE_EPOCH SOURCE_DATE_EPOCH_TEX_PRIMITIVES=1 dblatex -T db2latex -b xetex -p ../common/dblatex.xsl
 SED_JA_REGEX = 's/dbtimestamp/dbtimestamp\ format=\"Y\ 年\ m\ 月\ d\ 日\"/'
 
 # Use Make internal function 'subst': substitute -manual with nothing to get
@@ -63,6 +63,14 @@ build-epub:
        # build the English EPUB version
        echo "Creating epub for en"
        $(DBTOEPUB) $(name).xml
+       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 {} \;
+       rm $(name).epub
+       zip -q -r -o $(name).epub epub/
+       rm -rf epub/
+       strip-nondeterminism -t zip $(name).epub
        # build all other EPUB versions
        -for LINGUA in $(LANGUAGES) ; do \
                echo "Creating epub for $$LINGUA"; \
@@ -105,10 +113,26 @@ endif
 ifndef LINGUA
 epub:
        $(DBTOEPUB) $(name).xml
+       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 {} \;
+       rm $(name).epub
+       zip -q -r -o $(name).epub epub/
+       rm -rf epub/
+       strip-nondeterminism -t zip $(name).epub
 else
 epub:
        po4a --translate-only $(name).$(LINGUA).xml po4a.cfg
        $(DBTOEPUB) $(name).$(LINGUA).xml
+       unzip -q $(name).$(LINGUA).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 {} \;
+       rm $(name).$(LINGUA).epub
+       zip -q -r -o $(name).$(LINGUA).epub epub/
+       rm -rf epub/
+       strip-nondeterminism -t zip $(name).$(LINGUA).epub
 endif
 
 install: build
@@ -154,6 +178,16 @@ install: build
                fi ; \
                if [ -e $(name).$$f.epub ] ; then \
                        cp $(name).$$f.epub $$LANGPATH/$(name).epub ; \
+                       cd $$LANGPATH ; \
+                       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 {} \; ; \
+                       rm $(name).epub ; \
+                       zip -q -r -o $(name).epub epub/ ; \
+                       rm -rf epub/ ; \
+                       strip-nondeterminism -t zip $(name).epub ; \
+                       cd - ; \
                fi ; \
        done            
        rm $(DESTDIR)/debian-edu-doc-en/$(DESTPATH)/debian-edu-doc-en/$(name)-images/*.pdf ; \

these changes removed the date from the frontpage:

$ git diff 2.10.11..2.10.12 documentation/common debian/changelog
diff --git a/debian/changelog b/debian/changelog
index 668d2216..1da69fcf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+debian-edu-doc (2.10.12) unstable; urgency=medium
+
+  [ Wolfgang Schweer ]
+  * Don't show the date (actually revision date) on the title page of PDF
+    manuals; these changes are needed:
+    - Makefile.common: Use native instead of db2latex type.
+    - dblatex.xsl: Drop collaborator and revision history information.
+
+ -- Holger Levsen <holger@debian.org>  Sun, 20 Jan 2019 14:47:44 +0100
+
 debian-edu-doc (2.10.11) unstable; urgency=medium
 
   [ Translation updates ]
diff --git a/documentation/common/Makefile.common b/documentation/common/Makefile.common
index 09fd86ed..22e77c1f 100644
--- a/documentation/common/Makefile.common
+++ b/documentation/common/Makefile.common
@@ -10,7 +10,7 @@ LANGUAGES = $(subst $(name).,,$(subst .po,,$(wildcard *.po)))
 # Program name and option
 DBTOEPUB = dbtoepub
 XP = xsltproc --nonet --novalid --xinclude ../common/html.xsl
-DBLATEX = SOURCE_DATE_EPOCH=$$SOURCE_DATE_EPOCH SOURCE_DATE_EPOCH_TEX_PRIMITIVES=1 dblatex -T db2latex -b xetex -p ../common/dblatex.xsl
+DBLATEX = SOURCE_DATE_EPOCH=$$SOURCE_DATE_EPOCH SOURCE_DATE_EPOCH_TEX_PRIMITIVES=1 dblatex -T native -b xetex -p ../common/dblatex.xsl
 SED_JA_REGEX = 's/dbtimestamp/dbtimestamp\ format=\"Y\ 年\ m\ 月\ d\ 日\"/'
 
 # Use Make internal function 'subst': substitute -manual with nothing to get
diff --git a/documentation/common/dblatex.xsl b/documentation/common/dblatex.xsl
index 79dca983..0818838c 100644
--- a/documentation/common/dblatex.xsl
+++ b/documentation/common/dblatex.xsl
@@ -27,4 +27,6 @@
    </xsl:choose>
   </xsl:param>
   <xsl:param name="toc.section.depth">3</xsl:param>
+  <xsl:param name="doc.collab.show">0</xsl:param>
+  <xsl:param name="latex.output.revhistory">0</xsl:param>
 </xsl:stylesheet>


-- 
tschüß,
	Holger

-------------------------------------------------------------------------------
               holger@(debian|reproducible-builds|layer-acht).org
       PGP fingerprint: B8BF 5413 7B09 D35C F026 FE9D 091A B856 069A AA1C

Attachment: signature.asc
Description: PGP signature


--- End Message ---
--- Begin Message --- 
Source: debian-edu-doc
Source-Version: 2.10.13

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
attached.

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

Debian distribution maintenance software
pp.
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)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Mon, 11 Feb 2019 12:22:07 +0100
Source: debian-edu-doc
Architecture: source
Version: 2.10.13
Distribution: unstable
Urgency: medium
Maintainer: Debian Edu Developers <debian-edu@lists.debian.org>
Changed-By: Holger Levsen <holger@debian.org>
Closes: 919887
Changes:
 debian-edu-doc (2.10.13) unstable; urgency=medium
 .
   [ Translation updates ]
   * Buster manual:
     - Chinese (Traditional): Louies
     - German: Wolfgang Schweer
     - Norwegian Bokmål: Allan Nordhøy, Petter Reinholdtsen.
     - Dutch: Frans Spiesschaert.
   * Stretch manual:
     - German: Wolfgang Schweer
     - Chinese (Traditional): Louies
     - Norwegian Bokmål: Allan Nordhøy.
     - Dutch: Frans Spiesschaert.
   * Audacity manual:
     - Chinese (Traditional): Louies
     - Portuguese (Brazil): Thi
     - Dutch: Frans Spiesschaert.
   * Rosegarden manual:
     - Chinese (Traditional): Louies
     - Norwegian Bokmål: Allan Nordhøy.
     - Dutch: Frans Spiesschaert.
   * ITIL manual:
     - Chinese (Traditional): Louies
     - Dutch: Frans Spiesschaert.
     - Norwegian Bokmål: Allan Nordhøy, Petter Reinholdtsen.
 .
   [ Holger Levsen ]
   * Update all manuals from the wiki.
   * d/control:
     - mark all binary packages as multiarch: foreign.
     - use canonical URL for Vcs-Git, thanks lintian.
   * scripts/get_copyright:
     - add Brazilian Portuguese.
     - sort languages alphabetically.
   * d/copyright: update my years.
   * Drop zh_Hant translations manually and locally before building the source
     package, as they are not mentioned in the upstream CopyRight wiki pages
     and thus are excluded from d/copyright. Please fix this.
 .
   [ Wolfgang Schweer ]
   * scripts/get_manual:
     - Add date derived from SOURCE_DATE_EPOCH to manual titles.
       (Closes: #919887).
   * Makefile.common:
     - Tell dblatex to use a specific build directory instead of a random one.
   * Fix Ukrainian language related issues:
     - audacity-manual.uk.po: Use 'uk' instead of 'ua' as lang attribute content.
     - common/dblatex.xsl: Add support for lang=uk, set glyphs supporting font.
       Thanks to tests.reproducible-builds.org reports.
   * common/dblatex.xsl: Improve Chinese language related configuration.
     - Fix support for Simplified Chinese (replace zh with zh-cn).
     - Add support for Traditional Chinese (zh-tw).
     The Traditional Chinese configuration is a copy of the Simplified Chinese
     one, so the glyphs might not be correct and another font might be needed.
   * Translation files *.zh.po and *zh_Hant.po:
     The related PO files should have the lang attribute translated accordingly
     as zh and zht are considered as unknown localization strings, done so.
Checksums-Sha1:
 2948c4efbc552c3ae83960b614a35cd4e33115e2 2700 debian-edu-doc_2.10.13.dsc
 827ff12141f00e5321b49c144744065d3379d7ca 27712132 debian-edu-doc_2.10.13.tar.xz
 a95ba630ca05e6499f7c6091516774cf2aa55916 5212 debian-edu-doc_2.10.13_source.buildinfo
Checksums-Sha256:
 8ce44eb0f7c76c3c6d4f6e0df4d1063711ea14cf0f2126755af1cfea670d8a66 2700 debian-edu-doc_2.10.13.dsc
 a8a0bce260846f5d884d5b7578518ab843b1ee63aaba0af2c824bb4e9dbf1afc 27712132 debian-edu-doc_2.10.13.tar.xz
 663de5bbb1d9807e5f0a6feffeda77043474bbcbcb0eb937c0245a0e28d196e5 5212 debian-edu-doc_2.10.13_source.buildinfo
Files:
 64c164aec3b9ed936058cc8092b31410 2700 doc optional debian-edu-doc_2.10.13.dsc
 6ae24810fa672c1d939c1a215f251a0f 27712132 doc optional debian-edu-doc_2.10.13.tar.xz
 5449ae46413cb1daf9113e6d14380488 5212 doc optional debian-edu-doc_2.10.13_source.buildinfo

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEuL9UE3sJ01zwJv6dCRq4VgaaqhwFAlxhW/wACgkQCRq4Vgaa
qhxfZA//XOLrNjTWxNnql3onhapo6Oywd3g3PCipodu+CSysEZE0pD7lFcTtyRtc
zYh3gvB1kIx+4+G2uXhIlPEewWK4toCe168wfc+Qdh29+MDUDxluRGa9k9en5Afk
QEmTt22FMtfDt35SWKZQXHk0Ka61k81gn4De9rauAG6jyjjOBnu+frVC9aNaawRO
hfCw3mWZEazPdGA0WFMOCLNxElXNHvwsAlx7maxnn7+O5EZvoUfb2iL8IWxXgdxx
AFozLTFeU56ylpZ6uQ5ijKzmtyWVpJs7trZqBUcCvpGwGszdlKyMdJqckYdd/ybd
M+b+Ep1skbTNNcbQJNpKtednmrbcakQsXyDFCoxcJX25Jo4kdEWAuiW0JH15l7vG
sDUKBXrge6+298z9kuTW9KAgsUZzGSLJtIb+IbcTGvKYYKeSW1xlayz96mw58faN
IqkoQw6pPHCZtUpmwNNoxoUGZjtHkgq3x6bxvckuUlG1izIe98w7+8dx+NIobPs6
JZkkk5U8NQ2XXOtTdwH3ke79Ddt63qOmg87qjT/q5Z2OvoHTSe5ZgZpsD59Em+t+
bOF9i9YRKbaT/OO9LAfF1rNdhOQIJjT0AedITefaY8Jm0XtHMY0Vi9y2FoWCac9r
HGL+JcwjD55o6TCDHNI8ShO4uBMmq5UquHHNWbU0cMH+bx111mg=
=3EHA
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: