CVS debian/patches

[CVS User rousseau]

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

Modified Files:
	00list 
Added Files:
	09_bins.dpatch 
Log Message:
09_bins.dpatch: correct bug "perl warnings with -e custum and
subalbums".  Closes: #269511. Thanks to Adam Lackorzynski for the patch


--- /cvsroot/pkg-bins/debian/patches/00list	2004/08/28 10:54:22	1.5
+++ /cvsroot/pkg-bins/debian/patches/00list	2004/09/12 13:55:49	1.6
@@ -6,3 +6,4 @@
 06_doc_bins.sgml
 07_bins
 08_bins
+09_bins

--- /cvsroot/pkg-bins/debian/patches/09_bins.dpatch	2004/09/12 13:55:49	NONE
+++ /cvsroot/pkg-bins/debian/patches/09_bins.dpatch	2004/09/12 13:55:49	1.1
#!/bin/sh -e
## bins by Ludovic Rousseau <rousseau@acer.maison.bogus>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: fixes bug #269511 perl warnings with -e custum and subalbums

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@
--- bins	2004-09-12 15:27:56.000000000 +0200
+++ bins	2004-09-12 15:43:06.000000000 +0200
@@ -2011,10 +2011,10 @@
 	}
 	if ($genEditableAlbum) {
 	  $tablesubs{TITLE} = "<a href=\"file://";
-	  if ($imageInfo{descFileName} =~ "^[^/]"){
+	  if ($albumHash{descFileName} =~ m/^[^\/]/){
 	    $tablesubs{TITLE} .= $pwd."/";
 	  }
-	  $tablesubs{TITLE} .= $imageInfo{descFileName}."\">".
+	  $tablesubs{TITLE} .= $albumHash{descFileName}."\">".
 	    $imageInfo{title}."</a>";
 	} else {
 	  $tablesubs{TITLE} = $imageInfo{title};
@@ -2912,7 +2912,7 @@
 	} elsif ($imageSource eq "orig") { #not yet implemented
 	} elsif ($imageSource eq "custom") {
 	  # gets size in KB
-	  my $fileSize = ((-s "$picdir$crntImage") / 1024);
+	  my $fileSize = ((-s "$picdir$album$crntImage") / 1024);
 	  beVerboseN("  Size is $fileSize KB.", 3);
 	  if ($fileSize > 900) {
 	    beVerbose("Image $crntImage is BIG, resizing...", 3);