[freeimage] 02/02: Apply suggested s/sort/LC_ALL=C sort/ to improve build reproducibility. File: Disable-vendored-dependencies.patch

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch debian/sid
in repository freeimage.

commit 1e0ff168375e164fe64afbde09b05bb7a3a369b8
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Mon Jan 25 18:13:21 2016 +0000

    Apply suggested s/sort/LC_ALL=C sort/ to improve build reproducibility.
    File: Disable-vendored-dependencies.patch
---
 debian/patches/Disable-vendored-dependencies.patch | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/patches/Disable-vendored-dependencies.patch b/debian/patches/Disable-vendored-dependencies.patch
index 4442eea..7520d94 100644
--- a/debian/patches/Disable-vendored-dependencies.patch
+++ b/debian/patches/Disable-vendored-dependencies.patch
@@ -404,7 +404,7 @@ index d5be902..c1519ca 100644
  		if(skip_write_field(tif, tag_id)) {
  			// skip tags that are already handled by the LibTIFF writing process
 diff --git a/genfipsrclist.sh b/genfipsrclist.sh
-index 41f946d..a605d4b 100644
+index 41f946d..33b3877 100644
 --- a/genfipsrclist.sh
 +++ b/genfipsrclist.sh
 @@ -1,18 +1,13 @@
@@ -424,19 +424,19 @@ index 41f946d..a605d4b 100644
 -		egrep 'RelativePath=.*\.(c|cpp)' $DIR/*.2008.vcproj | cut -d'"' -f2 | tr '\\' '/' | awk '{print "'$DIR'/"$0}' | tr '\r\n' '  ' | tr -s ' ' >> fipMakefile.srcs
 -	fi
 -done
-+find Wrapper/FreeImagePlus/src -name '*.cpp' -print | sort | xargs echo -n >> fipMakefile.srcs
++find Wrapper/FreeImagePlus/src -name '*.cpp' -print | LC_ALL=C sort | xargs echo -n >> fipMakefile.srcs
  echo >> fipMakefile.srcs
  
  echo -n "INCLUDE =" >> fipMakefile.srcs
 diff --git a/gensrclist.sh b/gensrclist.sh
-index dbfb98d..78a7293 100644
+index dbfb98d..3e4747d 100644
 --- a/gensrclist.sh
 +++ b/gensrclist.sh
 @@ -1,21 +1,16 @@
  #!/bin/sh
  
 -DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibJPEG Source/LibPNG Source/LibTIFF4 Source/ZLib Source/LibOpenJPEG Source/OpenEXR Source/OpenEXR/Half Source/OpenEXR/Iex Source/OpenEXR/IlmImf Source/OpenEXR/IlmThread Source/OpenEXR/Imath Source/OpenEXR/IexMath Source/LibRawLite Source/LibRawLite/dcraw Source/LibRawLite/internal Source/LibRawLite/libraw Source/LibRawLite/src Source/LibWebP Source/LibJXR Source/LibJXR/common/include Source/LibJXR/image/sys Source/LibJXR/ [...]
-+DIRLIST=`find Source -type d | sort`
++DIRLIST=`find Source -type d | LC_ALL=C sort`
  
  echo "VER_MAJOR = 3" > Makefile.srcs
  echo "VER_MINOR = 17.0" >> Makefile.srcs
@@ -448,12 +448,12 @@ index dbfb98d..78a7293 100644
 -		egrep 'RelativePath=.*\.(c|cpp)' $DIR/*.2008.vcproj | cut -d'"' -f2 | tr '\\' '/' | awk '{print "'$DIR'/"$0}' | tr '\r\n' '  ' | tr -s ' ' >> Makefile.srcs
 -	fi
 -done
-+find Source -name '*.c' -or -name '*.cpp' -not -name 'PluginG3.cpp' -not -name 'JPEGTransform.cpp' | sort | xargs echo -n >> Makefile.srcs
++find Source -name '*.c' -or -name '*.cpp' -not -name 'PluginG3.cpp' -not -name 'JPEGTransform.cpp' | LC_ALL=C sort | xargs echo -n >> Makefile.srcs
  echo >> Makefile.srcs
  
  echo -n "INCLS = " >> Makefile.srcs
 -find . -name "*.h" -print | xargs echo >> Makefile.srcs
-+find Source -name '*.h' | sort | xargs echo -n >> Makefile.srcs
++find Source -name '*.h' | LC_ALL=C sort | xargs echo -n >> Makefile.srcs
  echo >> Makefile.srcs
  
  echo -n "INCLUDE =" >> Makefile.srcs

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/freeimage.git