[Forensics-changes] [SCM] Tools for forensics analysis branch, debian, updated. debian/3.0.1-2-22-gb53e831

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 663f23b8c3cb6698b4921eabf81a0b837da162ce
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Jul 29 19:14:00 2009 +0200

    Simplyfing shell stuff in rules file.

diff --git a/debian/rules b/debian/rules
index 1138281..9dd1666 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,38 +3,37 @@
 SHELL := sh -e
 
 %:
-	dh --with quilt $@
+	dh --with quilt ${@}
 
 override_dh_auto_clean:
-	# restore backup config.{sub,guess}
-	if [ -f config/config.sub.backup ]; then \
-		mv -fv config/config.sub.backup config/config.sub; \
-	fi
-	if [ -f config/config.guess.backup ]; then \
-		mv -fv config/config.guess.backup config/config.guess; \
-	fi
 	dh_auto_clean
 
+	# remove packages config.{sub,guess}
+	rm -f config/config.sub config/config.guess
+
 override_dh_auto_configure:
-	# overwrite config.{sub,guess} from autotools-dev
-	if [ -r /usr/share/misc/config.sub ] && [ ! -f config/config.sub.backup ]; then \
-		mv -v config/config.sub config/config.sub.backup; \
+
+	# update config.{sub,guess} from autotools-dev
+	if [ -r /usr/share/misc/config.sub ]; \
+	then \
 		cp -f /usr/share/misc/config.sub config/config.sub; \
 	fi
-	if [ -r /usr/share/misc/config.guess ] && [ ! -f config/config.guess.backup ]; then \
-		mv -v config/config.guess config/config.guess.backup; \
+
+	if [ -r /usr/share/misc/config.guess ]; \
+	then \
 		cp -f /usr/share/misc/config.guess config/config.guess; \
 	fi
+
 	dh_auto_configure -- LDFLAGS="-Wl,-z,defs"
 
 override_dh_auto_install:
 	dh_auto_install
-	mv debian/tmp/usr/bin/icat    debian/tmp/usr/bin/icat-sleuthkit
-	mv debian/tmp/usr/bin/ils     debian/tmp/usr/bin/ils-sleuthkit
-	mv debian/tmp/usr/bin/mactime debian/tmp/usr/bin/mactime-sleuthkit
-	mv debian/tmp/usr/share/man/man1/icat.1    debian/tmp/usr/share/man/man1/icat-sleuthkit.1
-	mv debian/tmp/usr/share/man/man1/ils.1     debian/tmp/usr/share/man/man1/ils-sleuthkit.1
-	mv debian/tmp/usr/share/man/man1/mactime.1 debian/tmp/usr/share/man/man1/mactime-sleuthkit.1
+
+	for FILE in icat ils mactime; \
+	do \
+		mv debian/tmp/usr/bin/$$FILE debian/tmp/usr/bin/$$FILE-sleuthkit; \
+		mv debian/tmp/usr/share/man/man1/$$FILE.1 debian/tmp/usr/share/man/man1/$$FILE-sleuthkit.1; \
+	done
 
 override_dh_installchangelogs:
 	dh_installchangelogs CHANGES.txt

-- 
Tools for forensics analysis