[Forensics-changes] [SCM] debian-forensics/afflib branch, debian, updated. debian/3.5.4+dfsg-1-3-g4fc7e36

[Christophe Monniez]

The following commit has been merged in the debian branch:
commit 4fc7e36577b7b13c13cb568e84cf0ee2fe98ea8d
Author: Christophe Monniez <christophe.monniez at fccu.be>
Date:   Sun Dec 27 12:30:43 2009 +0100

    Refreshing third quilt patch.

diff --git a/debian/patches/03-bashism.patch b/debian/patches/03-bashism.patch
index 8c30749..7da1e5d 100644
--- a/debian/patches/03-bashism.patch
+++ b/debian/patches/03-bashism.patch
@@ -1,38 +1,7 @@
-Index: afflib/tools/test_afsegment.sh
-===================================================================
---- afflib.orig/tools/test_afsegment.sh	2009-12-17 09:18:54.000000000 +0100
-+++ afflib/tools/test_afsegment.sh	2009-12-17 09:44:01.441349105 +0100
-@@ -9,7 +9,7 @@
- /bin/rm -f $W/blank.aff
- ./afcopy /dev/null $W/blank.aff
- ./afsegment -ssegname=testseg1 $W/blank.aff
--if [ x"testseg1" = x`./afsegment -p segname $W/blank.aff` ] ; then 
-+if test x"testseg1" = x"$(./afsegment -p segname $W/blank.aff )" ; then
-   echo afsegment worked!
- else
-   echo afsegment does not work properly
-Index: afflib/tools/test_crypto.sh
-===================================================================
---- afflib.orig/tools/test_crypto.sh	2009-12-17 09:18:54.000000000 +0100
-+++ afflib/tools/test_crypto.sh	2009-12-17 09:47:14.073358931 +0100
-@@ -6,11 +6,11 @@
- 
- unset AFFLIB_PASSPHRASE
- 
--if [ x${srcdir} = "x" ] ; 
-+if test "x${srcdir}" = "x"  ;
-   then 
-      TDIR="../tests/"
-   else 
--     TDIR=$srcdir/../tests/
-+     TDIR="$srcdir"/../tests/
- fi
- 
- if [ ! -r $TDIR/encrypted.aff ]; then
 Index: afflib/tools/test_make_random_iso.sh
 ===================================================================
---- afflib.orig/tools/test_make_random_iso.sh	2009-12-17 09:18:54.000000000 +0100
-+++ afflib/tools/test_make_random_iso.sh	2009-12-17 09:48:11.765181230 +0100
+--- afflib.orig/tools/test_make_random_iso.sh	2009-12-14 03:59:00.000000000 +0100
++++ afflib/tools/test_make_random_iso.sh	2009-12-27 12:18:07.048902144 +0100
 @@ -5,7 +5,7 @@
  
  unset AFFLIB_PASSPHRASE

-- 
debian-forensics/afflib