CVS debian/patches

[CVS User tbm]

Update of /cvsroot/pkg-bins/debian/patches
In directory haydn:/tmp/cvs-serv29198/patches

Modified Files:
	00list 
Added Files:
	11_bins.dpatch 
Log Message:
Actually commit 1.1.27-2 to CVS


--- /cvsroot/pkg-bins/debian/patches/00list	2005/01/02 22:02:23	1.7
+++ /cvsroot/pkg-bins/debian/patches/00list	2005/08/04 23:15:17	1.8
@@ -3,3 +3,4 @@
 06_doc_bins.sgml
 08_bins
 10_bins
+11_bins.dpatch

--- /cvsroot/pkg-bins/debian/patches/11_bins.dpatch	2005/08/04 23:15:17	NONE
+++ /cvsroot/pkg-bins/debian/patches/11_bins.dpatch	2005/08/04 23:15:17	1.1
#!/bin/sh -e
## bins by Ludovic Rousseau <rousseau at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: fixes bug #295716 "consider path/a-b to a subdir of path/a"

if [ $# -lt 1 ]; then
    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
    exit 1
fi

[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"

case "$1" in
       -patch) patch $patch_opts -p0 < $0;;
       -unpatch) patch $patch_opts -p0 -R < $0;;
        *)
                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
                exit 1;;
esac

exit 0

@DPATCH@
--- /usr/bin/bins	2005-01-02 22:24:38.000000000 +0100
+++ bins	2005-02-18 10:49:10.000000000 +0100
@@ -1058,7 +1058,7 @@
     #print "albumdir: $albumdir $albumdir2\n";
 
     die "albumdir_dir ($albumdir) can't be a subdirectory of picdir_dir ($picdir)"
-      if ($albumdir2 =~ m/$picdir2/);
+      if ($albumdir2 =~ m/^$picdir2\//);
   }
 
   $picdir = File::Spec->rel2abs(File::Spec->canonpath($picdir));