This is an automated email from the git hooks/post-receive script.
carnil pushed a commit to branch master
in repository libimage-info-perl.
commit 4ae8c72b733c9aef0f0e68177bc71c53d0a69da7
Author: Don Armstrong <d...@debian.org>
Date: Mon Mar 7 16:53:19 2005 -0800
Import Debian patch 1.16-2
---
README | 4 +-
debian/changelog | 8 +++
debian/control | 2 +-
debian/patches/01_ignore_thumbnail_data.diff | 23 +++++++
.../01_use_data_dumper_instead_of_data_dump.diff | 15 +++++
debian/patches/02_exif_e_link_fix.diff | 77 ++++++++++++++++++++++
debian/rules | 77 +++++++++++++---------
imgdump | 4 +-
lib/Image/Info/JPEG.pm | 18 ++---
lib/Image/Info/TIFF.pm | 2 +-
lib/Image/TIFF.pm | 2 +-
11 files changed, 184 insertions(+), 48 deletions(-)
diff --git a/README b/README
index 1ccdced..f999fea 100644
--- a/README
+++ b/README
@@ -31,9 +31,9 @@ it under the same terms as Perl itself.
The Exif code is written based on TsuruZoh Tachibanaya's "Description
of Exif file format" and Thierry Bousch's Python module 'exifdump.py'
- http://www.butaman.ne.jp/~tsuruzoh/Computer/Digicams/exif-e.html
+ http://park2.wakwak.com/~tsuruzoh/Computer/Digicams/exif-e.html
http://topo.math.u-psud.fr/~bousch/exifdump.py
The Exif standard is now also officially available:
- http://www.pima.net/standards/it10/PIMA15740/exif.htm
+ http://exif.org/specifications.html
diff --git a/debian/changelog b/debian/changelog
index 99728d5..a06c6a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libimage-info-perl (1.16-2) unstable; urgency=low
+
+ * Use Data::Dumper instead of Data::Dump (closes: #284001)
+ * Fix busted links to exif-e.html (closes: #27837)
+ * Don't bother to parse information in thumbnails if ilen is 0 (closes:
#281967)
+
+ -- Don Armstrong <d...@debian.org> Mon, 7 Mar 2005 16:53:19 -0800
+
libimage-info-perl (1.16-1) unstable; urgency=low
* New upstream release (closes: #174846)
diff --git a/debian/control b/debian/control
index dccdfd2..17ff58b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
Source: libimage-info-perl
-Maintainer: Don Armstrong <d...@donarmstrong.com>
+Maintainer: Don Armstrong <d...@debian.org>
Priority: optional
Section: perl
Build-Depends-Indep: debhelper (>= 4), perl (>= 5.6.0-17), libio-string-perl,
libimage-base-bundle-perl | libimage-xpm-perl, libimage-base-bundle-perl |
libimage-xbm-perl, libxml-simple-perl
diff --git a/debian/patches/01_ignore_thumbnail_data.diff
b/debian/patches/01_ignore_thumbnail_data.diff
new file mode 100644
index 0000000..a6fcbf4
--- /dev/null
+++ b/debian/patches/01_ignore_thumbnail_data.diff
@@ -0,0 +1,23 @@
+--- lib/Image/Info/JPEG.pm~ 2004-12-02 18:25:26.000000000 -0800
++++ lib/Image/Info/JPEG.pm 2005-03-04 14:18:58.000000000 -0800
+@@ -257,13 +257,13 @@
+ # information of this (thumbnail) image file...
+ if (my($ipos) = $info->get_info($i, "JPEGInterchangeFormat", 1)) {
+ my($ilen) = $info->get_info($i, "JPEGInterchangeFormatLngth", 1);
+- die unless $ilen;
+- my $jdata = substr($data, $ipos, $ilen);
+- #$info->push_info($i, "JPEGImage" => $jdata);
+-
+- with_io_string {
+- _process_file($info, $_, $i);
+- } $jdata;
++ if ($ilen) {
++ my $jdata = substr($data, $ipos, $ilen);
++ #$info->push_info($i, "JPEGImage" => $jdata);
++ with_io_string {
++ _process_file($info, $_, $i);
++ } $jdata;
++ }
+ }
+
+ # Turn XResolution/YResolution into 'resolution'
diff --git a/debian/patches/01_use_data_dumper_instead_of_data_dump.diff
b/debian/patches/01_use_data_dumper_instead_of_data_dump.diff
new file mode 100644
index 0000000..bc4634e
--- /dev/null
+++ b/debian/patches/01_use_data_dumper_instead_of_data_dump.diff
@@ -0,0 +1,15 @@
+--- ../libimage-info-perl-1.09/imgdump 2000-11-11 19:42:38.000000000 -0800
++++ imgdump 2004-12-02 18:25:26.000000000 -0800
+@@ -4,10 +4,10 @@
+
+ use strict;
+ use Image::Info qw(image_info);
+-use Data::Dump;
++use Data::Dumper;
+
+ while (@ARGV) {
+- print Data::Dump::dump(image_info(shift)), "\n";
++ print Dumper(image_info(shift)), "\n";
+ }
+
+
diff --git a/debian/patches/02_exif_e_link_fix.diff
b/debian/patches/02_exif_e_link_fix.diff
new file mode 100644
index 0000000..360c1db
--- /dev/null
+++ b/debian/patches/02_exif_e_link_fix.diff
@@ -0,0 +1,77 @@
+--- lib/Image/Info/TIFF.pm~
++++ lib/Image/Info/TIFF.pm
+@@ -9,7 +9,7 @@
+ http://partners.adobe.com/asn/developer/PDFS/TN/TIFF6.pdf
+
+ Also good writeup on exif spec at:
+-http://www.ba.wakwak.com/~tsuruzoh/Computer/Digicams/exif-e.html
++http://park2.wakwak.com/~tsuruzoh/Computer/Digicams/exif-e.html
+
+ =end register
+
+--- lib/Image/Info/JPEG.pm~
++++ lib/Image/Info/JPEG.pm
+@@ -17,11 +17,11 @@
+ time, aperture, flash usage, GPS position, etc. The following web
+ page contain description of the fields that can be present:
+
+- http://www.ba.wakwak.com/~tsuruzoh/Computer/Digicams/exif-e.html
++ http://park2.wakwak.com/~tsuruzoh/Computer/Digicams/exif-e.html
+
+ The C<Exif> spec can be found at:
+
+- http://www.pima.net/standards/it10/PIMA15740/exif.htm
++ http://exif.org/specifications.html
+
+ =end register
+
+--- lib/Image/TIFF.pm~
++++ lib/Image/TIFF.pm
+@@ -800,7 +800,7 @@
+ my ($ifd_off, $tag_prefix, $sub) =
@{$makernotes{$self->{Make}.' '.$self->{Model}}};
+ $self->{tag_prefix} = $tag_prefix;
+ if ($ifd_off < 0) {
+- # fuji kludge -
http://www.butaman.ne.jp/~tsuruzoh/Computer/Digicams/exif-e.html#APP4
++ # fuji kludge -
http://park2.wakwak.com/~tsuruzoh/Computer/Digicams/exif-e.html#APP4
+ my $save_endian = $self->{little_endian};
+ $self->{little_endian} = 1;
+ $ifd_off = $self->unpack("N", substr($val, 8, 4));
+--- lib/Image/Info.pm~
++++ lib/Image/Info.pm
+@@ -355,11 +355,11 @@
+ time, aperture, flash usage, GPS position, etc. The following web
+ page contain description of the fields that can be present:
+
+- http://www.ba.wakwak.com/~tsuruzoh/Computer/Digicams/exif-e.html
++ http://park2.wakwak.com/~tsuruzoh/Computer/Digicams/exif-e.html
+
+ The C<Exif> spec can be found at:
+
+- http://www.pima.net/standards/it10/PIMA15740/exif.htm
++ http://exif.org/specifications.html
+
+ =item PNG
+
+@@ -382,7 +382,7 @@
+ http://partners.adobe.com/asn/developer/PDFS/TN/TIFF6.pdf
+
+ Also good writeup on exif spec at:
+-http://www.ba.wakwak.com/~tsuruzoh/Computer/Digicams/exif-e.html
++http://park2.wakwak.com/~tsuruzoh/Computer/Digicams/exif-e.html
+
+ =item XBM
+
+--- README~
++++ README
+@@ -31,9 +31,9 @@
+ The Exif code is written based on TsuruZoh Tachibanaya's "Description
+ of Exif file format" and Thierry Bousch's Python module 'exifdump.py'
+
+- http://www.butaman.ne.jp/~tsuruzoh/Computer/Digicams/exif-e.html
++ http://park2.wakwak.com/~tsuruzoh/Computer/Digicams/exif-e.html
+ http://topo.math.u-psud.fr/~bousch/exifdump.py
+
+ The Exif standard is now also officially available:
+
+- http://www.pima.net/standards/it10/PIMA15740/exif.htm
++ http://exif.org/specifications.html
diff --git a/debian/rules b/debian/rules
index d0600e9..7c648cf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,25 +2,42 @@
PERL ?= /usr/bin/perl
-b := $(shell pwd)/debian/libimage-info-perl
+DEST_DIR := $(shell pwd)/debian/libimage-info-perl
-arrange: arrange-stamp
-arrange-stamp: install
+patch: patch-stamp
+patch-stamp:
dh_testdir
- touch arrange-stamp
-binary: binary-stamp
-binary-stamp: binary-indep binary-arch
- dh_testdir
- touch binary-stamp
+ if [ -e debian/patches ]; then \
+ for a in `ls debian/patches/*.diff`; do \
+ patch -f -p0 < $$a; \
+ done; \
+ fi;
+
+ rm -f unpatch-stamp;
+ touch $@
-binary-arch: binary-arch-stamp
-binary-arch-stamp: arrange
+unpatch: unpatch-stamp
+unpatch-stamp:
dh_testdir
- touch binary-arch-stamp
+
+ if [ -e debian/patches ]; then \
+ for a in `ls debian/patches/*.diff`; do \
+ patch -f -p0 -R < $$a; \
+ done; \
+ fi;
+
+ rm -f patch-stamp
+ touch $@
+
+
+binary: binary-indep binary-arch
+
+binary-arch: build install
+
binary-indep: binary-indep-stamp
-binary-indep-stamp: arrange
+binary-indep-stamp: install
dh_testdir
dh_testroot
dh_installdocs README
@@ -32,42 +49,38 @@ binary-indep-stamp: arrange
dh_gencontrol
dh_md5sums
dh_builddeb
- touch binary-indep-stamp
+ touch $@
build: build-stamp
-build-stamp: config
+build-stamp:
dh_testdir
+ $(PERL) Makefile.PL INSTALLDIRS=vendor
$(MAKE)
- touch build-stamp
-
-test: test-stamp
-test-stamp: build
- dh_testdir
$(MAKE) test
- touch test-stamp
+ touch $@
clean:
dh_testdir
dh_testroot
+ rm -f *-stamp
if [ -e Makefile ]; then \
$(MAKE) -i distclean;\
fi
- dh_clean arrange-stamp binary-stamp binary-arch-stamp
binary-indep-stamp build-stamp config-stamp install-stamp
+ dh_clean
-config: config-stamp
-config-stamp:
- dh_testdir
- $(PERL) Makefile.PL INSTALLDIRS=vendor
- touch config-stamp
install: install-stamp
-install-stamp: test
+install-stamp: build
dh_testdir
- $(MAKE) install PREFIX=$(b)/usr
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ $(MAKE) install PREFIX=$(DEST_DIR)/usr
# Install exifdump and imgdump into the examples directory
- install -m755 -d $(b)/usr/share/doc/libimage-info-perl/examples
- install -m755 exifdump imgdump
$(b)/usr/share/doc/libimage-info-perl/examples
- rmdir --ignore-fail-on-non-empty --parents $(b)/usr/lib/perl5
+ install -m755 -d $(DEST_DIR)/usr/share/doc/libimage-info-perl/examples
+ install -m755 exifdump imgdump
$(DEST_DIR)/usr/share/doc/libimage-info-perl/examples
+ rmdir --ignore-fail-on-non-empty --parents $(DEST_DIR)/usr/lib/perl5
touch install-stamp
-.PHONY: binary binary-arch binary-indep clean
+.PHONY: binary binary-arch binary-indep clean install
diff --git a/imgdump b/imgdump
index 3f72066..3969cca 100755
--- a/imgdump
+++ b/imgdump
@@ -4,10 +4,10 @@ use lib "./lib";
use strict;
use Image::Info qw(image_info);
-use Data::Dump;
+use Data::Dumper;
while (@ARGV) {
- print Data::Dump::dump(image_info(shift)), "\n";
+ print Dumper(image_info(shift)), "\n";
}
diff --git a/lib/Image/Info/JPEG.pm b/lib/Image/Info/JPEG.pm
index 4d0df3e..1f29320 100644
--- a/lib/Image/Info/JPEG.pm
+++ b/lib/Image/Info/JPEG.pm
@@ -17,11 +17,11 @@ encode things like timestamp, camera model, focal length,
exposure
time, aperture, flash usage, GPS position, etc. The following web
page contain description of the fields that can be present:
- http://www.ba.wakwak.com/~tsuruzoh/Computer/Digicams/exif-e.html
+ http://park2.wakwak.com/~tsuruzoh/Computer/Digicams/exif-e.html
The C<Exif> spec can be found at:
- http://www.pima.net/standards/it10/PIMA15740/exif.htm
+ http://exif.org/specifications.html
=end register
@@ -257,13 +257,13 @@ sub process_app1_exif
# information of this (thumbnail) image file...
if (my($ipos) = $info->get_info($i, "JPEGInterchangeFormat", 1)) {
my($ilen) = $info->get_info($i, "JPEGInterchangeFormatLngth", 1);
- die unless $ilen;
- my $jdata = substr($data, $ipos, $ilen);
- #$info->push_info($i, "JPEGImage" => $jdata);
-
- with_io_string {
- _process_file($info, $_, $i);
- } $jdata;
+ if ($ilen) {
+ my $jdata = substr($data, $ipos, $ilen);
+ #$info->push_info($i, "JPEGImage" => $jdata);
+ with_io_string {
+ _process_file($info, $_, $i);
+ } $jdata;
+ }
}
# Turn XResolution/YResolution into 'resolution'
diff --git a/lib/Image/Info/TIFF.pm b/lib/Image/Info/TIFF.pm
index c8071c9..1341bcf 100644
--- a/lib/Image/Info/TIFF.pm
+++ b/lib/Image/Info/TIFF.pm
@@ -9,7 +9,7 @@ The C<TIFF> spec can be found at:
http://partners.adobe.com/asn/developer/PDFS/TN/TIFF6.pdf
Also good writeup on exif spec at:
-http://www.ba.wakwak.com/~tsuruzoh/Computer/Digicams/exif-e.html
+http://park2.wakwak.com/~tsuruzoh/Computer/Digicams/exif-e.html
=end register
diff --git a/lib/Image/TIFF.pm b/lib/Image/TIFF.pm
index e1e6841..52c18a2 100644
--- a/lib/Image/TIFF.pm
+++ b/lib/Image/TIFF.pm
@@ -800,7 +800,7 @@ sub add_fields
my ($ifd_off, $tag_prefix, $sub) =
@{$makernotes{$self->{Make}.' '.$self->{Model}}};
$self->{tag_prefix} = $tag_prefix;
if ($ifd_off < 0) {
- # fuji kludge -
http://www.butaman.ne.jp/~tsuruzoh/Computer/Digicams/exif-e.html#APP4
+ # fuji kludge -
http://park2.wakwak.com/~tsuruzoh/Computer/Digicams/exif-e.html#APP4
my $save_endian = $self->{little_endian};
$self->{little_endian} = 1;
$ifd_off = $self->unpack("N", substr($val, 8, 4));
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-perl/packages/libimage-info-perl.git
_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
