[Python-modules-commits] [flask] 04/05: 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.

commit e8b581484d800496faa2e9739342f45a9272b355
Merge: aec5c4a c8fb21c
Author: Ondřej Nový <onovy at debian.org>
Date:   Sat Jun 3 14:20:44 2017 +0200

    merge patched into master

 CHANGES                                            |  7 ++++++
 Flask.egg-info/PKG-INFO                            |  2 +-
 PKG-INFO                                           |  2 +-
 debian/.git-dpm                                    |  6 ++---
 ...DATE_EPOCH-for-copyright-year-to-make-bui.patch |  2 +-
 docs/testing.rst                                   |  8 ++++---
 flask/__init__.py                                  |  2 +-
 flask/helpers.py                                   | 22 +++++++++++-------
 tests/test_helpers.py                              | 27 +++++++++++-----------
 9 files changed, 46 insertions(+), 32 deletions(-)

diff --cc debian/.git-dpm
index 75e6151,0000000..84eb840
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
- 02ae596d3b6eb5e3c4fe1d938dbd86cee32f5b52
- 02ae596d3b6eb5e3c4fe1d938dbd86cee32f5b52
- e2758a2dfc6ebddb68ccdfd8d3fa4cdd1a5ff03e
++c8fb21caab67574be1cbd928816068c1a156078f
++c8fb21caab67574be1cbd928816068c1a156078f
++846a463e9be7e6e5bfb1fabbed465308171aca54
 +846a463e9be7e6e5bfb1fabbed465308171aca54
 +flask_0.12.2.orig.tar.gz
 +8193757ded6a4f0e7c9a3ce291bf3ae3a1d402c5
 +548510
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Use-SOURCE_DATE_EPOCH-for-copyright-year-to-make-bui.patch
index 4f6806e,0000000..2b0b506
mode 100644,000000..100644
--- a/debian/patches/0001-Use-SOURCE_DATE_EPOCH-for-copyright-year-to-make-bui.patch
+++ b/debian/patches/0001-Use-SOURCE_DATE_EPOCH-for-copyright-year-to-make-bui.patch
@@@ -1,37 -1,0 +1,37 @@@
- From 02ae596d3b6eb5e3c4fe1d938dbd86cee32f5b52 Mon Sep 17 00:00:00 2001
++From c8fb21caab67574be1cbd928816068c1a156078f Mon Sep 17 00:00:00 2001
 +From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy at debian.org>
 +Date: Fri, 13 Jan 2017 10:46:21 +0100
 +Subject: Use SOURCE_DATE_EPOCH for copyright year to make build reproducible
 +
 +---
 + docs/conf.py | 7 +++++--
 + 1 file changed, 5 insertions(+), 2 deletions(-)
 +
 +diff --git a/docs/conf.py b/docs/conf.py
 +index b37427a..81106a3 100644
 +--- a/docs/conf.py
 ++++ b/docs/conf.py
 +@@ -11,10 +11,13 @@
 + # All configuration values have a default; values that are commented out
 + # serve to show the default.
 + from __future__ import print_function
 +-from datetime import datetime
 + import os
 + import sys
 + import pkg_resources
 ++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
 +@@ -49,7 +52,7 @@ master_doc = 'index'
 + 
 + # General information about the project.
 + project = u'Flask'
 +-copyright = u'2010 - {0}, Armin Ronacher'.format(datetime.utcnow().year)
 ++copyright = u'2010 - {0}, Armin Ronacher'.format(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

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