Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/utils
In directory 
sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv7943/stable/main/finkinfo/utils

Modified Files:
        dlocate.info 
Added Files:
        dlocate.patch 
Log Message:
lots of fixes from unstable


Index: dlocate.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/utils/dlocate.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dlocate.info        21 Nov 2006 06:32:55 -0000      1.2
+++ dlocate.info        18 Aug 2008 02:22:02 -0000      1.3
@@ -1,6 +1,6 @@
 Package: dlocate
 Version: 0.5
-Revision: 2
+Revision: 5
 License: GPL
 Maintainer: Ben Hines <[EMAIL PROTECTED]>
 Description: Fast alternative to dpkg -L and dpkg -S
@@ -8,16 +8,14 @@
 Source: mirror:debian:pool/main/d/%n/%n_%v-0.1.tar.gz
 SourceDirectory: %n-%v
 Source-MD5: e4cb6ee9c917e3b5f385fce8ed56a80f
+Patch: %n.patch
 PatchScript: <<
-  perl -pi -e 's|/usr/lib|%p/lib|' dlocate update-dlocatedb update-dpkg-list
-  perl -pi -e 's|/var|%p/var|' dlocate update-dlocatedb update-dpkg-list 
debian/cron.daily
-  perl -pi -e 's|/usr/bin|%p/bin|' dlocate
-  perl -pi -e 's|/usr/sbin|%p/sbin|' dlocate debian/cron.daily
-<<
-CompileScript:<<
-#!/bin/sh -ev
-echo None
+  perl -pi.bak -e 's|/usr/lib|%p/lib|' dlocate update-dlocatedb 
update-dpkg-list
+  perl -pi.bak -e 's|/var|%p/var|' dlocate update-dlocatedb update-dpkg-list 
debian/cron.daily
+  perl -pi.bak -e 's|/usr/bin|%p/bin|' dlocate
+  perl -pi.bak -e 's|/usr/sbin|%p/sbin|' dlocate debian/cron.daily
 <<
+CompileScript: echo None
 InstallScript:<<
 mkdir -p %i/bin
 mkdir -p %i/sbin
@@ -38,32 +36,37 @@
  options to view all files in a package, calculate disk space used, view
  and check md5sums, list man pages, etc.
 <<
+DescPort: <<
+  dmacks:
+    Remember to quote dlocate args when passing to locate.
+
+    Pass "--" (getopt end-of-flags flag) when passing dlocate
+    args to locate in case in case the args begin with -
+
+    Gracefully handle multiple slashes in -S mode
+<<
 DescUsage: <<
 Adds a cron.daily script, used to update the locate daily as part of your
 cron tasks.
 <<
 Homepage: http://packages.debian.org/unstable/utils/dlocate.html
 PostInstScript: <<
-set -e
 case "$1" in
     configure)
                 # generate initial dlocate database
                 mkdir -p %p/var/lib/dlocate
                 %p/sbin/update-dlocatedb >/dev/null 2>&1 &
                 # generate initial 'dpkg -l' file
-                LINES=40 COLUMNS=200 dpkg -l "*" | sed -e '1,5d' -e 's/  */ 
/g' >%p/var/lib/dlocate/dpkg-list
+                LINES=40 COLUMNS=200 %p/bin/dpkg -l "*" | sed -e '1,5d' -e 's/ 
 */ /g' >%p/var/lib/dlocate/dpkg-list
     ;;
     abort-upgrade|abort-remove|abort-deconfigure)
     ;;
     *)
         echo "postinst called with unknown argument \`$1'" >&2
-        exit 0
     ;;
 esac
-exit 0
 <<
 PostRmScript: <<
-#!/bin/sh
 if [ "$1" = "purge" ]; then
         rm -f %p/var/lib/dlocate/*
         rmdir %p/var/lib/dlocate/

--- NEW FILE: dlocate.patch ---
diff -Nurd -x'*~' dlocate-0.5.orig/dlocate dlocate-0.5/dlocate
--- dlocate-0.5.orig/dlocate    2002-03-10 07:36:31.000000000 -0500
+++ dlocate-0.5/dlocate 2006-05-19 13:25:55.000000000 -0400
@@ -87,7 +87,8 @@
                fi
                ;;
        "-S")
-               $LOCATE -d $DLOCATEDB $PKG | grep ":.*$PKG.*"
+               FILES=`echo $PKG | sed 's|//*|/|g'`
+               $LOCATE -d $DLOCATEDB -- "$FILES" | grep ":.*$FILES.*"
                ;;
        "-s")
                if [ -e $DPKG_INFO/$PKG.list ] ; then 
@@ -150,7 +151,7 @@
                fi
                ;;
        *)
-               $LOCATE -d $DLOCATEDB "$PKG"
+               $LOCATE -d $DLOCATEDB -- "$PKG"
                ;;
 esac
 


-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to