Sort out duplicated EPOC/Psion magic.

diff --git a/ChangeLog b/ChangeLog
index 309b1dc5d5def68c5454ba33a96b95b5cf5121ce..752fc6c1096672b1aec11783d36f47acb8df8754 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-11  13:11  Reuben Thomas <rrt@sc3d.org>
+       * Combine overlapping epoc and psion magic files into one (epoc).
+
+       * Add some more EPOC MIME types.
+
 2009-08-19  15:55  Christos Zoulas <christos@zoulas.com>
 
        * Fix 3 bugs (From Ian Darwin):

diff --git a/magic/Magdir/epoc b/magic/Magdir/epoc
index 80229c47f38f5c43f7a139162131193c753b8509..bf192efa299c067509b0c10b185d129122ca3c86 100644 (file)
--- a/magic/Magdir/epoc
+++ b/magic/Magdir/epoc
@@ -1,11 +1,51 @@
 #------------------------------------------------------------------------------
 # EPOC : file(1) magic for EPOC documents [Psion Series 5/Osaris/Geofox 1]
-# Stefan Praszalowicz (hpicollo@worldnet.fr)
+# Stefan Praszalowicz <hpicollo@worldnet.fr> and Peter Breitenlohner <peb@mppmu.mpg.de>
 # Useful information for improving this file can be found at:
 # http://software.frodo.looijaard.name/psiconv/formats/Index.html
-0      lelong          0x10000037
+#------------------------------------------------------------------------------
+0      lelong          0x10000037      Psion Series 5
+>4     lelong          0x10000039      font file
+>4     lelong          0x1000003A      printer driver
+>4     lelong          0x1000003B      clipboard
+>4     lelong          0x10000042      multi-bitmap image
+!:mime image/x-epoc-mbm
+>4     lelong          0x1000006A      application information file
 >4     lelong          0x1000006D
->>8    lelong          0x1000007F      Psion Word
->>8    lelong          0x10000088      Psion Sheet
->>8    lelong          0x1000007D      Psion Sketch
->>8    lelong          0x10000085      Psion TextEd
+>>8    lelong          0x1000007D      Sketch image
+!:mime image/x-epoc-sketch
+>>8    lelong          0x1000007E      voice note
+>>8    lelong          0x1000007F      Word file
+!:mime application/x-epoc-word
+>>8    lelong          0x10000085      OPL program (TextEd)
+!:mime application/x-epoc-opl
+>>8    lelong          0x10000088      Sheet file
+!:mime application/x-epoc-sheet
+>>8    lelong          0x100001C4      EasyFax initialisation file
+>4     lelong          0x10000073      OPO module
+!:mime application/x-epoc-opo
+>4     lelong          0x10000074      OPL application
+!:mime application/x-epoc-app
+>4     lelong          0x1000008A      exported multi-bitmap image
+
+0      lelong          0x10000041      Psion Series 5 ROM multi-bitmap image
+
+0      lelong          0x10000050      Psion Series 5
+>4     lelong          0x1000006D      database
+>4     lelong          0x100000E4      ini file
+
+0      lelong          0x10000079      Psion Series 5 binary:
+>4     lelong          0x00000000      DLL
+>4     lelong          0x10000049      comms hardware library
+>4     lelong          0x1000004A      comms protocol library
+>4     lelong          0x1000005D      OPX
+>4     lelong          0x1000006C      application
+>4     lelong          0x1000008D      DLL
+>4     lelong          0x100000AC      logical device driver
+>4     lelong          0x100000AD      physical device driver
+>4     lelong          0x100000E5      file transfer protocol
+>4     lelong          0x100000E5      file transfer protocol
+>4     lelong          0x10000140      printer definition
+>4     lelong          0x10000141      printer definition
+
+0      lelong          0x1000007A      Psion Series 5 executable

diff --git a/magic/Magdir/psion b/magic/Magdir/psion
deleted file mode 100644 (file)
index 7aa2d74..0000000
--- a/magic/Magdir/psion
+++ /dev/null
@@ -1,43 +0,0 @@
-#------------------------------------------------------------------------------
-# psion:  file(1) magic for Psion handhelds data
-# from: Peter Breitenlohner <peb@mppmu.mpg.de>
-#
-0      lelong          0x10000037      Psion Series 5
->4     lelong          0x10000039      font file
->4     lelong          0x1000003A      printer driver
->4     lelong          0x1000003B      clipboard
->4     lelong          0x10000042      multi-bitmap image
->4     lelong          0x1000006A      application information file
->4     lelong          0x1000006D
->>8    lelong          0x1000007D      sketch image
-!:mime image/x-psion-sketch
->>8    lelong          0x1000007E      voice note
->>8    lelong          0x1000007F      word file
->>8    lelong          0x10000085      OPL program
->>8    lelong          0x10000088      sheet file
->>8    lelong          0x100001C4      EasyFax initialisation file
->4     lelong          0x10000073      OPO module
->4     lelong          0x10000074      OPL application
->4     lelong          0x1000008A      exported multi-bitmap image
-
-0      lelong          0x10000041      Psion Series 5 ROM multi-bitmap image
-
-0      lelong          0x10000050      Psion Series 5
->4     lelong          0x1000006D      database
->4     lelong          0x100000E4      ini file
-
-0      lelong          0x10000079      Psion Series 5 binary:
->4     lelong          0x00000000      DLL
->4     lelong          0x10000049      comms hardware library
->4     lelong          0x1000004A      comms protocol library
->4     lelong          0x1000005D      OPX
->4     lelong          0x1000006C      application
->4     lelong          0x1000008D      DLL
->4     lelong          0x100000AC      logical device driver
->4     lelong          0x100000AD      physical device driver
->4     lelong          0x100000E5      file transfer protocol
->4     lelong          0x100000E5      file transfer protocol
->4     lelong          0x10000140      printer definition
->4     lelong          0x10000141      printer definition
-
-0      lelong          0x1000007A      Psion Series 5 executable