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

[Barry Warsaw]

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

barry pushed a commit to branch master
in repository wheel.

commit f20b1a22fbc59874ac987473774226ed6aa2510e
Merge: 167e758 208d1b2
Author: Barry Warsaw <barry at python.org>
Date:   Wed Nov 30 19:10:34 2016 -0500

    merge patched into master

 debian/.git-dpm                          |  4 ++--
 debian/patches/reproducible-builds.patch | 23 +++++++++++++++++++++++
 debian/patches/series                    |  1 +
 wheel/metadata.py                        |  2 +-
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index e2f1a09,0000000..40df676
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
- 8129a9da2ea1f3143cff05356a11867da78f22bb
- 8129a9da2ea1f3143cff05356a11867da78f22bb
++208d1b2045d16e1eb8a453320ea9a5260d2395b2
++208d1b2045d16e1eb8a453320ea9a5260d2395b2
 +8129a9da2ea1f3143cff05356a11867da78f22bb
 +8129a9da2ea1f3143cff05356a11867da78f22bb
 +wheel_0.29.0.orig.tar.gz
 +92e9bd1f716aa5bcd1655dd72d8b858d01a2bf70
 +54143
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/reproducible-builds.patch
index 0000000,0000000..ee381e8
new file mode 100644
--- /dev/null
+++ b/debian/patches/reproducible-builds.patch
@@@ -1,0 -1,0 +1,23 @@@
++From 208d1b2045d16e1eb8a453320ea9a5260d2395b2 Mon Sep 17 00:00:00 2001
++From: Barry Warsaw <barry at python.org>
++Date: Wed, 30 Nov 2016 19:09:49 -0500
++Subject: Sort Requires-Dist headers for reproducible builds
++
++Patch-Name: reproducible-builds.patch
++---
++ wheel/metadata.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/wheel/metadata.py b/wheel/metadata.py
++index b3cc65c..6da0cc4 100644
++--- a/wheel/metadata.py
+++++ b/wheel/metadata.py
++@@ -223,7 +223,7 @@ def requires_to_requires_dist(requirement):
++         requires_dist.append(op + ver)
++     if not requires_dist:
++         return ''
++-    return " (%s)" % ','.join(requires_dist)
+++    return " (%s)" % ','.join(sorted(requires_dist))
++ 
++ def convert_requirements(requirements):
++     """Yield Requires-Dist: strings for parsed requirements strings."""
diff --cc debian/patches/series
index 0000000,0000000..153739d
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++reproducible-builds.patch

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