r35726 - in /branches/upstream/libfile-libmagic-perl/current: Changes LibMagic.pm t/6-oo.t
ryan52-guest at users.alioth.debian.org
ryan52-guest at users.alioth.debian.org
Tue May 19 00:32:21 UTC 2009
Author: ryan52-guest
Date: Tue May 19 00:32:16 2009
New Revision: 35726
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=35726
Log:
[svn-upgrade] Integrating new upstream version, libfile-libmagic-perl (0.95)
Modified:
branches/upstream/libfile-libmagic-perl/current/Changes
branches/upstream/libfile-libmagic-perl/current/LibMagic.pm
branches/upstream/libfile-libmagic-perl/current/t/6-oo.t
Modified: branches/upstream/libfile-libmagic-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libfile-libmagic-perl/current/Changes?rev=35726&op=diff
==============================================================================
--- branches/upstream/libfile-libmagic-perl/current/Changes (original)
+++ branches/upstream/libfile-libmagic-perl/current/Changes Tue May 19 00:32:16 2009
@@ -1,4 +1,7 @@
Revision history for Perl extension File::LibMagic.
+
+0.95 May 2009
+ try to make test work in netbsd and solaris 9
0.94 May 2009
small error in t/6-oo.t
Modified: branches/upstream/libfile-libmagic-perl/current/LibMagic.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libfile-libmagic-perl/current/LibMagic.pm?rev=35726&op=diff
==============================================================================
--- branches/upstream/libfile-libmagic-perl/current/LibMagic.pm (original)
+++ branches/upstream/libfile-libmagic-perl/current/LibMagic.pm Tue May 19 00:32:16 2009
@@ -15,11 +15,11 @@
# If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
# will save memory.
our %EXPORT_TAGS = ( 'easy' => [ qw( MagicBuffer MagicFile ) ],
- 'complete' => [ qw(magic_buffer magic_file magic_open magic_load magic_close
- magic_buffer_offset
- MAGIC_CHECK MAGIC_COMPRESS MAGIC_CONTINUE MAGIC_DEBUG
- MAGIC_DEVICES MAGIC_ERROR MAGIC_MIME MAGIC_NONE
- MAGIC_PRESERVE_ATIME MAGIC_RAW MAGIC_SYMLINK
+ 'complete' => [ qw(magic_buffer magic_file magic_open magic_load
+ magic_close magic_buffer_offset
+ MAGIC_CHECK MAGIC_COMPRESS MAGIC_CONTINUE
+ MAGIC_DEBUG MAGIC_DEVICES MAGIC_ERROR MAGIC_MIME
+ MAGIC_NONE MAGIC_PRESERVE_ATIME MAGIC_RAW MAGIC_SYMLINK
) ]
);
# Attention @{$EXPORT_TAGS{"easy"}} != @$EXPORT_TAGS{"easy"}
@@ -30,7 +30,7 @@
our @EXPORT = qw( );
-our $VERSION = '0.94';
+our $VERSION = '0.95';
sub AUTOLOAD {
# This AUTOLOAD is used to 'autoload' constants from the constant()
Modified: branches/upstream/libfile-libmagic-perl/current/t/6-oo.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libfile-libmagic-perl/current/t/6-oo.t?rev=35726&op=diff
==============================================================================
--- branches/upstream/libfile-libmagic-perl/current/t/6-oo.t (original)
+++ branches/upstream/libfile-libmagic-perl/current/t/6-oo.t Tue May 19 00:32:16 2009
@@ -24,6 +24,8 @@
my ($descr, $mime) = @$expect;
$file = "t/samples/$file";
+ # the original file utility uses text/plain;... so does gentoo, debian,
+ # etc ..., but OpenSUSE returns text/plain... (no semicolon)
$mime=~s/;/;?/g;
like( $flm->checktype_filename($file), qr#$mime#, "MIME $file" );
is ( $flm->describe_filename($file), $descr, "Describe $file" );
@@ -46,8 +48,10 @@
my ($descr, $mime) = @$expect;
$file = "t/samples/$file";
+ # OpenSUSE fix
$mime=~s/;/;?/g;
- like( $flm->checktype_filename($file), qr#$mime#, "MIME $file" );
+ # text/x-foo to keep netbsd and older solaris installations happy
+ like( $flm->checktype_filename($file), qr#(?:$mime|text/x-foo)#, "MIME $file" );
is( $flm->describe_filename($file), $descr, "Describe $file" );
my $data = do {
@@ -56,7 +60,8 @@
<$fh>;
};
- like( $flm->checktype_contents($data), qr#$mime#, "MIME data $file" );
+ # text/x-foo to keep netbsd and older solaris installations happy
+ like( $flm->checktype_contents($data), qr#(?:$mime|text/x-foo)#, "MIME data $file" );
is( $flm->describe_contents($data), $descr, "Describe data $file" );
}
More information about the Pkg-perl-cvs-commits
mailing list