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

[Christopher Stuart Hoskin]

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

mans0954 pushed a commit to branch master
in repository vine.

commit 4a5b94a37a85740f02198aafa4dae77612ede8b3
Merge: 48b7051 00aa09b
Author: Christopher Hoskin <mans0954 at debian.org>
Date:   Mon May 29 19:33:14 2017 +0100

    merge patched into master

 debian/.git-dpm                              |  4 ++--
 debian/patches/0002-Reproducible-build.patch | 36 ++++++++++++++++++++++++++++
 debian/patches/series                        |  1 +
 vine/five.py                                 |  4 +++-
 4 files changed, 42 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index d04f2d9,0000000..8bd3b06
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
- 0b73c823ff5ae3cf55ee8505461995978019b30d
- 0b73c823ff5ae3cf55ee8505461995978019b30d
++00aa09b14a812d1699914f6c79ebfae6ae7019b6
++00aa09b14a812d1699914f6c79ebfae6ae7019b6
 +6633143b4f28ec57dab8a04dbbd2e8ca1bbadc43
 +6633143b4f28ec57dab8a04dbbd2e8ca1bbadc43
 +vine_1.1.3+dfsg.orig.tar.gz
 +b80f204c4f5e18d01e1c85974a15354f1b330f06
 +49282
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Reproducible-build.patch
index 0000000,0000000..3979128
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Reproducible-build.patch
@@@ -1,0 -1,0 +1,36 @@@
++From 00aa09b14a812d1699914f6c79ebfae6ae7019b6 Mon Sep 17 00:00:00 2001
++From: Christopher Hoskin <mans0954 at debian.org>
++Date: Mon, 29 May 2017 19:08:19 +0100
++Subject: Reproducible build
++
++Description: Make the build reproducible
++Author: Chris Lamb <lamby at debian.org>
++Last-Update: 2017-03-28
++Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=858926
++Forwarded: https://github.com/celery/vine/pull/12
++---
++ vine/five.py | 4 +++-
++ 1 file changed, 3 insertions(+), 1 deletion(-)
++
++diff --git a/vine/five.py b/vine/five.py
++index 2d87a41..e767859 100644
++--- a/vine/five.py
+++++ b/vine/five.py
++@@ -236,7 +236,7 @@ else:
++     exec_("""def reraise(tp, value, tb=None): raise tp, value, tb""")
++ 
++ 
++-def with_metaclass(Type, skip_attrs={'__dict__', '__weakref__'}):
+++def with_metaclass(Type, skip_attrs=None):
++     """Class decorator to set metaclass.
++ 
++     Works with both Python 2 and Python 3 and it does not add
++@@ -244,6 +244,8 @@ def with_metaclass(Type, skip_attrs={'__dict__', '__weakref__'}):
++     (that is -- it copies the original class instead of using inheritance).
++ 
++     """
+++    if skip_attrs is None:
+++        skip_attrs = {'__dict__', '__weakref__'}
++     def _clone_with_metaclass(Class):
++         attrs = {key: value for key, value in items(vars(Class))
++                  if key not in skip_attrs}
diff --cc debian/patches/series
index c13357b,0000000..3c36217
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Remove-image-from-remote-donation-site-privacy-issue.patch
++0002-Reproducible-build.patch

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