Index: systems/Linux/2/deb_nopackfiles
===================================================================
RCS file: /cvsroot/tiger/tiger/systems/Linux/2/deb_nopackfiles,v
retrieving revision 1.4
diff -a -u -p -r1.4 deb_nopackfiles
--- systems/Linux/2/deb_nopackfiles	19 Aug 2003 17:14:30 -0000	1.4
+++ systems/Linux/2/deb_nopackfiles	16 Sep 2003 22:29:46 -0000
@@ -66,7 +66,8 @@ done
 # elements are set.
 #
 [ "$Tiger_TESTMODE" = 'Y' ] && {
-  haveallcmds FIND DPKG GREP || exit 1
+  haveallcmds FIND GREP || exit 1
+  [ "$Tiger_DPKG_Optimize" = "N" ] || haveallcmds DPKG || exit 1
   haveallfiles BASEDIR WORKDIR || exit 1
   haveallvars TESTLINK HOSTNAME
   
@@ -78,7 +79,8 @@ done
 echo
 echo "# Checking installed files against packages..."
 
-haveallcmds FIND DPKG GREP || exit 1
+haveallcmds FIND GREP || exit 1
+[ "$Tiger_DPKG_Optimize" = "N" ] || haveallcmds DPKG || exit 1
 
 safe_temp $WORKDIR/dpkg-packages.list
 trap 'delete $WORKDIR/dpkg-packages.list ; exit 1' 1 2 3 15
@@ -92,6 +94,9 @@ then
         # We are not using -maxdepth here, but we could...
         while read file
         do
+# dlocate could be faster
+# DLOCATE=`which dlocate`
+# DLOCATE=${DLOCATE:-$DPKG}
                 pack=`$DPKG -S $file 2>/dev/null`
                 [ "$pack" = "" ] && {
                 message WARN lin001w "" "File \`$file' does not belong to any package." 
@@ -99,7 +104,8 @@ then
         done       
 else
         # Alternative (optimal but not following standard way)
-	$FIND /var/lib/dpkg/info -name "*.list" -exec cat {} \; > $WORKDIR/dpkg-packages.list
+	$FIND /var/lib/dpkg/info -name "*.list" -exec cat {} \; |
+        $SED -ne "/^\/\(bin\|usr\/bin\|sbin\|usr\/sbin\|lib\|usr\/X11R6\/bin\)/p" > $WORKDIR/dpkg-packages.list
         $FIND /bin/ /usr/bin/ /sbin/ /usr/sbin/ /lib/ /usr/X11R6/bin/ -type f |
         # We are not using -maxdepth here, but we could...
         $GREP -x -F -v -f $WORKDIR/dpkg-packages.list |