[SCM] Debian packaging of libimage-size-perl branch, master, updated. 843c0c24ddead24b77344e3aba2a6649b09352a6

gregor herrmann gregoa at debian.org
Fri Jun 8 19:55:16 UTC 2012


The following commit has been merged in the master branch:
commit 6f1e47e44b4404b9fb4085ab77389daf064efe2b
Author: gregor herrmann <gregoa at debian.org>
Date:   Fri Jun 8 21:51:16 2012 +0200

    Refresh patches.

diff --git a/debian/patches/fix-pod-spelling.patch b/debian/patches/fix-pod-spelling.patch
index bbe6719..b83fc04 100644
--- a/debian/patches/fix-pod-spelling.patch
+++ b/debian/patches/fix-pod-spelling.patch
@@ -1,10 +1,13 @@
 Description: fix POD spelling errors
-Author: Jonathan Yu <jawnsy at cpan.org>
 Origin: vendor
 Forwarded: no
+Author: Jonathan Yu <jawnsy at cpan.org>
+Reviewed-by: gregor herrmann <gregoa at debian.org>
+Last-Update: 2012-06-08
+
 --- a/lib/Image/Size.pm
 +++ b/lib/Image/Size.pm
-@@ -760,7 +760,7 @@
+@@ -1308,7 +1308,7 @@
  file handles and scalar references cannot be reliably transformed into a
  unique key for the table of cache data. Buffers could be cached using the
  MD5 module, and perhaps in the future I will make that an option. I do not,
diff --git a/debian/patches/imgsize-exit-code.patch b/debian/patches/imgsize-exit-code.patch
index 31a8248..6848c4f 100644
--- a/debian/patches/imgsize-exit-code.patch
+++ b/debian/patches/imgsize-exit-code.patch
@@ -1,8 +1,11 @@
 Description: exit with status code 0 on failure
-Author: Christoph Berg <myon at debian.org>
-Reviewed-by: Jonathan Yu <jawnsy at cpan.org>
 Origin: vendor
 Forwarded: no
+Author: Christoph Berg <myon at debian.org>
+Reviewed-by: Jonathan Yu <jawnsy at cpan.org>
+Reviewed-by: gregor herrmann <gregoa at debian.org>
+Last-Update: 2012-06-08
+
 --- a/imgsize
 +++ b/imgsize
 @@ -46,11 +46,13 @@
@@ -20,23 +23,25 @@ Forwarded: no
      }
  }
  else
-@@ -58,7 +60,14 @@
+@@ -58,7 +60,7 @@
      printf "%s\n", $rtn->($ARGV[0]);
  }
  
 -exit 0;
 +exit $error;
-+
-+sub return_html
-+{
-+    my ($html) = html_imgsize($_[0]);
-+
-+    (defined $html) ? $html : ("error", $error = 1);
-+}
  
- sub return_attr
+ sub return_html
  {
-@@ -67,7 +76,7 @@
+@@ -67,7 +69,7 @@
+     my ($width, $height, $err) = imgsize($file);
+ 
+     return (defined $width) ?
+-        qq(width="$width" height="$height") : "error: $err";
++        qq(width="$width" height="$height") : ("error: $err", $error = 1);
+ }
+ 
+ sub return_attr
+@@ -77,7 +79,7 @@
      my ($width, $height, $err) = imgsize($file);
  
      return (defined $width) ?
@@ -45,7 +50,7 @@ Forwarded: no
  }
  
  sub return_imgsize
-@@ -76,7 +85,7 @@
+@@ -86,7 +88,7 @@
  
      my ($width, $height, $err) = imgsize($file);
  
@@ -54,7 +59,7 @@ Forwarded: no
  }
  
  sub return_fmt
-@@ -86,7 +95,7 @@
+@@ -96,7 +98,7 @@
      my ($width, $height, $err) = imgsize($file);
  
      return (defined $width) ?
diff --git a/imgsize b/imgsize
index 3c27abd..66493d4 100755
--- a/imgsize
+++ b/imgsize
@@ -46,11 +46,13 @@ $opts{r} &&
 $opts{f} &&
     ($rtn = \&return_fmt);
 
+my $error = 0;
+
 if (@ARGV > 1)
 {
     foreach (@ARGV)
     {
-        printf "$_: %s\n", $rtn->($_);
+        print STDOUT sprintf("%s: %s\n", $_, $rtn->($_));
     }
 }
 else
@@ -58,7 +60,7 @@ else
     printf "%s\n", $rtn->($ARGV[0]);
 }
 
-exit 0;
+exit $error;
 
 sub return_html
 {
@@ -67,7 +69,7 @@ sub return_html
     my ($width, $height, $err) = imgsize($file);
 
     return (defined $width) ?
-        qq(width="$width" height="$height") : "error: $err";
+        qq(width="$width" height="$height") : ("error: $err", $error = 1);
 }
 
 sub return_attr
@@ -77,7 +79,7 @@ sub return_attr
     my ($width, $height, $err) = imgsize($file);
 
     return (defined $width) ?
-        "(-width => $width, -height => $height)" : "error: $err";
+        "(-width => $width, -height => $height)" : ("error: $err", $error = 1);
 }
 
 sub return_imgsize
@@ -86,7 +88,7 @@ sub return_imgsize
 
     my ($width, $height, $err) = imgsize($file);
 
-    return (defined $width) ? "$width $height" : "error: $err";
+    return (defined $width) ? "$width $height" : ("error: $err", $error = 1);
 }
 
 sub return_fmt
@@ -96,7 +98,7 @@ sub return_fmt
     my ($width, $height, $err) = imgsize($file);
 
     return (defined $width) ?
-        sprintf($opts{f}, $width, $height, $err) : "error: $err";
+        sprintf($opts{f}, $width, $height, $err) : ("error: $err", $error = 1);
 }
 
 __END__

-- 
Debian packaging of libimage-size-perl



More information about the Pkg-perl-cvs-commits mailing list