[Python-modules-commits] [flask-restful] 02/03: merge patched into master

[Ondřej Nový]

This is an automated email from the git hooks/post-receive script.

onovy pushed a commit to branch master
in repository flask-restful.

commit da7ccccaf6bfd60b839c4639d5bd03933b0824c4
Merge: 63f7b86 82bb3bf
Author: Ondřej Nový <onovy at debian.org>
Date:   Sun Aug 14 00:51:03 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...DATE_EPOCH-for-copyright-year-to-make-bui.patch | 38 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 docs/conf.py                                       |  7 ++--
 4 files changed, 46 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index bb5a7b0,0000000..fe64015
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- e398c25382eb8479a7f46fc42a05aad9afbbe29f
- e398c25382eb8479a7f46fc42a05aad9afbbe29f
++82bb3bfce4b3a3cedadde2410dbd9deac3c35327
++82bb3bfce4b3a3cedadde2410dbd9deac3c35327
 +90839985ac22066b03cf26576bf553460c71124e
 +90839985ac22066b03cf26576bf553460c71124e
 +flask-restful_0.3.5.orig.tar.gz
 +c701a0a8902557bf51c71c765b9b6b9ec5edaf4e
 +113214
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0004-Use-SOURCE_DATE_EPOCH-for-copyright-year-to-make-bui.patch
index 0000000,0000000..83833ac
new file mode 100644
--- /dev/null
+++ b/debian/patches/0004-Use-SOURCE_DATE_EPOCH-for-copyright-year-to-make-bui.patch
@@@ -1,0 -1,0 +1,38 @@@
++From 82bb3bfce4b3a3cedadde2410dbd9deac3c35327 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy at debian.org>
++Date: Sun, 14 Aug 2016 00:50:39 +0200
++Subject: Use SOURCE_DATE_EPOCH for copyright year to make build reproducible
++
++Author: Chris Lamb <lamby at debian.org>
++Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=809780
++---
++ docs/conf.py | 7 +++++--
++ 1 file changed, 5 insertions(+), 2 deletions(-)
++
++diff --git a/docs/conf.py b/docs/conf.py
++index 1957254..5350ff7 100644
++--- a/docs/conf.py
+++++ b/docs/conf.py
++@@ -11,9 +11,12 @@
++ # All configuration values have a default; values that are commented out
++ # serve to show the default.
++ 
++-from datetime import date
++ import os
++ import sys
+++import time
+++import datetime
+++
+++BUILD_DATE = datetime.datetime.utcfromtimestamp(int(os.environ.get('SOURCE_DATE_EPOCH', time.time())))
++ 
++ # If extensions (or modules to document with autodoc) are in another directory,
++ # add these directories to sys.path here. If the directory is relative to the
++@@ -46,7 +49,7 @@ master_doc = 'index'
++ # General information about the project.
++ project = u'Flask-RESTful'
++ copyright = u'{}, Kevin Burke, Kyle Conroy, Ryan Horn, Frank Stratton, Guillaume Binet'.format(
++-    date.today().year)
+++    BUILD_DATE.year)
++ 
++ # The version info for the project you're documenting, acts as replacement for
++ # |version| and |release|, also used in various other places throughout the
diff --cc debian/patches/series
index 2480227,0000000..9931f05
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,4 @@@
 +skip-bad-test
 +remove-external-image
 +0003-Use-local-copies-of-object.inv-for-building-document.patch
++0004-Use-SOURCE_DATE_EPOCH-for-copyright-year-to-make-bui.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/flask-restful.git