[pkg-lynx-commits] [lynx-cur] 01/01: Sort cfg_defs.h independent of locale.

[Andreas Metzler]

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

ametzler pushed a commit to branch master
in repository lynx-cur.

commit fdc29b97839baf918e8c8d32f26fcfdf65ef516d
Author: Andreas Metzler <ametzler at bebt.de>
Date:   Sat Jul 18 16:42:08 2015 +0200

    Sort cfg_defs.h independent of locale.
    
    40_reproducible_build.diff: Sort cfg_defs.h independent of locale.
    Closes: #792770
---
 debian/changelog                          |  8 ++++++++
 debian/patches/40_reproducible_build.diff | 19 +++++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9cdda1b..258a54c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+lynx-cur (2.8.9dev6-4) UNRELEASED; urgency=medium
+
+  [ Reiner Herrmann ]
+  * 40_reproducible_build.diff: Sort cfg_defs.h independent of locale.
+    Closes: #792770
+
+ -- Andreas Metzler <ametzler at debian.org>  Sat, 18 Jul 2015 16:36:13 +0200
+
 lynx-cur (2.8.9dev6-3) unstable; urgency=medium
 
   * Upload to unstable. The change in the previous upload (to experimental)
diff --git a/debian/patches/40_reproducible_build.diff b/debian/patches/40_reproducible_build.diff
index 0b38518..67d0b62 100644
--- a/debian/patches/40_reproducible_build.diff
+++ b/debian/patches/40_reproducible_build.diff
@@ -1,5 +1,7 @@
-Description: Make build reproducible by removing __DATE__ and __TIME__ macros
- See https://wiki.debian.org/ReproducibleBuilds/TimestampsFromCPPMacros
+Description: Make build reproducible
+ - Remove __DATE__ and __TIME__ macros
+   See https://wiki.debian.org/ReproducibleBuilds/TimestampsFromCPPMacros
+ - Sort cfg_defs.h independent of locale
 Author: Axel Beckert <abe at debian.org>
 
 Index: lynx-cur/src/LYMain.c
@@ -45,3 +47,16 @@ Index: lynx-cur/src/LYMain.c
  #endif /* __DJGPP__ */
  #endif /* _MSC_VER */
  #endif /* __BORLANDC__ */
+Index: lynx-cur-2.8.9dev6/scripts/cfg_edit.sh
+===================================================================
+--- lynx-cur-2.8.9dev6.orig/scripts/cfg_edit.sh
++++ lynx-cur-2.8.9dev6/scripts/cfg_edit.sh
+@@ -7,7 +7,7 @@
+ # Append a '=' if none present'
+ # Break into two strings at '='
+ # Prefix ' { "' and suffix '" },'
+-sort |
++LC_ALL=C sort |
+ sed	-e 's!^[ 	]*!!' -e 's![ 	]*$!!' \
+ 	-e 's!\\!\\\\!g'        \
+ 	-e 's!"!\\"!g'          \

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