summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Fritsch <sf@sfritsch.de>2015-08-20 09:21:00 +0200
committerStefan Fritsch <sf@sfritsch.de>2015-08-20 09:21:00 +0200
commita2fc7c6224f3852e6e3fbe269c3bfdc701aa7006 (patch)
tree16e49ad9ad07b20cbbb1fc0e24e1771239e1e3e2
parentf5a3769200c3412a9bcfd951a6dd15f7cc71c1e4 (diff)
downloadapache2-a2fc7c6224f3852e6e3fbe269c3bfdc701aa7006.tar.gz
Make symbol sorting consistent over different locales
-rw-r--r--debian/changelog6
-rw-r--r--debian/patches/reproducible_builds.diff7
2 files changed, 12 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 6c55203e..c0eb74b3 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@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 2ba9d3f1..40246468 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." >> $@