Your message dated Wed, 20 Jul 2016 16:12:20 +0000
with message-id <[email protected]>
and subject line Bug#829708: fixed in zim 0.65-3
has caused the Debian Bug report #829708,
regarding zim: please make the build reproducible
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 [email protected]
immediately.)
--
829708: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=829708
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: zim
Version: 0.65-2
Severity: wishlist
Tags: patch upstream
User: [email protected]
Usertags: timestamps locale fileordering
X-Debbugs-Cc: [email protected]
Hi!
While working on the "reproducible builds" effort [1], we have noticed
that zim could not be built reproducibly.
It embeds a locale-dependent timestamp into a manpage and doesn't sort a
list of plugins embedded in a Python file.
The attached patch fixes those issues.
Regards,
Reiner
[1]: https://wiki.debian.org/ReproducibleBuilds
diff --git a/debian/patches/reproducible-build.patch b/debian/patches/reproducible-build.patch
new file mode 100644
index 0000000..fb32272
--- /dev/null
+++ b/debian/patches/reproducible-build.patch
@@ -0,0 +1,40 @@
+Author: Reiner Herrmann <[email protected]>
+Description: Enable reproducible building
+ - Honour SOURCE_DATE_EPOCH for manpage timestamp, if it is defined
+ - Use C locale for embedded time
+ - Sort list of plugins
+
+--- a/makeman.py
++++ b/makeman.py
+@@ -6,7 +6,8 @@
+
+ import os
+
+-from time import strftime
++from time import strftime, gmtime, time
++from locale import setlocale, LC_TIME
+
+ from zim import __version__, __url__, \
+ __author__, __copyright__, __license__
+@@ -42,8 +43,9 @@
+ os.mkdir('man')
+ except OSError:
+ pass # dir already exists
++ setlocale(LC_TIME, "C")
+ manpage = open('man/zim.1', 'w')
+- manpage.write('.TH ZIM "1" "%s" "zim %s" "User Commands"\n' % (strftime('%B %Y'), __version__))
++ manpage.write('.TH ZIM "1" "%s" "zim %s" "User Commands"\n' % (strftime('%B %Y', gmtime(int(os.environ.get('SOURCE_DATE_EPOCH', time())))), __version__))
+ manpage.write('.SH NAME\nzim \\- %s\n\n' % tagline)
+ manpage.write('.SH SYNOPSIS\n%s\n' % HelpCommand.usagehelp.replace('-', r'\-'))
+ manpage.write('.SH DESCRIPTION\n%s\n' % about)
+--- a/setup.py
++++ b/setup.py
+@@ -290,7 +290,7 @@
+
+ for i, line in enumerate(lines):
+ if line.startswith('\t\tplugins = set('):
+- lines[i] = '\t\tplugins = set(%r) # DEFAULT PLUGINS COMPILED IN BY SETUP.PY\n' % plugins
++ lines[i] = '\t\tplugins = set(%r) # DEFAULT PLUGINS COMPILED IN BY SETUP.PY\n' % sorted(plugins)
+ break
+ else:
+ assert False, 'Missed line for plugin list'
diff --git a/debian/patches/series b/debian/patches/series
index 2c4455a..f13156f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
reload-pages.patch
+reproducible-build.patch
signature.asc
Description: Digital signature
--- End Message ---
--- Begin Message ---
Source: zim
Source-Version: 0.65-3
We believe that the bug you reported is fixed in the latest version of
zim, 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 [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Raphaël Hertzog <[email protected]> (supplier of updated zim 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 [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Wed, 20 Jul 2016 16:09:08 +0200
Source: zim
Binary: zim
Architecture: source
Version: 0.65-3
Distribution: unstable
Urgency: medium
Maintainer: Emfox Zhou <[email protected]>
Changed-By: Raphaël Hertzog <[email protected]>
Description:
zim - graphical text editor based on wiki technologies
Closes: 829708
Changes:
zim (0.65-3) unstable; urgency=medium
.
* Add Reiner Herrmann's patch to make the build reproducible.
Closes: #829708
* Bump Standards-Version to 3.9.8.
* Update Vcs-* URLs to rely on https.
Checksums-Sha1:
e056ae225fa68794289fd09a10bc757ba13bb736 1564 zim_0.65-3.dsc
da6b9393e007c494fe74eecfd6d38bf922cd43a1 10292 zim_0.65-3.debian.tar.xz
Checksums-Sha256:
9c53bd33b9ce859e861530262a388b977190becaf3db529753a18aaf1982ee44 1564
zim_0.65-3.dsc
524f785c8b2ca506299c1a42f52633fcee04691c213404665ef015fca2c7c804 10292
zim_0.65-3.debian.tar.xz
Files:
d461444e99399729e20c7f13b4f54765 1564 x11 optional zim_0.65-3.dsc
56a903013691fda0c957264383a9531c 10292 x11 optional zim_0.65-3.debian.tar.xz
-----BEGIN PGP SIGNATURE-----
Comment: Signed by Raphael Hertzog
iQEcBAEBCgAGBQJXj4dkAAoJEAOIHavrwpq5DAcIAKGxeEz9f8oIlD/tM3f5/AV8
g35f5qXZKHt/4NjMfJMgZOs6ycAqsSP+DsNiECiQqsHZ3Z725OTrR57/KEevpBmS
XRTJ6qDOoe38X6NOENEjfN5H8npPQUFxdPqPDIyv16lTKzNKpvIZqAFXKFdCGZwb
b1mLV2HWfQbyQxgUQLFpa97zIKWqJLkyOq+CKFWNC6fMSpUyr17x+AnGQA75Q4cu
AY1g/GYk9KTYIf8e4vKw02Gf3phogwV3gW8UScH2pvusaGNNe6cQWTJdj0D8aPeu
SO2r1JmylKZWKdheoplzsnYNI+PrDBQwjMrO/uHG8FMFAsm60Xng8Uh+jpnLZ4s=
=T7Lk
-----END PGP SIGNATURE-----
--- End Message ---
