[Git][libreoffice-team/libs/lightproof][master] apply patch from Jérémy Bobbio <lunar at debian.org> to output locales in a stable…

[Rene Engelhard]

Rene Engelhard pushed to branch master at Debian LibreOffice Maintainers / libs / lightproof


Commits:
867c2ed6 by Rene Engelhard at 2018-01-23T11:25:04+01:00
apply patch from Jérémy Bobbio <lunar at debian.org> to output locales in a stable order to make the build reproducible (Closes: #773919)

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/output_locales_in_sorted_order.diff
- + debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lightproof (1.6-2) UNRELEASED; urgency=medium
+
+  * apply patch from Jérémy Bobbio <lunar at debian.org> to output locales in a
+    stable order to make the build reproducible (Closes: #773919)
+
+ -- Rene Engelhard <rene at debian.org>  Tue, 23 Jan 2018 11:23:23 +0100
+
 lightproof (1.6-1) unstable; urgency=medium
 
   * New upstream version 1.6


=====================================
debian/patches/output_locales_in_sorted_order.diff
=====================================
--- /dev/null
+++ b/debian/patches/output_locales_in_sorted_order.diff
@@ -0,0 +1,22 @@
+Description: Output locales in sorted order
+ To make the package build reproducibly, we output the list of locales
+ in sorted order.
+Author: Jrmy Bobbio <lunar at debian.org>
+
+--- lightproof-1.5+git20140515.orig/make.py
++++ lightproof-1.5+git20140515/make.py
+@@ -2,11 +2,13 @@
+ import sys, os, zipfile, traceback, Dialog
+ import configparser as cp
+ import pythonpath.lightproof_compile___implname__
++from collections import OrderedDict
++import json
+ from string import Template
+ 
+ def dist(fn, a):
+     a['locales'] = a["locales"].replace("_", "-")
+-    a['loc'] = str(dict([[i, [i[0:2], i[3:5], ""]] for i in a["locales"].split(" ")]))
++    a['loc'] = json.dumps(OrderedDict([[i, [i[0:2], i[3:5], ""]] for i in sorted(a["locales"].split(" "))]))
+     distname = a['implname'] + "-" + a['version'] + '.oxt'
+     z = zipfile.ZipFile(distname, mode='w', compression = zipfile.ZIP_DEFLATED)
+     f = open(fn + ".dat", 'r', encoding="utf-8")


=====================================
debian/patches/series
=====================================
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+output_locales_in_sorted_order.diff



View it on GitLab: https://salsa.debian.org/libreoffice-team/libs/lightproof/commit/867c2ed616af05a0866a5070f6e4c1999116a68e

---
View it on GitLab: https://salsa.debian.org/libreoffice-team/libs/lightproof/commit/867c2ed616af05a0866a5070f6e4c1999116a68e
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-openoffice-commits/attachments/20180123/508be262/attachment-0001.html>