[SCM] dgedit/master: Fix reproducibility by a d/patch

[viccuad-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6ebae72fb359051817f4826163e332b6efa6f28e
Author: viccuad <me at viccuad.me>
Date:   Thu Nov 19 13:24:07 2015 +0100

    Fix reproducibility by a d/patch
    
    The patch has been upstreamed. See the patch Comments
    section for info.

diff --git a/debian/patches/reproducible-sort.patch b/debian/patches/reproducible-sort.patch
new file mode 100644
index 0000000..c5365d3
--- /dev/null
+++ b/debian/patches/reproducible-sort.patch
@@ -0,0 +1,24 @@
+Description: Fix reproducibility by sorting first on Moclist.h
+ After grepping "Q_OBJECT", sort the files so the result is deterministic.
+ Use locale C so there isn't differences between machines with different
+ locale in the sorting.
+Author: Víctor Cuadrado Juan <me at viccuad.me>
+Origin: Debian
+Reviewed-by: Víctor Cuadrado Juan <me at viccuad.me>
+Last-Update: 2015-11-18
+---
+--- a/tools/MocList
++++ b/tools/MocList
+@@ -1,9 +1,9 @@
+ # -*- mode: shell-script; sh-shell: bash; sh-indentation: 2 -*-
+ if [ "$1" = "cc" ]; then
+-	grep "Q_OBJECT" *.h | cut -d: -f1 | sed -e 's/^//g;s/\.h/\.moc.cc/g'| xargs echo;
++	grep "Q_OBJECT" *.h | LC_ALL=C sort | cut -d: -f1 | sed -e 's/^//g;s/\.h/\.moc.cc/g'| xargs echo;
+ elif [ "$1" = "o" ]; then
+-	grep "Q_OBJECT" *.h | cut -d: -f1 | sed -e 's/^//g;s/\.h/\.moc.o/g'| xargs echo;
++	grep "Q_OBJECT" *.h | LC_ALL=C sort | cut -d: -f1 | sed -e 's/^//g;s/\.h/\.moc.o/g'| xargs echo;
+ elif [ "$1" = "h" ]; then
+-	grep "Q_OBJECT" *.h | cut -d: -f1 | cut -d'/' -f3 | xargs echo;
++	grep "Q_OBJECT" *.h | LC_ALL=C sort | cut -d: -f1 | cut -d'/' -f3 | xargs echo;
+ fi
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f2fa83a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+reproducible-sort.patch

-- 
dgedit packaging