r15213 - in /branches/upstream/image-size/current: Build.PL ChangeLog MANIFEST META.yml Makefile.PL README SIGNATURE imgsize lib/Image/Size.pm

gregoa-guest at users.alioth.debian.org gregoa-guest at users.alioth.debian.org
Wed Feb 20 17:44:33 UTC 2008


Author: gregoa-guest
Date: Wed Feb 20 17:44:32 2008
New Revision: 15213

URL: http://svn.debian.org/wsvn/?sc=1&rev=15213
Log:
[svn-upgrade] Integrating new upstream version, image-size (3.1.1)

Modified:
    branches/upstream/image-size/current/Build.PL
    branches/upstream/image-size/current/ChangeLog
    branches/upstream/image-size/current/MANIFEST
    branches/upstream/image-size/current/META.yml
    branches/upstream/image-size/current/Makefile.PL
    branches/upstream/image-size/current/README
    branches/upstream/image-size/current/SIGNATURE
    branches/upstream/image-size/current/imgsize
    branches/upstream/image-size/current/lib/Image/Size.pm

Modified: branches/upstream/image-size/current/Build.PL
URL: http://svn.debian.org/wsvn/branches/upstream/image-size/current/Build.PL?rev=15213&op=diff
==============================================================================
--- branches/upstream/image-size/current/Build.PL (original)
+++ branches/upstream/image-size/current/Build.PL Wed Feb 20 17:44:32 2008
@@ -5,13 +5,16 @@
 my $build = Module::Build->new(
     module_name       => 'Image::Size',
     autosplit         => 'lib/Image/Size.pm',
-    license           => 'artistic',
-    requires          => { perl => '5.6.0',
-                           File::Spec => 0 },
+    license           => 'perl',
+    requires          => { perl => '5.006',
+                           File::Spec => 0, Compress::Zlib => 2 },
     build_requires    => { Test::More => 0 },
+    build_recommends  => { Image::Magick => 6 },
+    # This *should* be "build_recommends", since it is only for the tests
+    recommends        => { Test::Pod => 0, Test::Pod::Coverage => 0 },
     dist_author       => 'Randy J. Ray <rjray at blackperl.com>',
     dist_abstract     => 'A library to extract height/width from images',
-    dist_version_from => 'lib/Image/Size.pm',
+    dist_version      => '3.1.1',
     script_files      => [ 'imgsize' ],
     sign              => 'yes, please',
 );

Modified: branches/upstream/image-size/current/ChangeLog
URL: http://svn.debian.org/wsvn/branches/upstream/image-size/current/ChangeLog?rev=15213&op=diff
==============================================================================
--- branches/upstream/image-size/current/ChangeLog (original)
+++ branches/upstream/image-size/current/ChangeLog Wed Feb 20 17:44:32 2008
@@ -1,4 +1,20 @@
 CHANGE HISTORY
+
+Changes in 3.1.1:
+
+* Updated the license information to make sure all references are to both the
+  Artistic 2.0 and the LGPL.
+
+* Changed "use 5.6.0" lines to no longer use v-strings, for forward
+  compatibility with Perl 5.10.0.
+
+* Added "recommends" specification to Build.PL to refer to modules used in
+  the testing phase (there is no "build_recommends" setting).
+
+* Added Compress::Zlib to the list of required modules in Makefile.PL and
+  Build.PL.
+
+* Added "use warnings" to Size.pm to make sure it stays warnings-clean.
 
 Changes in 3.1:
 

Modified: branches/upstream/image-size/current/MANIFEST
URL: http://svn.debian.org/wsvn/branches/upstream/image-size/current/MANIFEST?rev=15213&op=diff
==============================================================================
--- branches/upstream/image-size/current/MANIFEST (original)
+++ branches/upstream/image-size/current/MANIFEST Wed Feb 20 17:44:32 2008
@@ -26,5 +26,5 @@
 t/yasp.swf
 t/468x60.psd
 t/8.swf
-META.yml                                 Module meta-data (added by MakeMaker)
-SIGNATURE                                Public-key signature (added by MakeMaker)
+META.yml
+SIGNATURE    Added here by Module::Build

Modified: branches/upstream/image-size/current/META.yml
URL: http://svn.debian.org/wsvn/branches/upstream/image-size/current/META.yml?rev=15213&op=diff
==============================================================================
--- branches/upstream/image-size/current/META.yml (original)
+++ branches/upstream/image-size/current/META.yml Wed Feb 20 17:44:32 2008
@@ -1,15 +1,26 @@
---- #YAML:1.0
-name:                Image-Size
-version:             3.1
-abstract:            A library to extract height/width from images
-license:             perl
-generated_by:        ExtUtils::MakeMaker version 6.36
-distribution_type:   module
-requires:     
-    File::Spec:                    0
-    Test::More:                    0
+---
+name: Image-Size
+version: 3.1.1
+author:
+  - 'Randy J. Ray <rjray at blackperl.com>'
+abstract: A library to extract height/width from images
+license: perl
+resources:
+  license: http://dev.perl.org/licenses/
+requires:
+  Compress::Zlib: 2
+  File::Spec: 0
+  perl: 5.006
+build_requires:
+  Test::More: 0
+recommends:
+  Test::Pod: 0
+  Test::Pod::Coverage: 0
+provides:
+  Image::Size:
+    file: lib/Image/Size.pm
+    version: 3.100001
+generated_by: Module::Build version 0.2808
 meta-spec:
