[Python-modules-commits] [flask] 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.

commit 7d79e76bc440902d6ee1bdf9b56cbd1c4cd17620
Merge: 983d5ca 0c0b148
Author: Ondřej Nový <onovy at debian.org>
Date:   Fri Jan 13 10:46:26 2017 +0100

    merge patched into master

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

diff --cc debian/.git-dpm
index 8fa5c20,0000000..d50b8fb
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
- 5219a1a4a282c1277f9c6b1cd4324e8c2d7b95f7
- 5219a1a4a282c1277f9c6b1cd4324e8c2d7b95f7
++0c0b1484f295f248f6c646b410d41674fa32f529
++0c0b1484f295f248f6c646b410d41674fa32f529
 +5219a1a4a282c1277f9c6b1cd4324e8c2d7b95f7
 +5219a1a4a282c1277f9c6b1cd4324e8c2d7b95f7
 +flask_0.12.orig.tar.gz
 +73722d79e479d5f6b09bbb7b746c34a99b81b05c
 +531923
 +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 0000000,0000000..36e46a8
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Use-SOURCE_DATE_EPOCH-for-copyright-year-to-make-bui.patch
@@@ -1,0 -1,0 +1,37 @@@
++From 0c0b1484f295f248f6c646b410d41674fa32f529 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
diff --cc debian/patches/series
index 0000000,0000000..53be40d
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-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.git