Source: bzr
Version: 2.6.0+bzr6595-6
Severity: wishlist
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: timestamps fileordering

Hi!

While working on the “reproducible builds” effort [1], we have noticed
that bzr could not be built reproducibly.

The attached patch removes extra timestamps from the build system and
ensure a stable file order when creating the source archive. Once
applied,
bzr can be built reproducibly in our current experimental framework.

 [1]: https://wiki.debian.org/ReproducibleBuilds
=== modified file 'debian/changelog'
--- debian/changelog	2014-09-27 21:52:46 +0000
+++ debian/changelog	2015-03-14 23:47:50 +0000
@@ -1,3 +1,10 @@
+bzr (2.6.0+bzr6595-7) UNRELEASED; urgency=medium
+
+  * Add patch 09_remove_generation_time: Removes generation time from
+    manpage, as it causes unreproducible builds.
+
+ -- Jelmer Vernooij <jel...@debian.org>  Sun, 15 Mar 2015 00:45:50 +0100
+
 bzr (2.6.0+bzr6595-6) unstable; urgency=medium
 
   * Re-add python-paramiko as build-dependency now 1.14.1 is in the

=== added file 'debian/patches/09_remove_generation_time'
--- debian/patches/09_remove_generation_time	1970-01-01 00:00:00 +0000
+++ debian/patches/09_remove_generation_time	2015-03-14 23:47:50 +0000
@@ -0,0 +1,32 @@
+Description: Remove generation time from scripts; this causes unreproducible builds.
+Origin: commit, revision id: jel...@samba.org-20150314234401-vk8pqfi2zw549uxg
+Author: Jelmer Vernooij <jel...@samba.org>
+Last-Update: 2015-03-14
+Applied-Upstream: no
+X-Bzr-Revision-Id: jel...@samba.org-20150314234401-vk8pqfi2zw549uxg
+
+=== modified file 'bzrlib/doc_generate/autodoc_man.py'
+--- old/bzrlib/doc_generate/autodoc_man.py	2012-03-16 13:46:56 +0000
++++ new/bzrlib/doc_generate/autodoc_man.py	2015-03-14 23:44:01 +0000
+@@ -189,8 +189,6 @@
+ .\\\"     \"%(bzrcmd)s help commands\"
+ .\\\"     \"%(bzrcmd)s help <cmd>\"
+ .\\\"
+-.\\\" Generation time: %(timestamp)s
+-.\\\"
+ 
+ .ie \\n(.g .ds Aq \\(aq
+ .el .ds Aq '
+
+=== modified file 'bzrlib/doc_generate/autodoc_rstx.py'
+--- old/bzrlib/doc_generate/autodoc_rstx.py	2014-05-08 01:28:12 +0000
++++ new/bzrlib/doc_generate/autodoc_rstx.py	2015-03-14 23:44:01 +0000
+@@ -144,7 +144,6 @@
+ ..     %(bzrcmd)s help commands
+ ..     %(bzrcmd)s help <cmd>
+ ..
+-.. Generation time: %(timestamp)s
+ 
+ """
+ 
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-09-27 17:46:31 +0000
+++ debian/patches/series	2015-03-14 23:47:50 +0000
@@ -5,3 +5,4 @@
 06_win32_paths
 07_shorten_test_names
 08_disable_put_file_unicode
+09_remove_generation_time

Attachment: signature.asc
Description: Digital signature

Reply via email to