r35730 - in /trunk/libfile-libmagic-perl: Changes LibMagic.pm debian/changelog t/6-oo.t

ryan52-guest at users.alioth.debian.org ryan52-guest at users.alioth.debian.org
Tue May 19 00:35:23 UTC 2009


Author: ryan52-guest
Date: Tue May 19 00:35:18 2009
New Revision: 35730

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=35730
Log:
New upstream release

Modified:
    trunk/libfile-libmagic-perl/Changes
    trunk/libfile-libmagic-perl/LibMagic.pm
    trunk/libfile-libmagic-perl/debian/changelog
    trunk/libfile-libmagic-perl/t/6-oo.t

Modified: trunk/libfile-libmagic-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libfile-libmagic-perl/Changes?rev=35730&op=diff
==============================================================================
--- trunk/libfile-libmagic-perl/Changes (original)
+++ trunk/libfile-libmagic-perl/Changes Tue May 19 00:35:18 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: trunk/libfile-libmagic-perl/LibMagic.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libfile-libmagic-perl/LibMagic.pm?rev=35730&op=diff
==============================================================================
--- trunk/libfile-libmagic-perl/LibMagic.pm (original)
+++ trunk/libfile-libmagic-perl/LibMagic.pm Tue May 19 00:35:18 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: trunk/libfile-libmagic-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libfile-libmagic-perl/debian/changelog?rev=35730&op=diff
==============================================================================
--- trunk/libfile-libmagic-perl/debian/changelog (original)
+++ trunk/libfile-libmagic-perl/debian/changelog Tue May 19 00:35:18 2009
@@ -1,11 +1,12 @@
-libfile-libmagic-perl (0.94-1) UNRELEASED; urgency=low
+libfile-libmagic-perl (0.95-1) UNRELEASED; urgency=low
 
   no need to upload
 
   * New upstream release
   * update copyright
+  * New upstream release
 
- -- Ryan Niebur <ryanryan52 at gmail.com>  Wed, 13 May 2009 18:05:11 -0700
+ -- Ryan Niebur <ryanryan52 at gmail.com>  Mon, 18 May 2009 17:35:10 -0700
 
 libfile-libmagic-perl (0.91-2) unstable; urgency=low
 

Modified: trunk/libfile-libmagic-perl/t/6-oo.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libfile-libmagic-perl/t/6-oo.t?rev=35730&op=diff
==============================================================================
--- trunk/libfile-libmagic-perl/t/6-oo.t (original)
+++ trunk/libfile-libmagic-perl/t/6-oo.t Tue May 19 00:35:18 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