tags 833438 + pending patch
thanks
I've uploaded rest2web 0.5.2~alpha+svn-r248-2.3 to DELAYED/15:
rest2web (0.5.2~alpha+svn-r248-2.3) unstable; urgency=medium
* Non-maintainer upload.
* Make the build reproducible. (Closes: #833438)
* Add missing ${misc:Depends} binary dependencies.
* Use canonical "anonscm" version of Vcs-Svn.
The full debdiff is attached.
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` [email protected] / chris-lamb.co.uk
`-
diffstat for rest2web-0.5.2~alpha+svn-r248 rest2web-0.5.2~alpha+svn-r248
changelog | 9 +++++++
control | 5 ++-
patches/reproducible-build.patch | 49 +++++++++++++++++++++++++++++++++++++++
patches/series | 1
4 files changed, 62 insertions(+), 2 deletions(-)
diff -Nru rest2web-0.5.2~alpha+svn-r248/debian/changelog
rest2web-0.5.2~alpha+svn-r248/debian/changelog
--- rest2web-0.5.2~alpha+svn-r248/debian/changelog 2016-02-28
14:06:40.000000000 +0000
+++ rest2web-0.5.2~alpha+svn-r248/debian/changelog 2017-10-01
09:47:29.000000000 +0100
@@ -1,3 +1,12 @@
+rest2web (0.5.2~alpha+svn-r248-2.3) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Make the build reproducible. (Closes: #833438)
+ * Add missing ${misc:Depends} binary dependencies.
+ * Use canonical "anonscm" version of Vcs-Svn.
+
+ -- Chris Lamb <[email protected]> Sun, 01 Oct 2017 09:47:29 +0100
+
rest2web (0.5.2~alpha+svn-r248-2.2) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru rest2web-0.5.2~alpha+svn-r248/debian/control
rest2web-0.5.2~alpha+svn-r248/debian/control
--- rest2web-0.5.2~alpha+svn-r248/debian/control 2015-12-14
23:22:02.000000000 +0000
+++ rest2web-0.5.2~alpha+svn-r248/debian/control 2017-10-01
09:47:29.000000000 +0100
@@ -5,11 +5,11 @@
Build-Depends: debhelper (>= 5.0.37.2)
Build-Depends-Indep: unzip, python, dh-python, python-docutils
Standards-Version: 3.8.1
-Vcs-Svn: svn://svn.debian.org/collab-maint/deb-maint/rest2web/trunk
+Vcs-Svn: svn://anonscm.debian.org/collab-maint/deb-maint/rest2web/trunk
Package: rest2web
Architecture: all
-Depends: ${python:Depends}, python-docutils
+Depends: ${misc:Depends}, ${python:Depends}, python-docutils
Suggests: rest2web-doc (= ${source:Version})
Description: web site builder using ReStructured Text as basic content format
rest2web is a simple tool that lets you build your website from a single
@@ -36,6 +36,7 @@
Package: rest2web-doc
Section: doc
+Depends: ${misc:Depends}
Architecture: all
Description: documentation for rest2web
rest2web is a web site generator using ReStructured Text for content
diff -Nru rest2web-0.5.2~alpha+svn-r248/debian/patches/reproducible-build.patch
rest2web-0.5.2~alpha+svn-r248/debian/patches/reproducible-build.patch
--- rest2web-0.5.2~alpha+svn-r248/debian/patches/reproducible-build.patch
1970-01-01 01:00:00.000000000 +0100
+++ rest2web-0.5.2~alpha+svn-r248/debian/patches/reproducible-build.patch
2017-10-01 09:47:29.000000000 +0100
@@ -0,0 +1,49 @@
+Description: Make the build reproducible
+Author: Chris Lamb <[email protected]>
+Last-Update: 2016-08-04
+
+--- rest2web-0.5.2~alpha+svn-r248.orig/rest2web/restprocessor.py
++++ rest2web-0.5.2~alpha+svn-r248/rest2web/restprocessor.py
+@@ -1060,6 +1060,13 @@ class Processor(object):
+ namespace['modtime'] = time.ctime(namespace['modified'])
+ namespace['modtimeiso'] = datetime.datetime.fromtimestamp(
+ namespace['modified']).isoformat()
++ try:
++ namespace['modified'] = int(os.environ['SOURCE_DATE_EPOCH'])
++ namespace['modtimeiso'] = datetime.datetime.utcfromtimestamp(
++ namespace['modified']).isoformat()
++ namespace['modtime'] =
time.asctime(time.gmtime(namespace['modified']))
++ except KeyError:
++ pass
+ namespace['plugins'] = restindex['plugins']
+ namespace['page_description'] = encode(page_description,
+ final_encoding)
+@@ -1306,6 +1313,13 @@ class Processor(object):
+ namespace['modtimeiso'] = datetime.datetime.fromtimestamp(
+ namespace['modified']).isoformat()
+ namespace['modtime'] = time.ctime(namespace['modified'])
++ try:
++ namespace['modified'] = int(os.environ['SOURCE_DATE_EPOCH'])
++ namespace['modtimeiso'] = datetime.datetime.utcfromtimestamp(
++ namespace['modified']).isoformat()
++ namespace['modtime'] =
time.asctime(time.gmtime(namespace['modified']))
++ except KeyError:
++ pass
+ namespace['plugins'] = restindex['plugins']
+ namespace['page_description'] = encode(page_description,
+ final_encoding)
+--- rest2web-0.5.2~alpha+svn-r248.orig/rest2web/restutils.py
++++ rest2web-0.5.2~alpha+svn-r248/rest2web/restutils.py
+@@ -27,6 +27,12 @@ import random
+ import locale
+ from docutils import core
+
++# Ensure IDs for back-references (etc.) are reproducible.
++try:
++ random.seed(os.environ['SOURCE_DATE_EPOCH'])
++except KeyError:
++ pass
++
+ # do a quick test that we have a recent enough version of docutils
+ # 0.3.9 is the minimum required version of docutils
+ MINVERSION = '0.3.9'
diff -Nru rest2web-0.5.2~alpha+svn-r248/debian/patches/series
rest2web-0.5.2~alpha+svn-r248/debian/patches/series
--- rest2web-0.5.2~alpha+svn-r248/debian/patches/series 1970-01-01
01:00:00.000000000 +0100
+++ rest2web-0.5.2~alpha+svn-r248/debian/patches/series 2017-10-01
09:47:29.000000000 +0100
@@ -0,0 +1 @@
+reproducible-build.patch
