r12016 - in /image-size/trunk: debian/ debian/changelog debian/compat debian/control debian/copyright debian/rules debian/watch imgsize
myon at users.alioth.debian.org
myon at users.alioth.debian.org
Fri Jan 4 21:28:59 UTC 2008
Author: myon
Date: Fri Jan 4 21:28:59 2008
New Revision: 12016
URL: http://svn.debian.org/wsvn/?sc=1&rev=12016
Log:
[svn-inject] Applying Debian modifications to trunk
Added:
image-size/trunk/debian/
image-size/trunk/debian/changelog
image-size/trunk/debian/compat
image-size/trunk/debian/control
image-size/trunk/debian/copyright
image-size/trunk/debian/rules (with props)
image-size/trunk/debian/watch
Modified:
image-size/trunk/imgsize
Added: image-size/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/image-size/trunk/debian/changelog?rev=12016&op=file
==============================================================================
--- image-size/trunk/debian/changelog (added)
+++ image-size/trunk/debian/changelog Fri Jan 4 21:28:59 2008
@@ -1,0 +1,107 @@
+image-size (3.1-2) unstable; urgency=low
+
+ * New upstream release.
+ * dpkg thinks 3.01 == 3.1, working around.
+
+ -- Christoph Berg <myon at debian.org> Wed, 17 Oct 2007 10:52:21 +0200
+
+image-size (3.01-1) unstable; urgency=low
+
+ * New upstream release.
+ * Uses libmodule-build-perl.
+ * Install example script.
+
+ -- Christoph Berg <myon at debian.org> Wed, 22 Nov 2006 12:58:21 +0100
+
+image-size (3.0-1) unstable; urgency=low
+
+ * New upstream release.
+ + Implements a (different) fix for #104597, see the new
+ Image::Size::GIF_BEHAVIOR option.
+ + Requires libcompress-zlib-perl to build.
+ * Move debhelper to Build-Depends.
+ * Bump Standards-Version.
+
+ -- Christoph Berg <myon at debian.org> Thu, 15 Jun 2006 20:43:01 +0200
+
+image-size (2.992-2) unstable; urgency=low
+
+ * Priority: optional.
+ * Cleaned up debian/rules (thanks to Marc Brockschmidt).
+ * Escape latin1 char in pod.
+ * Bump Standards-Version.
+
+ -- Christoph Berg <myon at debian.org> Wed, 14 Sep 2005 20:21:56 +0200
+
+image-size (2.992-1) unstable; urgency=low
+
+ * New upstream version.
+ * imgsize:
+ + Do safe sprintf call in imgsize (Closes: #191844).
+ + Exit 1 on error.
+ * New maintainer (Closes: #279771).
+ * Move to section perl.
+ * Bump standards version.
+
+ -- Christoph Berg <cb at df7cb.de> Sat, 6 Nov 2004 17:47:34 +0100
+
+image-size (2.990-1) unstable; urgency=low
+
+ * New upstream version.
+ * Make Image::Size::gifsize pay attention to the frame size as well as
+ the size tag associated with the first image in the GIF file,
+ Closes: #104597
+
+ -- Stephen Zander <gibreel at debian.org> Tue, 13 Aug 2002 13:57:46 -0700
+
+image-size (2.930-1) unstable; urgency=low
+
+ * New upstream source
+ * Updated for policy 3.5.1 and the new perl packaging policy
+
+ -- Stephen Zander <gibreel at debian.org> Tue, 24 Apr 2001 23:36:07 -0700
+
+image-size (2.910-1) unstable; urgency=low
+
+ * New upstream source.
+ * Package now policy compliant, Closes: #75503
+
+ -- Stephen Zander <gibreel at debian.org> Tue, 12 Dec 2000 19:24:06 -0800
+
+image-size (2.903-1) unstable; urgency=low
+
+ * Nwe upstream source.
+
+ -- Stephen Zander <gibreel at debian.org> Wed, 20 Sep 2000 18:08:40 -0700
+
+image-size (2.901-1) unstable; urgency=low
+
+ * New maintainer.
+ * New upstream source.
+
+ -- Stephen Zander <gibreel at debian.org> Wed, 18 Aug 1999 23:56:11 -0700
+
+image-size (2.7-2.1) unstable; urgency=low
+
+ * NMU for the perl upgrade. Closes: #41529
+ * Corrected the rules files to conform to perl policy 1.0.1
+ * Upgraded standards-version to 2.5.1
+ * Corrected the location of licenses in copyright file.
+
+ -- Raphael Hertzog <rhertzog at hrnet.fr> Mon, 19 Jul 1999 20:35:19 +0200
+
+image-size (2.7-2) unstable; urgency=low
+
+ * Whoops, there were some extra files lying around the package, and
+ I was building it in the binary-arch instead of the binary-indep
+ target of debian/rules. Fixed.
+
+ -- Ben Gertzfield <che at debian.org> Fri, 23 Oct 1998 13:22:12 -0700
+
+image-size (2.7-1) unstable; urgency=low
+
+ * Initial release.
+
+ -- Ben Gertzfield <che at debian.org> Fri, 23 Oct 1998 12:56:29 -0700
+
+
Added: image-size/trunk/debian/compat
URL: http://svn.debian.org/wsvn/image-size/trunk/debian/compat?rev=12016&op=file
==============================================================================
--- image-size/trunk/debian/compat (added)
+++ image-size/trunk/debian/compat Fri Jan 4 21:28:59 2008
@@ -1,0 +1,1 @@
+4
Added: image-size/trunk/debian/control
URL: http://svn.debian.org/wsvn/image-size/trunk/debian/control?rev=12016&op=file
==============================================================================
--- image-size/trunk/debian/control (added)
+++ image-size/trunk/debian/control Fri Jan 4 21:28:59 2008
@@ -1,0 +1,22 @@
+Source: image-size
+Section: perl
+Priority: optional
+Maintainer: Christoph Berg <myon at debian.org>
+Standards-Version: 3.7.2
+Build-Depends: debhelper (>> 4.1)
+Build-Depends-Indep: perl (>> 5.6.1), libmodule-build-perl, libcompress-zlib-perl
+
+Package: libimage-size-perl
+Architecture: all
+Depends: ${perl:Depends}, ${misc:Depends}
+Description: determine the size of images in several common formats
+ Image::Size is a library based on the image-sizing code in the wwwimagesize
+ script, a tool that analyzes HTML files and adds HEIGHT and WIDTH tags to IMG
+ directives. Image::Size has generalized that code to return a raw (X, Y) pair,
+ and included wrappers to pre-format that output into either HTML or a set of
+ attribute pairs suitable for the CGI.pm library by Lincoln Stein. Currently,
+ Image::Size can size images in XPM, XBM, GIF, JPEG, PNG, MNG, TIFF, the PPM
+ family of formats (PPM/PGM/PBM), FlashMX (Shockwave Flash ver. 6), and if
+ Image::Magick is installed, the formats supported by it. The "imgsize" program
+ included provides access to Image::Size from shell scripts.
+
Added: image-size/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/image-size/trunk/debian/copyright?rev=12016&op=file
==============================================================================
--- image-size/trunk/debian/copyright (added)
+++ image-size/trunk/debian/copyright Fri Jan 4 21:28:59 2008
@@ -1,0 +1,24 @@
+This is the Debian GNU/Linux package of the Image::Size Perl module,
+debianized by Ben Gertzfield <che at debian.org> in 1998.
+
+The current version was downloaded from
+http://search.cpan.org/~rjray/
+
+From Size.pm:
+
+ This file copyright (c) 2000, 2007 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).
+
+The full text of the Artistic Licence is available on Debian systems in
+/usr/share/common-licenses/Artistic.
+
+The full text of the GNU LGPL is available on Debian systems in
+/usr/share/common-licenses/LGPL.
+
+This package has been through multiple maintainers.
+Debian specific changes are copyright
+(c) 2000-2002, Stephen Zander <gibreel at debian.org>
+(c) 2004, 2006 Christoph Berg <myon at debian.org>
Added: image-size/trunk/debian/rules
URL: http://svn.debian.org/wsvn/image-size/trunk/debian/rules?rev=12016&op=file
==============================================================================
--- image-size/trunk/debian/rules (added)
+++ image-size/trunk/debian/rules Fri Jan 4 21:28:59 2008
@@ -1,0 +1,47 @@
+#! /usr/bin/make -f
+
+PERL ?= /usr/bin/perl
+
+package := $(firstword $(shell dh_listpackages))
+TMP := $(CURDIR)/debian/$(package)/
+
+build: build-stamp
+build-stamp:
+ dh_testdir
+ $(PERL) Makefile.PL installdirs=vendor destdir=$(TMP)
+ $(MAKE)
+ touch $@
+
+clean:
+ dh_testdir
+ -$(MAKE) distclean
+ rm -f build-stamp Makefile
+ dh_clean
+
+binary-indep: build
+ dh_testdir
+ dh_testroot
+ dh_clean
+ dh_installdirs
+
+ $(MAKE) test
+
+ $(MAKE) install
+
+ dh_installdocs README
+ dh_installchangelogs ChangeLog
+ dh_installexamples ex/*
+
+ dh_compress
+ dh_fixperms
+ dh_perl
+ dh_installdeb
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary-arch:
+
+binary: binary-indep binary-arch
+
+.PHONY: binary binary-arch binary-indep clean build
Propchange: image-size/trunk/debian/rules
------------------------------------------------------------------------------
svn:executable = *
Added: image-size/trunk/debian/watch
URL: http://svn.debian.org/wsvn/image-size/trunk/debian/watch?rev=12016&op=file
==============================================================================
--- image-size/trunk/debian/watch (added)
+++ image-size/trunk/debian/watch Fri Jan 4 21:28:59 2008
@@ -1,0 +1,2 @@
+version=2
+http://www.cpan.org/modules/by-module/Image/Image-Size-(.*).tar.gz debian
Modified: image-size/trunk/imgsize
URL: http://svn.debian.org/wsvn/image-size/trunk/imgsize?rev=12016&op=diff
==============================================================================
--- image-size/trunk/imgsize (original)
+++ image-size/trunk/imgsize Fri Jan 4 21:28:59 2008
@@ -21,7 +21,7 @@
=head1 OPTIONS
By default, the width and height are returned as attributes for an IMG tag
-in HTML, essentially "C<WIDTH=40 HEIGHT=30>". The following options may be
+in HTML, essentially C<width="40" height="30">. The following options may be
used to return alternate formats (all report width first, then height):
=over
@@ -72,7 +72,7 @@
if ($opt_h || (! @ARGV) || (($opt_a && $opt_r) || ($opt_a && $opt_f) ||
($opt_r && $opt_f)));
-$rtn = \&html_imgsize;
+$rtn = \&return_html;
$opt_a &&
($rtn = \&return_attr);
$opt_r &&
@@ -80,11 +80,13 @@
$opt_f &&
($rtn = \&return_fmt);
+my $error = 0;
+
if (@ARGV > 1)
{
foreach (@ARGV)
{
- print STDOUT sprintf("$_: %s\n", &$rtn($_));
+ print STDOUT sprintf("%s: %s\n", $_, &$rtn($_));
}
}
else
@@ -92,7 +94,7 @@
print STDOUT sprintf("%s\n", &$rtn($ARGV[0]));
}
-exit;
+exit $error;
#
# Note the doubled calls here. This is just a quick, semi-clean attempt at
@@ -100,24 +102,31 @@
# the Image::Size package.
#
+sub return_html
+{
+ my ($html) = html_imgsize($_[0]);
+
+ (defined $html) ? $html : ($error = 1 and "error");
+}
+
sub return_attr
{
my ($width, $height, $err) = imgsize($_[0]);
(defined $width) ?
- "(-width => $width, -height => $height)" : "error: $err";
+ "(-width => $width, -height => $height)" : ($error = 1 and "error: $err");
}
sub return_imgsize
{
my ($width, $height, $err) = imgsize($_[0]);
- (defined $width) ? "$width $height" : "error: $err";
+ (defined $width) ? "$width $height" : ($error = 1 and "error: $err");
}
sub return_fmt
{
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");
}
More information about the Pkg-perl-cvs-commits
mailing list