UBUNTU: [Debian] control -- make element ordering deterministic

Signed-off-by: Andy Whitcroft <apw@canonical.com>

diff --git a/debian/rules b/debian/rules
index 171b352156ab962028ed181f9483a32912754a69..fb3210f8a744c758d9dc2eb04bb087fa1eb37c15 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -132,7 +132,7 @@ $(DEBIAN)/control.stub: $(DEBIAN)/d-i/kernel-versions.in    \
                -e 's/=HUMAN=/$(human_arch)/g'                                    \
          > $$new;                                                              \
        done
-       flavours="$(wildcard $(DEBIAN)/control.d/vars.* $(DEBIAN)/sub-flavours/*.vars)";\
+       flavours="$(sort $(wildcard $(DEBIAN)/control.d/vars.* $(DEBIAN)/sub-flavours/*.vars))";\
        for i in $$flavours; do                                                 \
          $(SHELL) $(DROOT)/scripts/control-create $$i |                                \
                sed -e 's/PKGVER/$(release)/g'                                  \
@@ -271,4 +271,4 @@ debian/control: $(DEBIAN)/control.stub
        fi
 
        cp $(DEBIAN)/control.stub debian/control.stub
-       cd $(builddir) && kernel-wedge gen-control > $(CURDIR)/debian/control
+       cd $(builddir) && LANG=C kernel-wedge gen-control > $(CURDIR)/debian/control