- updated to 4.12, removed obsolete mime-elf,readelf-fix,segv patches

[packages/file.git] / file-debian.patch

diff --git a/file-debian.patch b/file-debian.patch
index 3a7687d6ddfa2412b199d9e351eac6f36240023e..1c9c2f2fa954efb11561291738e284911f2aa4c3 100644 (file)
--- a/file-debian.patch
+++ b/file-debian.patch
@@ -75,9 +75,9 @@
 +# Don't edit this file, edit /etc/magic or send your suggested inclusions to
 +# this file as a wishlist bug against file (using the reportbug utility).
 +
---- file-4.09/magic/magic.mime.orig    2004-04-07 02:22:12.000000000 +0200
-+++ file-4.09/magic/magic.mime 2004-04-11 16:47:50.872755872 +0200
-@@ -96,7 +96,7 @@
+--- file-4.11/magic/magic.mime.orig    2004-11-21 06:20:30.000000000 +0100
++++ file-4.11/magic/magic.mime 2004-11-22 23:30:02.976163088 +0100
+@@ -190,7 +190,7 @@
  
  
  # MPEG Layer 3 sound files
@@ -86,7 +86,7 @@
  #MP3 with ID3 tag
  0     string          ID3             audio/mpeg
  # Ogg/Vorbis
-@@ -195,10 +195,10 @@
+@@ -289,10 +289,10 @@
  # because it tries to uncompress it to figure out what's inside.
  
  # standard unix compress
@@ -99,7 +99,7 @@
  
  0             string                  PK\003\004              application/x-zip
  
-@@ -299,19 +299,14 @@
+@@ -393,19 +393,14 @@
  #
  # from Daniel Quinlan <quinlan@yggdrasil.com>
  #
@@ -126,7 +126,7 @@
  
  #------------------------------------------------------------------------------
  # images:  file(1) magic for image formats (see also "c-lang" for XPM bitmaps)
-@@ -374,7 +369,7 @@
+@@ -468,7 +463,7 @@
  0     beshort         0xffd8          image/jpeg
  
  # PC bitmaps (OS/2, Windoze BMP files)  (Greg Roelofs, newt@uchicago.edu)
@@ -135,7 +135,7 @@
  #>14  byte            12              (OS/2 1.x format)
  #>14  byte            64              (OS/2 2.x format)
  #>14  byte            40              (Windows 3.x format)
-@@ -652,6 +647,7 @@
+@@ -778,6 +773,7 @@
  #
  0     string          FWS             
  >3    byte            x                       application/x-shockwave-flash
@@ -143,11 +143,10 @@
  
  # The following paramaters are created for Namazu.
  # <http://www.namazu.org/>
-@@ -788,3 +784,8 @@
- # files, and checked them.
- #0       belong          0x3C423FC9
- #>4      belong          0x6A87C2CF application/x-adrift
-+
+@@ -906,3 +902,7 @@
+ # (made the mimetype up) 
+ 0     string  \0\0MMXPR3\0    application/x-quark-xpress-3
+ 
 +# Gnumeric spreadsheet
 +# This entry is only semi-helpful, as Gnumeric compresses its files, so
 +# they will ordinarily reported as "compressed", but at least -z helps