more Debian fixes from Abel Cheung

diff --git a/magic/Magdir/elf b/magic/Magdir/elf
index b362fe0c820ff34ecd2734b4ebe529eac4b41464..74070502db2fb5dde4726afb6b4cda063ca8f59a 100644 (file)
--- a/magic/Magdir/elf
+++ b/magic/Magdir/elf
@@ -7,7 +7,12 @@
 #
 # What're the correct byte orders for the nCUBE and the Fujitsu VPP500?
 #
-# updated by Daniel Quinlan (quinlan@yggdrasil.com)
+# Created by: unknown
+# Modified by (1): Daniel Quinlan <quinlan@yggdrasil.com>
+# Modified by (2): Peter Tobias <tobias@server.et-inf.fho-emden.de> (core support)
+# Modified by (3): Christian 'Dr. Disk' Hechelmann <drdisk@ds9.au.s.shuttle.de> (fix of core support)
+# Modified by (4): <gerardo.cacciari@gmail.com> (VMS Itanium)
+# Modified by (5): Matthias Urlichs <smurf@debian.org> (Listing of many architectures)
 0      string          \177ELF         ELF
 >4     byte            0               invalid class
 >4     byte            1               32-bit
@@ -22,8 +27,6 @@
 !:mime application/x-executable
 >>16   leshort         3               shared object,
 !:mime application/x-sharedlib
-# Core handling from Peter Tobias <tobias@server.et-inf.fho-emden.de>
-# corrections by Christian 'Dr. Disk' Hechelmann <drdisk@ds9.au.s.shuttle.de>
 >>16   leshort         4               core file
 !:mime application/x-coredump
 # Core file detection is not reliable.
@@ -270,7 +273,6 @@
 >>7    byte            10              (Tru64)
 >>7    byte            11              (Novell Modesto)
 >>7    byte            12              (OpenBSD)
-# VMS Itanium added by gerardo.cacciari@gmail.com
 >8      string          \2
 >>7     byte            13              (OpenVMS)
 >>7    byte            97              (ARM)

diff --git a/magic/Magdir/hp b/magic/Magdir/hp
index 33685b41279f3a9cfba022a08785ccb001869962..9281dae72977b235a3188ea266228ae7023b7468 100644 (file)
--- a/magic/Magdir/hp
+++ b/magic/Magdir/hp
@@ -201,10 +201,13 @@
 0      string          msgcat01        HP NLS message catalog,
 >8     long            >0              %d messages
 
-# addendum to /etc/magic with HP-48sx file-types by phk@data.fls.dk 1jan92
-0      string          HPHP4           HP
->5     string          8               48 binary
->5     string          9               49 binary
+# Summary: HP-48/49 calculator
+# Created by: phk@data.fls.dk
+# Modified by (1): AMAKAWA Shuhei <sa264@cam.ac.uk>
+# Modified by (2): Samuel Thibault <samuel.thibault@ens-lyon.org> (HP49 support)
+0      string          HPHP            HP
+>4     string          48              48 binary
+>4     string          49              49 binary
 >7     byte            >64             - Rev %c
 >8     leshort         0x2911          (ADR)
 >8     leshort         0x2933          (REAL)
@@ -231,7 +234,7 @@
 >8     leshort         0x2e6d          (LNAME)
 >8     leshort         0x2e92          (XLIB)
 
-0      search/1        %%HP:           HP text
+0      string          %%HP:           HP text
 >6     string          T(0)            - T(0)
 >6     string          T(1)            - T(1)
 >6     string          T(2)            - T(2)
@@ -259,6 +262,25 @@
 >7     string          J               (ASCII Vector specification)
 >7     string          K               (wildcard)
 
+# Summary: HP-38/39 calculator
+# Created by: Samuel Thibault <samuel.thibault@ens-lyon.org>
+0      string          HP3
+>3     string          8               HP 38
+>3     string          9               HP 39
+>4     string          Bin             binary
+>4     string          Asc             ASCII
+>7     string          A               (Directory List)
+>7     string          B               (Zaplet)
+>7     string          C               (Note)
+>7     string          D               (Program)
+>7     string          E               (Variable)
+>7     string          F               (List)
+>7     string          G               (Matrix)
+>7     string          H               (Library)
+>7     string          I               (Target List)
+>7     string          J               (ASCII Vector specification)
+>7     string          K               (wildcard)
+
 # hpBSD magic numbers
 0      beshort         200             hp200 (68010) BSD
 >2     beshort         0407            impure binary
@@ -409,6 +431,4 @@
 >>>>>>>>>0xC4  belong  33              - received SIGXCPU
 >>>>>>>>>0xC4  belong  34              - received SIGXFSZ
 
-# From: AMAKAWA Shuhei <sa264@cam.ac.uk>
-#0     string  HPHP49-                 HP49 binary
 

diff --git a/magic/Magdir/riff b/magic/Magdir/riff
index af8d2519ac5c6fb72229d4d2b2653b14bb6696af..c6e3070b56ffed6ef771f1c08c741d68d412454c 100644 (file)
--- a/magic/Magdir/riff
+++ b/magic/Magdir/riff
@@ -135,7 +135,7 @@
 >>>>>>>(104.l+132)      string/c        xvid    XviD
 >>>>>>>(104.l+132)     string/c        h264    H.264
 >>>>>>>(104.l+132)      string/c        wmv3    Windows Media Video 9
->>>>>>>(104.l+132)      string/c        h264    X.264
+>>>>>>>(104.l+132)      string/c        h264    X.264 or H.264
 >>>>>>>(104.l+132)      lelong  0
 ##>>>>>>>(104.l+132)      string  x       (%.4s)
 # skip past first (video) LIST