-    url:     http://module-build.sourceforge.net/META-spec-v1.2.html
-    version: 1.2
-author:
-    - Randy J. Ray (rjray at blackperl.com)
+  url: http://module-build.sourceforge.net/META-spec-v1.2.html
+  version: 1.2

Modified: branches/upstream/image-size/current/Makefile.PL
URL: http://svn.debian.org/wsvn/branches/upstream/image-size/current/Makefile.PL?rev=15213&op=diff
==============================================================================
--- branches/upstream/image-size/current/Makefile.PL (original)
+++ branches/upstream/image-size/current/Makefile.PL Wed Feb 20 17:44:32 2008
@@ -1,18 +1,18 @@
-# $Id: Makefile.PL 130 2007-10-04 10:49:12Z  $
+# $Id: Makefile.PL 133 2008-02-18 06:34:47Z  $
+require 5.006;
 use ExtUtils::MakeMaker;
-use Cwd 'cwd';
-
-$cwd = cwd;
 
 WriteMakefile(NAME         => 'Image::Size',
               ($] >= 5.005 ?
                (ABSTRACT   => 'A library to extract height/width from images',
                 AUTHOR     => 'Randy J. Ray (rjray at blackperl.com)') : ()),
               dist         => { COMPRESS => 'gzip -9f', SUFFIX => 'gz' },
-              PREREQ_PM    => { File::Spec => 0, Test::More => 0, },
+              PREREQ_PM    => { File::Spec => 0, Test::More => 0,
+                                Compress::Zlib => 2 },
               EXE_FILES    => ['imgsize'],
+              PL_FILES     => {},
               clean        => { FILES =>
                                 'Image-Size-* *.spec *.rpm rpmrc rpmmacro' },
-              VERSION_FROM => 'lib/Image/Size.pm',
+              VERSION      => '3.1.1',
               LICENSE      => 'perl',
               SIGN         => 'here, please');

Modified: branches/upstream/image-size/current/README
URL: http://svn.debian.org/wsvn/branches/upstream/image-size/current/README?rev=15213&op=diff
==============================================================================
--- branches/upstream/image-size/current/README (original)
+++ branches/upstream/image-size/current/README Wed Feb 20 17:44:32 2008
@@ -1,6 +1,6 @@
 Image::Size - Determine the size of images in several common formats
 
-Version: 3.1 (See CHANGES below)
+Version: 3.1.1 (See CHANGES below)
 
 WHAT IS IT
 
@@ -82,13 +82,17 @@
 
 CHANGES
 
-Small change from n at shaplov.ru for a bug in CWS handling that only surfaced
-when two CWS files were sized consecutively.
+Updated the license information to make sure all references are to both the
+Artistic 2.0 and the LGPL.
 
-Updated the date on the copyright notice and added a "COPYRIGHT" section
-to the documentation.
+Changed "use 5.6.0" lines to no longer use v-strings, for forward
+compatibility with Perl 5.10.0.
 
-Changed the licensing terms. This is now dual-licensed under Artistic 2.0
-and LGPL 2.1.
+Added "recommends" specification to Build.PL to refer to modules used in
+the testing phase (there is no "build_recommends" setting).
 
-Restored the old Makefile.PL for users who don't have Module::Build.
+Added Compress::Zlib to the list of required modules in Makefile.PL and
+Build.PL.
+
+Added "use warnings" to Size.pm to make sure it stays warnings-clean.
+

Modified: branches/upstream/image-size/current/SIGNATURE
URL: http://svn.debian.org/wsvn/branches/upstream/image-size/current/SIGNATURE?rev=15213&op=diff
==============================================================================
--- branches/upstream/image-size/current/SIGNATURE (original)
+++ branches/upstream/image-size/current/SIGNATURE Wed Feb 20 17:44:32 2008
@@ -14,17 +14,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-SHA1 1805be10754316156dd852f1dfcac2050fcec0ca Build.PL
-SHA1 63ddfeccdc89c25d29df5d67c8d79eb9db81839d ChangeLog
-SHA1 34b320e40e777e3f2a9dd510795cb92c58b3bf72 MANIFEST
+SHA1 4c8390cdca0c911e334b2ecc2ef681d0ed1b33fd Build.PL
+SHA1 7d312a08f6bf11784e60a826b26f75caf11a7d79 ChangeLog
+SHA1 7453996fad5f41d26658a5ee1a0174f4eab2411b MANIFEST
 SHA1 548725eceb701a43211abf9e6ca7d009a770b6ce MANIFEST.SKIP
