- updated to file 5.00

Changed files:
    file-debian.patch -> 1.24
    file-msdos.patch -> 1.6

diff --git a/file-debian.patch b/file-debian.patch
index c667791d8398c78930e9f97fb770b944d93d9361..8f93c91887155cf593e378adb0569e5fe916fadc 100644 (file)
--- a/file-debian.patch
+++ b/file-debian.patch
@@ -373,15 +373,16 @@ diff -Naurp file-4.24.orig/magic/Magdir/archive file-4.24/magic/Magdir/archive
 diff -Naurp file.orig/magic/Magdir/images file/magic/Magdir/images
 --- file.orig/magic/Magdir/images      2008-07-02 15:16:52.000000000 +0000
 +++ file/magic/Magdir/images   2008-07-15 13:39:37.000000000 +0000
-@@ -600,3 +600,8 @@
- # Wavelet Scalar Quantization format used in gray-scale fingerprint images
- # From Tano M Fotang <mfotang@quanteq.com>
- 0     string  \xff\xa0\xff\xa8\x00    Wavelet Scalar Quantization image data
+@@ -605,3 +605,9 @@
+ # JPEG 2000 Code Stream Bitmap
+ # From Petr Splichal <psplicha@redhat.com>
+ 0     string  \xFF\x4F\xFF\x51\x00    JPEG-2000 Code Stream Bitmap data
++
++# Type:        Ulead Photo Explorer5 (.pe5)
++# URL: http://www.jisyo.com/cgibin/view.cgi?EXT=pe5 (Japanese)
++# From:        Simon Horman <horms@debian.org>
++0      string  IIO2H   Ulead Photo Explorer5
 +
-+# Type:       Ulead Photo Explorer5 (.pe5)
-+# URL:        http://www.jisyo.com/cgibin/view.cgi?EXT=pe5 (Japanese)
-+# From:       Simon Horman <horms@debian.org>
-+0     string  IIO2H   Ulead Photo Explorer5
 #!/bin/sh /usr/share/dpatch/dpatch-run
 ## 320-magic-add-pmenu.dpatch by Edward Betts <edward@debian.org>
 ##
@@ -646,15 +647,15 @@ diff -Naurp file-4.23.orig/magic/Magdir/linux file-4.23/magic/Magdir/linux
 diff -Naur file-4.21.orig/magic/Magdir/images file-4.21/magic/Magdir/images
 --- file-4.21.orig/magic/Magdir/images 2007-12-23 17:40:53.000000000 +0000
 +++ file-4.21/magic/Magdir/images      2007-12-23 17:40:46.000000000 +0000
-@@ -534,3 +534,8 @@
- # URL:  http://www.jisyo.com/cgibin/view.cgi?EXT=pe5 (Japanese)
- # From: Simon Horman <horms@debian.org>
- 0     string  IIO2H   Ulead Photo Explorer5
+@@ -611,3 +611,8 @@
+ # From:        Simon Horman <horms@debian.org>
+ 0      string  IIO2H   Ulead Photo Explorer5
+ 
++# Type:        X11 cursor
++# URL: http://webcvs.freedesktop.org/mime/shared-mime-info/freedesktop.org.xml.in?view=markup
++# From:        Mathias Brodala <info@noctus.net>
++0      string  Xcur    X11 cursor
 +
-+# Type:       X11 cursor
-+# URL:        http://webcvs.freedesktop.org/mime/shared-mime-info/freedesktop.org.xml.in?view=markup
-+# From:       Mathias Brodala <info@noctus.net>
-+0     string  Xcur    X11 cursor
 #!/bin/sh /usr/share/dpatch/dpatch-run
 ## 335-magic-add-freemind.dpatch by Jamie Thompson <debian-bugs@jamie-thompson.co.uk>
 ##

diff --git a/file-msdos.patch b/file-msdos.patch
index 20f6296af87b52ec2ed407d8901f14f914bceff1..73518940af63be6865d834084854a7bf29886697 100644 (file)
--- a/file-msdos.patch
+++ b/file-msdos.patch
@@ -3,37 +3,31 @@
 @@ -5,14 +5,13 @@
  
  # .BAT files (Daniel Quinlan, quinlan@yggdrasil.com)
- # updated by Joerg Jenderek
+ # updated by Joerg Jenderek at Oct 2008
 -0     string  @                       
-->1    string/cB       \ echo\ off     MS-DOS batch file text
-+0     string/cB       @\ echo\ off    MS-DOS batch file text
+->1    string/cB       \ echo\ off     DOS batch file text
++0     string/cB       @\ echo\ off    DOS batch file text
  !:mime        text/x-msdos-batch
-->1    string/cB       echo\ off       MS-DOS batch file text
-+0     string/cB       @echo\ off      MS-DOS batch file text
+->1    string/cB       echo\ off       DOS batch file text
++0     string/cB       @echo\ off      DOS batch file text
  !:mime        text/x-msdos-batch
-->1    string/cB       rem\            MS-DOS batch file text
-+0     string/cB       @rem\           MS-DOS batch file text
+->1    string/cB       rem\            DOS batch file text
++0     string/cB       @rem\           DOS batch file text
  !:mime        text/x-msdos-batch
-->1    string/cB       set\            MS-DOS batch file text
-+0     string/cB       @set\           MS-DOS batch file text
+->1    string/cB       set\            DOS batch file text
++0     string/cB       @set\           DOS batch file text
  !:mime        text/x-msdos-batch
  
  
-@@ -322,11 +321,12 @@
- #>0x20e string                SFX\ by\ LARC   \b, LARC self-extracting archive
+@@ -329,7 +329,7 @@
  #0    byte            0xb8            COM executable
+ 0     uleshort&0x80ff 0x00b8          
  # modified by Joerg Jenderek
-->1    lelong          !0x21cd4cff     for DOS
-+#>1   lelong          !0x21cd4cff     for DOS
+->1    lelong          !0x21cd4cff     COM executable for DOS
++#>1   lelong          !0x21cd4cff     COM executable for DOS
  # http://syslinux.zytor.com/comboot.php
  # (32-bit COMBOOT) programs *.C32 contain 32-bit code and run in flat-memory 32-bit protected mode
  # start with assembler instructions mov eax,21cd4cffh
-->1    lelong          0x21cd4cff      (32-bit COMBOOT)
-+#>1   lelong          0x21cd4cff      (32-bit COMBOOT)
-+0     string  \xb8\xff\x4c\xcd\x21    COM executable (32-bit COMBOOT)
- 0     string  \x81\xfc                
- >4    string  \x77\x02\xcd\x20\xb9    
- >>36  string  UPX!                    FREE-DOS executable (COM), UPX compressed
 @@ -334,27 +334,27 @@
  # GRR search is not working
  #2    search/28       \xcd\x21        COM executable for MS-DOS