r17970 - in /trunk/image-size/debian: changelog patches/imgsize-fixes

[gregoa-guest at users.alioth.debian.org]

Author: gregoa-guest
Date: Wed Mar 26 17:12:11 2008
New Revision: 17970

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=17970
Log:
Update patch imgsize-fixes to make it compatbile to the new enabled
warnings; based on a patch from Reid Priedhorsky, thanks!
Closes: #472760

Modified:
    trunk/image-size/debian/changelog
    trunk/image-size/debian/patches/imgsize-fixes

Modified: trunk/image-size/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/image-size/debian/changelog?rev=17970&op=diff
==============================================================================
--- trunk/image-size/debian/changelog (original)
+++ trunk/image-size/debian/changelog Wed Mar 26 17:12:11 2008
@@ -1,3 +1,11 @@
+image-size (3.1.1-2) UNRELEASED; urgency=low
+
+  * Update patch imgsize-fixes to make it compatbile to the new enabled
+    warnings; based on a patch from Reid Priedhorsky, thanks!
+    Closes: #472760
+
+ -- gregor herrmann <gregor+debian at comodo.priv.at>  Wed, 26 Mar 2008 17:57:00 +0100
+
 image-size (3.1.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/image-size/debian/patches/imgsize-fixes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/image-size/debian/patches/imgsize-fixes?rev=17970&op=diff
==============================================================================
--- trunk/image-size/debian/patches/imgsize-fixes (original)
+++ trunk/image-size/debian/patches/imgsize-fixes Wed Mar 26 17:12:11 2008
@@ -50,7 +50,7 @@
 +{
 +    my ($html) = html_imgsize($_[0]);
 +
-+    (defined $html) ? $html : ($error = 1 and "error");
++    (defined $html) ? $html : ("error", $error = 1);
 +}
 +
  sub return_attr
@@ -59,7 +59,7 @@
  
      (defined $width) ?
 -        "(-width => $width, -height => $height)" : "error: $err";
-+        "(-width => $width, -height => $height)" : ($error = 1 and "error: $err");
++        "(-width => $width, -height => $height)" : ("error: $err", $error = 1);
  }
  
  sub return_imgsize
@@ -67,7 +67,7 @@
      my ($width, $height, $err) = imgsize($_[0]);
  
 -    (defined $width) ? "$width $height" : "error: $err";
-+    (defined $width) ? "$width $height" : ($error = 1 and "error: $err");
++    (defined $width) ? "$width $height" : ("error: $err", $error = 1);
  }
  
  sub return_fmt
@@ -75,5 +75,5 @@
      my ($width, $height, $err) = imgsize($_[0]);
  
 -    (defined $width) ? sprintf($opt_f, $width, $height, $err) : "error: $err";
-+    (defined $width) ? sprintf($opt_f, $width, $height, $err) : ($error = 1 and "error: $err");
++    (defined $width) ? sprintf($opt_f, $width, $height, $err) : ("error: $err", $error = 1);
  }