[SCM] debian-live/live-helper branch, master, updated. 1.0_a41-1-13-gd5ac81a

[Daniel Baumann]

The following commit has been merged in the master branch:
commit d5ac81a8e36accc4fa127ddeddca2f95a803f04d
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Apr 9 13:31:46 2008 +0200

    Sort md5sum.txt files again after filename.

diff --git a/helpers/lh_binary_md5sum b/helpers/lh_binary_md5sum
index 40540f2..d48bc64 100755
--- a/helpers/lh_binary_md5sum
+++ b/helpers/lh_binary_md5sum
@@ -55,7 +55,7 @@ fi
 
 # Calculating md5sums
 cd binary
-find . -type f \! -name 'isolinux/isolinux.bin' \! -name 'boot/grub/stage2_eltorito' -print0 | xargs -0 md5sum > ../md5sum.txt
+find . -type f \! -name 'isolinux/isolinux.bin' \! -name 'boot/grub/stage2_eltorito' -print0 | sort -z | xargs -0 md5sum > ../md5sum.txt
 
 cat > md5sum.txt << EOF
 This file contains the list of md5 checksums of all files on this medium.
@@ -66,7 +66,7 @@ or, manually with: 'md5sum -c md5sum.txt'.
 
 EOF
 
-sort ../md5sum.txt >> md5sum.txt
+cat ../md5sum.txt >> md5sum.txt
 rm -f ../md5sum.txt
 
 cd "${OLDPWD}"
diff --git a/helpers/lh_source_md5sum b/helpers/lh_source_md5sum
index af3a92e..776fa06 100755
--- a/helpers/lh_source_md5sum
+++ b/helpers/lh_source_md5sum
@@ -60,7 +60,7 @@ fi
 
 # Calculating md5sums
 cd source
-find . -type f -print0 | xargs -0 md5sum > ../md5sum.txt
+find . -type f -print0 | sort -z | xargs -0 md5sum > ../md5sum.txt
 
 cat > md5sum.txt << EOF
 This file contains the list of md5 checksums of all files on this medium.
@@ -71,7 +71,7 @@ or, manually with: 'md5sum -c md5sum.txt'.
 
 EOF
 
-sort ../md5sum.txt >> md5sum.txt
+cat ../md5sum.txt >> md5sum.txt
 rm -f ../md5sum.txt
 
 cd "${OLDPWD}"

-- 
debian-live/live-helper