Bug#940119: sdaps: diff for NMU version 1.9.7-0.2

[Boyuan Yang]

Package: sdaps
Version: 1.9.7-0.1
Severity: normal
Tags: patch  pending

Dear maintainer,

I've prepared an NMU for sdaps (versioned as 1.9.7-0.2) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru sdaps-1.9.7/debian/changelog sdaps-1.9.7/debian/changelog
--- sdaps-1.9.7/debian/changelog	2019-09-03 11:00:23.000000000 -0400
+++ sdaps-1.9.7/debian/changelog	2019-09-15 14:04:29.000000000 -0400
@@ -1,3 +1,14 @@
+sdaps (1.9.7-0.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/control: Replace old build-dependency
+    texlive-generic-recommended with texlive-plain-generic.
+    (Closes: #940119)
+  * debian/patches: Add patch 0001 to make the build
+    reproducible. (Patch already merged upstream) (Closes: #939549)
+
+ -- Boyuan Yang <byang at debian.org>  Sun, 15 Sep 2019 14:04:29 -0400
+
 sdaps (1.9.7-0.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru sdaps-1.9.7/debian/control sdaps-1.9.7/debian/control
--- sdaps-1.9.7/debian/control	2019-08-20 14:31:23.000000000 -0400
+++ sdaps-1.9.7/debian/control	2019-09-15 14:00:36.000000000 -0400
@@ -25,7 +25,7 @@
  python3-setuptools,
  python3-zbar,
  texlive,
- texlive-generic-recommended,
+ texlive-plain-generic,
  texlive-latex-extra,
  texlive-latex-recommended,
  texlive-science,
@@ -54,7 +54,7 @@
  python3-pil,
  python3-reportlab,
  texlive,
- texlive-generic-recommended,
+ texlive-plain-generic,
  texlive-latex-extra,
  texlive-latex-recommended,
  texlive-science,
diff -Nru sdaps-1.9.7/debian/patches/0001-Make-the-build-reproducible.patch
sdaps-1.9.7/debian/patches/0001-Make-the-build-reproducible.patch
--- sdaps-1.9.7/debian/patches/0001-Make-the-build-reproducible.patch	1969-
12-31 19:00:00.000000000 -0500
+++ sdaps-1.9.7/debian/patches/0001-Make-the-build-reproducible.patch	2019-
09-15 14:04:22.000000000 -0400
@@ -0,0 +1,35 @@
+From: Chris Lamb <lamby at debian.org>
+Date: Fri, 6 Sep 2019 09:28:51 +0100
+Subject: Make the build reproducible
+
+Whilst working on the Reproducible Builds effort [0] we noticed
+that sdaps could not be built reproducibly.
+
+This is because its "setup.py" iterated over the keys of a dictionary
+(to generate translations), an operation which, in Python, is
+nondeterministic.
+
+This was originally filed in Debian as #939549 [1].
+
+ [0] https://reproducible-builds.org/
+ [1] https://bugs.debian.org/939549
+
+Applied-Upstream: https://github.com/sdaps/sdaps/pull/182
+Signed-off-by: Chris Lamb <lamby at debian.org>
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 018f632..9562ef4 100755
+--- a/setup.py
++++ b/setup.py
+@@ -132,7 +132,7 @@ class sdaps_build_i18n(build_i18n.build_i18n):
+             f.write('%\n\n')
+             f.write('\\ProvidesDictionary{translator-sdaps-
dictionary}{%s}\n\n' % name)
+ 
+-            for key in keys:
++            for key in sorted(keys):
+                 if lang is not None:
+                     k = "%s[%s]" % (key, lang)
+                 else:
diff -Nru sdaps-1.9.7/debian/patches/series sdaps-1.9.7/debian/patches/series
--- sdaps-1.9.7/debian/patches/series	1969-12-31 19:00:00.000000000 -0500
+++ sdaps-1.9.7/debian/patches/series	2019-09-15 14:03:33.000000000 -0400
@@ -0,0 +1 @@
+0001-Make-the-build-reproducible.patch
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 858 bytes
Desc: This is a digitally signed message part
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-pkg-team/attachments/20190915/4435970e/attachment-0001.sig>