From bce4aab1930af5e4c8c8d946bd4693937e1a576e Mon Sep 17 00:00:00 2001
From: Scott Kitterman <scott@kitterman.com>
Date: Sat, 12 Nov 2016 14:46:30 -0500
Subject: [PATCH] Consistently order python substvars to support
reproducibility
---
debian/changelog | 7 +++++--
debpython/depends.py | 10 +++++-----
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 76b3fa2..a346f70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
-python-defaults (2.7.11-2.1) UNRELEASED; urgency=medium
+python-defaults (2.7.11-2) UNRELEASED; urgency=medium
[ Helmut Grohne ]
* Fix FTCBFS: Annotate python build dependencies with :any (Closes: #841682)
- -- Scott Kitterman <scott@kitterman.com> Sat, 22 Oct 2016 12:54:48 -0400
+ [ Chris Lamb ]
+ * Consistently order python substvars to support reproducibility
+
+ -- Scott Kitterman <scott@kitterman.com> Sat, 12 Nov 2016 14:44:11 -0500
python-defaults (2.7.11-2) unstable; urgency=medium
diff --git a/debpython/depends.py b/debpython/depends.py
index d46c896..be153b0 100644
--- a/debpython/depends.py
+++ b/debpython/depends.py
@@ -43,15 +43,15 @@ class Dependencies(object):
def export_to(self, dh):
"""Fill in debhelper's substvars."""
- for i in self.depends:
+ for i in sorted(self.depends):
dh.addsubstvar(self.package, 'python:Depends', i)
- for i in self.recommends:
+ for i in sorted(self.recommends):
dh.addsubstvar(self.package, 'python:Recommends', i)
- for i in self.suggests:
+ for i in sorted(self.suggests):
dh.addsubstvar(self.package, 'python:Suggests', i)
- for i in self.enhances:
+ for i in sorted(self.enhances):
dh.addsubstvar(self.package, 'python:Enhances', i)
- for i in self.breaks:
+ for i in sorted(self.breaks):
dh.addsubstvar(self.package, 'python:Breaks', i)
for i in self.rtscripts:
dh.add_rtupdate(self.package, i)
--
GitLab