[apache2] 01/01: Make symbol sorting consistent over different locales

[Stefan Fritsch]

This is an automated email from the git hooks/post-receive script.

sf pushed a commit to branch master
in repository apache2.

commit a2fc7c6224f3852e6e3fbe269c3bfdc701aa7006
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Thu Aug 20 09:21:00 2015 +0200

    Make symbol sorting consistent over different locales
---
 debian/changelog                        | 6 ++++++
 debian/patches/reproducible_builds.diff | 7 ++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 6c55203..c0eb74b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apache2 (2.4.16-4) UNRELEASED; urgency=medium
+
+  * reproducible build: Make symbol sorting consistent over different locales
+
+ -- Stefan Fritsch <sf at debian.org>  Thu, 20 Aug 2015 09:20:14 +0200
+
 apache2 (2.4.16-3) unstable; urgency=medium
 
   [ Jean-Michel Vourgère ]
diff --git a/debian/patches/reproducible_builds.diff b/debian/patches/reproducible_builds.diff
index 2ba9d3f..4024646 100644
--- a/debian/patches/reproducible_builds.diff
+++ b/debian/patches/reproducible_builds.diff
@@ -26,7 +26,12 @@ Index: apache2/server/Makefile.in
 ===================================================================
 --- apache2.orig/server/Makefile.in
 +++ apache2/server/Makefile.in
-@@ -80,8 +80,8 @@ httpd.exp: exports.c export_vars.h
+@@ -1,3 +1,4 @@
++export LANG = C
+ 
+ CLEAN_TARGETS = gen_test_char test_char.h \
+ 	ApacheCoreOS2.def httpd.exp export_files \
+@@ -80,8 +81,8 @@ httpd.exp: exports.c export_vars.h
  	@echo "#! ." > $@
  	@echo "* This file was AUTOGENERATED at build time." >> $@
  	@echo "* Please do not edit by hand." >> $@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apache2.git