-SHA1 e299a6afa02934fa0a8504ed062cb1858d1a3c73 META.yml
-SHA1 952e7275b63f607ce964ee92c23b0a1a6884f84f Makefile.PL
-SHA1 b3e99c3c18b787c52170cef544517e7f4c5ff1fa README
+SHA1 90004fe55efdf271f7bc702323152973de627740 META.yml
+SHA1 a6b8e4c86f889ea884080060bb9b00c651a052a3 Makefile.PL
+SHA1 6fe0433810999b766a061be6025a5cb6c809ab33 README
 SHA1 07825dcd35e70ec57c59905b39aeb9697055ed64 README.Win32
 SHA1 35e9fb37ea0fa935a5c4443947a1a2f8bfda7e2e ex/make_gallery.pl
-SHA1 e82284dd3c12a75f2b7cddb618b291cf539c6315 imgsize
-SHA1 c8560bcc355ff7b37672c6c108e238db1a59285b lib/Image/Size.pm
+SHA1 f4db1e2a0fdac3ab5eacddfeee6463ac9f41a275 imgsize
+SHA1 993b9b998ba0cdbeb3f875418aeb7423947a9b58 lib/Image/Size.pm
 SHA1 e8cbb92589ecb68c8f03eae2ce497974752f21cc t/00_signature.t
 SHA1 2ee82029c10fe46c29f6d78af599d4255e6cd315 t/468x60.psd
 SHA1 92b2187605fc572527b5b87084487f1bd49c1d8a t/8.swf
@@ -46,7 +46,7 @@
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFHBMax3Cp33jjp81URAjN3AJ9aavzoGR3GdsX1/+wrF7Gxs4/uVwCfad4S
-3ZW8vstDCt9cd+62bQTjb5E=
-=uUHE
+iD8DBQFHuSdl3Cp33jjp81URAvSMAJsGyVVUwoA4MisltlODeAk1tK6G5gCcCBW2
+1mm3HiuQowOWHKSFv25d6LY=
+=YFLC
 -----END PGP SIGNATURE-----

Modified: branches/upstream/image-size/current/imgsize
URL: http://svn.debian.org/wsvn/branches/upstream/image-size/current/imgsize?rev=15213&op=diff
==============================================================================
--- branches/upstream/image-size/current/imgsize (original)
+++ branches/upstream/image-size/current/imgsize Wed Feb 20 17:44:32 2008
@@ -1,5 +1,16 @@
 #!/usr/bin/perl
 
+###############################################################################
+#
+# This file copyright (c) 2008 by Randy J. Ray, all rights reserved
+#
+# Copying and distribution are permitted under the terms of the Artistic
+# License 2.0 (http://www.opensource.org/licenses/artistic-license-2.0.php) or
+# the GNU LGPL (http://www.opensource.org/licenses/lgpl-license.php).
+#
+# $Id: imgsize 133 2008-02-18 06:34:47Z  $
+#
+###############################################################################
 #
 # No-brainer to size an image supplied on the command-line. All the real
 # work is done in Image::Size
@@ -56,6 +67,7 @@
 =cut
 
 use strict;
+use warnings;
 use vars qw($opt_h $opt_r $opt_a $opt_f);
 
 use Image::Size qw(:all);
@@ -63,7 +75,7 @@
 
 my $rtn;
 
-&getopts('hraf:');
+getopts('hraf:');
 
 #
 # Usage reporting: if -h, or no @ARGV, or more than one of the rest...

Modified: branches/upstream/image-size/current/lib/Image/Size.pm
URL: http://svn.debian.org/wsvn/branches/upstream/image-size/current/lib/Image/Size.pm?rev=15213&op=diff
==============================================================================
--- branches/upstream/image-size/current/lib/Image/Size.pm (original)
+++ branches/upstream/image-size/current/lib/Image/Size.pm Wed Feb 20 17:44:32 2008
@@ -1,12 +1,12 @@
 ###############################################################################
 #
-# This file copyright (c) 2007 by Randy J. Ray, all rights reserved
+# This file copyright (c) 2008 by Randy J. Ray, all rights reserved
 #
 # Copying and distribution are permitted under the terms of the Artistic
 # License 2.0 (http://www.opensource.org/licenses/artistic-license-2.0.php) or
 # the GNU LGPL (http://www.opensource.org/licenses/lgpl-license.php).
 #
-# $Id: Size.pm 129 2007-10-04 10:37:59Z  $
+# $Id: Size.pm 133 2008-02-18 06:34:47Z  $
 #
 ###############################################################################
 #
@@ -20,9 +20,10 @@
 
 package Image::Size;
 
-require 5.6.0;
+require 5.006;
 
 use strict;
+use warnings;
 use bytes;
 use Cwd ();
 use File::Spec ();
@@ -42,7 +43,7 @@
                       $GIF_BEHAVIOR);
     %EXPORT_TAGS = ('all' => [ @EXPORT_OK ]);
 
-    $VERSION = "3.1";
+    $VERSION = "3.100001";
 
     # Default behavior for GIFs is to return the "screen" size
     $GIF_BEHAVIOR = 0;




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