r9270 - in /trunk/libmime-types-perl: debian/changelog debian/patches/etc_mime_types.patch debian/patches/series lib/MIME/Types.pm

[gregoa-guest at users.alioth.debian.org]

Author: gregoa-guest
Date: Tue Nov 13 17:49:56 2007
New Revision: 9270

URL: http://svn.debian.org/wsvn/?sc=1&rev=9270
Log:
Create separate patch etc_mime_types.patch, the changes against
  lib/MIME/Types.pm were contained in the .diff.gz directly.

Added:
    trunk/libmime-types-perl/debian/patches/etc_mime_types.patch
Modified:
    trunk/libmime-types-perl/debian/changelog
    trunk/libmime-types-perl/debian/patches/series
    trunk/libmime-types-perl/lib/MIME/Types.pm

Modified: trunk/libmime-types-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libmime-types-perl/debian/changelog?rev=9270&op=diff
==============================================================================
--- trunk/libmime-types-perl/debian/changelog (original)
+++ trunk/libmime-types-perl/debian/changelog Tue Nov 13 17:49:56 2007
@@ -6,12 +6,14 @@
     Vcs-Svn fields.
   * Add patch tests.patch; make tests pass also on 'normal' systems
     (closes: #448887).
+  * Create separate patch etc_mime_types.patch, the changes against
+    lib/MIME/Types.pm were contained in the .diff.gz directly.
 
   [ Frank Lichtenheld ]
   * debian/rules: Fix target dependencies to allow building with
     dpkg-buildpackage -j. Found by Daniel Schepler.
 
- -- gregor herrmann <gregor+debian at comodo.priv.at>  Sun, 04 Nov 2007 19:29:23 +0100
+ -- gregor herrmann <gregor+debian at comodo.priv.at>  Tue, 13 Nov 2007 18:49:09 +0100
 
 libmime-types-perl (1.21-1) unstable; urgency=low
 

Added: trunk/libmime-types-perl/debian/patches/etc_mime_types.patch
URL: http://svn.debian.org/wsvn/trunk/libmime-types-perl/debian/patches/etc_mime_types.patch?rev=9270&op=file
==============================================================================
--- trunk/libmime-types-perl/debian/patches/etc_mime_types.patch (added)
+++ trunk/libmime-types-perl/debian/patches/etc_mime_types.patch Tue Nov 13 17:49:56 2007
@@ -1,0 +1,31 @@
+Index: libmime-types-perl/lib/MIME/Types.pm
+===================================================================
+--- libmime-types-perl.orig/lib/MIME/Types.pm	2007-11-13 18:45:07.000000000 +0100
++++ libmime-types-perl/lib/MIME/Types.pm	2007-11-13 18:45:48.000000000 +0100
+@@ -55,6 +55,26 @@
+               , system     => $os
+               );
+         }
++
++        if (open (FH, "/etc/mime.types"))
++	{
++	    while (<FH>)
++            {   s/\#.*//;
++                next if m/^$/;
++
++                my ($type, @exts) = split;
++
++                next if $args->{only_complete} && ! @exts;
++                my $simplified = MIME::Type->simplified($type);
++
++                push @{$list{$simplified}}, MIME::Type->new
++                    ( type       => $type
++                    , extensions => \@exts
++                    );
++            }
++
++            close FH;
++        }
+     }
+ 
+     undef $mime_type_definitions;   # to reduce memory consumption

Modified: trunk/libmime-types-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/trunk/libmime-types-perl/debian/patches/series?rev=9270&op=diff
==============================================================================
--- trunk/libmime-types-perl/debian/patches/series (original)
+++ trunk/libmime-types-perl/debian/patches/series Tue Nov 13 17:49:56 2007
@@ -1,1 +1,2 @@
+etc_mime_types.patch
 tests.patch

Modified: trunk/libmime-types-perl/lib/MIME/Types.pm
URL: http://svn.debian.org/wsvn/trunk/libmime-types-perl/lib/MIME/Types.pm?rev=9270&op=diff
==============================================================================
--- trunk/libmime-types-perl/lib/MIME/Types.pm (original)
+++ trunk/libmime-types-perl/lib/MIME/Types.pm Tue Nov 13 17:49:56 2007
@@ -54,26 +54,6 @@
               , encoding   => $encoding
               , system     => $os
               );
-        }
-
-        if (open (FH, "/etc/mime.types"))
-	{
-	    while (<FH>)
-            {   s/\#.*//;
-                next if m/^$/;
-
-                my ($type, @exts) = split;
-
-                next if $args->{only_complete} && ! @exts;
-                my $simplified = MIME::Type->simplified($type);
-
-                push @{$list{$simplified}}, MIME::Type->new
-                    ( type       => $type
-                    , extensions => \@exts
-                    );
-            }
-
-            close FH;
         }
     }