Import Debian version 4.24-1

debian/control

@@ -55,7 +55,7 @@ Description: File type determination library using "magic" numbers (Python bindi
  This library can be used to classify files according to magic number tests. It
  implements the core functionality of the file command.
  .
- This package contains the python bindings to query /etc/magic information for a
+ This package contains the Python bindings to query /etc/magic information for a
  given file in Python.
 
 Package: python-magic-dbg

debian/file.docs

@@ -1,2 +1 @@
 README
-PORTING

debian/patches/00list

@@ -1,41 +1,3 @@
-102-magic-remove-bennet.dpatch
-103-magic-remove-bzip.dpatch
-104-magic-remove-cgm.dpatch
-105-magic-remove-com.dpatch
-106-magic-remove-emf.dpatch
-108-magic-remove-quicktime.dpatch
-201-magic-update-avi.dpatch
-203-magic-update-cow.dpatch
-204-magic-update-cracklib.dpatch
-206-magic-update-elf-b.dpatch
-207-magic-update-elf-c.dpatch
-208-magic-update-hp.dpatch
-209-magic-update-jpeg.dpatch
-210-magic-update-m4v.dpatch
-211-magic-update-macintosh.dpatch
-213-magic-update-pcp.dpatch
-214-magic-update-perl.dpatch
-215-magic-update-sh.dpatch
-216-magic-update-spectrum.dpatch
-301-magic-add-adf.dpatch
-302-magic-add-apple2.dpatch
-303-magic-add-arm.dpatch
-304-magic-add-avg.dpatch
-305-magic-add-clarion.dpatch
-306-magic-add-dds.dpatch
-307-magic-add-erlang.dpatch
-308-magic-add-gedcom.dpatch
-309-magic-add-git.dpatch
-309-magic-add-inform.dpatch
-310-magic-add-llvm.dpatch
-311-magic-add-lua.dpatch
-312-magic-add-luks.dpatch
-313-magic-add-lzma.dpatch
-314-magic-add-mathcad.dpatch
-315-magic-add-mdi.dpatch
-316-magic-add-mercurial.dpatch
-317-magic-add-mozilla.dpatch
-318-magic-add-nlm.dpatch
 320-magic-add-par2.dpatch
 321-magic-add-pe5.dpatch
 322-magic-add-pmenu.dpatch
@@ -48,14 +10,10 @@
 329-magic-add-ssl.dpatch
 330-magic-add-subversion.dpatch
 331-magic-add-supercollider.dpatch
-332-magic-add-svg.dpatch
 333-magic-add-xen.dpatch
 334-magic-add-xcursor.dpatch
-901-file-elf.dpatch
-902-file-kfreebsd.dpatch
 903-file-localmagic.dpatch
 904-file-make.dpatch
-905-file-segfault.dpatch
 906-file-hurd.dpatch
 998-doc-manpages.dpatch
 999-conglomeration.dpatch

debian/patches/102-magic-remove-bennet.dpatch

@@ -1,19 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 102-magic-remove-bennet.dpatch by Josh Triplett <josh@freedesktop.org>
-##
-## DP: Remove Bennets face format, its match is too generic (Closes: #420855).
-
-@DPATCH@
-
-diff -Naur file-4.20.orig/magic/Magdir/images file-4.20/magic/Magdir/images
---- file-4.20.orig/magic/Magdir/images	2007-01-19 19:31:46.000000000 +0000
-+++ file-4.20/magic/Magdir/images	2007-04-26 06:24:31.000000000 +0000
-@@ -260,7 +260,7 @@
- 
- # other images
- 0	string	This\ is\ a\ BitMap\ file	Lisp Machine bit-array-file
--0	string		=!!		Bennet Yee's "face" format
-+#0	string		=!!		Bennet Yee's "face" format
- 
- # From SunOS 5.5.1 "/etc/magic" - appeared right before Sun raster image
- # stuff.

debian/patches/103-magic-remove-bzip.dpatch

@@ -1,39 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 103-magic-remove-bzip.dpatch by Michael Piefel <piefel@debian.org>
-##
-## DP: Disabled bzip detection (closes: #277648).
-
-@DPATCH@
-
-diff -Naur file-4.20.orig/magic/Magdir/compress file-4.20/magic/Magdir/compress
---- file-4.20.orig/magic/Magdir/compress	2006-03-02 22:10:26.000000000 +0000
-+++ file-4.20/magic/Magdir/compress	2007-04-03 12:26:56.000000000 +0000
-@@ -102,17 +102,17 @@
- # bzip	a block-sorting file compressor
- #	by Julian Seward <sewardj@cs.man.ac.uk> and others
- #
--0	string		BZ		bzip compressed data
-->2	byte		x		\b, version: %c
-->3	string		=1		\b, compression block size 100k
-->3	string		=2		\b, compression block size 200k
-->3	string		=3		\b, compression block size 300k
-->3	string		=4		\b, compression block size 400k
-->3	string		=5		\b, compression block size 500k
-->3	string		=6		\b, compression block size 600k
-->3	string		=7		\b, compression block size 700k
-->3	string		=8		\b, compression block size 800k
-->3	string		=9		\b, compression block size 900k
-+#0	string		BZ		bzip compressed data
-+#>2	byte		x		\b, version: %c
-+#>3	string		=1		\b, compression block size 100k
-+#>3	string		=2		\b, compression block size 200k
-+#>3	string		=3		\b, compression block size 300k
-+#>3	string		=4		\b, compression block size 400k
-+#>3	string		=5		\b, compression block size 500k
-+#>3	string		=6		\b, compression block size 600k
-+#>3	string		=7		\b, compression block size 700k
-+#>3	string		=8		\b, compression block size 800k
-+#>3	string		=9		\b, compression block size 900k
- 
- # lzop from <markus.oberhumer@jk.uni-linz.ac.at>
- 0	string		\x89\x4c\x5a\x4f\x00\x0d\x0a\x1a\x0a	lzop compressed data

debian/patches/104-magic-remove-cgm.dpatch

@@ -1,30 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 104-magic-remove-cgm.dpatch by Michael Piefel <piefel@debian.org>
-##
-## DP: FIXME
-
-@DPATCH@
-
-diff -Naurp file-4.23.orig/magic/Magdir/images file-4.23/magic/Magdir/images
---- file-4.23.orig/magic/Magdir/images	2007-05-03 15:11:33.000000000 +0000
-+++ file-4.23/magic/Magdir/images	2008-01-12 16:28:03.000000000 +0000
-@@ -130,8 +130,8 @@
- # CGM image files
- 0	string		BEGMF		clear text Computer Graphics Metafile
- # XXX - questionable magic
--0	beshort&0xffe0	0x0020		binary Computer Graphics Metafile
--0	beshort		0x3020		character Computer Graphics Metafile
-+#0	beshort&0xffe0	0x0020		binary Computer Graphics Metafile
-+#0	beshort		0x3020		character Computer Graphics Metafile
- 
- # MGR bitmaps  (Michael Haardt, u31b3hs@pool.informatik.rwth-aachen.de)
- 0	string	yz	MGR bitmap, modern format, 8-bit aligned
-@@ -510,7 +510,7 @@
- 0	string	AT&TFORM		DjVu Image file
- 
- # From: Jason Bacon <bacon@smithers.neuro.mcw.edu>
--0	beshort	0x3020			character Computer Graphics Metafile
-+#0	beshort	0x3020			character Computer Graphics Metafile
- 
- # From Marc Espie
- 0	lelong	20000630		OpenEXR image data

debian/patches/105-magic-remove-com.dpatch

@@ -1,45 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 105-magic-remove-com.dpatch by Michael Piefel <piefel@debian.org>
-##
-## DP: Disable one-byte magic for COM (closes: #393775, #339618).
-
-@DPATCH@
-
-diff -Naur file-4.20.orig/magic/Magdir/msdos file-4.20/magic/Magdir/msdos
---- file-4.20.orig/magic/Magdir/msdos	2007-01-19 19:35:20.000000000 +0000
-+++ file-4.20/magic/Magdir/msdos	2007-04-03 12:32:00.000000000 +0000
-@@ -262,8 +262,8 @@
- # Uncommenting only the first two lines will cover about 2/3 of COM files,
- # but it isn't feasible to match all COM files since there must be at least
- # two dozen different one-byte "magics".
--0	byte		0xe9		DOS executable (COM)
-->0x1FE	leshort		0xAA55		\b, boot code
-+#0	byte		0xe9		DOS executable (COM)
-+#>0x1FE	leshort		0xAA55		\b, boot code
- >6	string		SFX\ of\ LHarc	(%s)
- 0	belong	0xffffffff		DOS executable (device driver)
- #CMD640X2.SYS
-@@ -286,15 +286,15 @@
- >>77	string	>\x40			
- >>>77	string	<\x5B			
- >>>>77	string	x			\b, name: %.8s
--0	byte		0x8c		DOS executable (COM)
-+#0	byte		0x8c		DOS executable (COM)
- # 0xeb conflicts with "sequent" magic
--0	byte		0xeb		DOS executable (COM)
-->0x1FE	leshort		0xAA55		\b, boot code
-->85	string		UPX		\b, UPX compressed
-->4	string		\ $ARX		\b, ARX self-extracting archive
-->4	string		\ $LHarc	\b, LHarc self-extracting archive
-->0x20e	string		SFX\ by\ LARC	\b, LARC self-extracting archive
--0	byte		0xb8		COM executable
-+#0	byte		0xeb		DOS executable (COM)
-+#>0x1FE	leshort		0xAA55		\b, boot code
-+#>85	string		UPX		\b, UPX compressed
-+#>4	string		\ $ARX		\b, ARX self-extracting archive
-+#>4	string		\ $LHarc	\b, LHarc self-extracting archive
-+#>0x20e	string		SFX\ by\ LARC	\b, LARC self-extracting archive
-+#0	byte		0xb8		COM executable
- # modified by Joerg Jenderek
- >1	lelong          !0x21cd4cff	for DOS
- # http://syslinux.zytor.com/comboot.php

debian/patches/106-magic-remove-emf.dpatch

@@ -1,34 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 106-magic-remove-emf.dpatch by Michael Piefel <piefel@debian.org>
-##
-## DP: Disabled EMF detection as it not only caused false positives, which might
-## DP: have been acceptible, but a segmentation fault (closes: #333502).
-
-@DPATCH@
-
-diff -Naurp file-4.23.orig/magic/Magdir/msdos file-4.23/magic/Magdir/msdos
---- file-4.23.orig/magic/Magdir/msdos	2007-12-28 15:14:13.000000000 +0000
-+++ file-4.23/magic/Magdir/msdos	2008-01-12 16:33:00.000000000 +0000
-@@ -580,17 +580,17 @@
- # syntax available by some file commands you could write:
- # 0 lelong 1
- # &40 ulelong 0x464D4520 Windows Enhanced Metafile (EMF) image data
--40	ulelong 0x464D4520	Windows Enhanced Metafile (EMF) image data
-->44	ulelong x		version 0x%x.
-+#40	ulelong 0x464D4520	Windows Enhanced Metafile (EMF) image data
-+#>44	ulelong x		version 0x%x.
- # If the description has a length greater than zero, it exists and is 
- # found at offset (*64).
-->64	ulelong >0		Description available at offset 0x%x
-->>60	ulelong	>0		(length 0x%x)
-+#>64	ulelong >0		Description available at offset 0x%x
-+#>>60	ulelong	>0		(length 0x%x)
- # Note it would be better to print out the description, which is found 
- # as below. Unfortunately the following only prints out the first couple
- # of characters instead of all the "description length"
- # number of characters -- indicated by the ulelong at offset 60.
-->>(64.l)  lestring16 >0 Description: %15.15s
-+#>>(64.l)  lestring16 >0 Description: %15.15s
- 
- # From: Alex Beregszaszi <alex@fsn.hu>
- 0	string	COWD		VMWare3

debian/patches/108-magic-remove-quicktime.dpatch

@@ -1,26 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 108-magic-remove-quicktime.dpatch by Michael Piefel <piefel@debian.org>
-##
-## DP: Disabled some QuickTime entries (ASCII words, closes: #366986, #308394).
-
-@DPATCH@
-
-diff -Naur file-4.20.orig/magic/Magdir/animation file-4.20/magic/Magdir/animation
---- file-4.20.orig/magic/Magdir/animation	2007-01-14 18:47:21.000000000 +0000
-+++ file-4.20/magic/Magdir/animation	2007-03-27 12:23:14.000000000 +0000
-@@ -14,11 +14,11 @@
- >12     string          cmov            \b movie (fast start, compressed header)
- >12     string          rmra            \b multiple URLs
- 4       string          mdat            Apple QuickTime movie (unoptimized)
--4       string          wide            Apple QuickTime movie (unoptimized)
--4       string          skip            Apple QuickTime movie (modified)
--4       string          free            Apple QuickTime movie (modified)
-+#4       string          wide            Apple QuickTime movie (unoptimized)
-+#4       string          skip            Apple QuickTime movie (modified)
-+#4       string          free            Apple QuickTime movie (modified)
- 4       string          idsc            Apple QuickTime image (fast start)
--4       string          idat            Apple QuickTime image (unoptimized)
-+#4       string          idat            Apple QuickTime image (unoptimized)
- 4       string          pckg            Apple QuickTime compressed archive
- 4	string/B	jP		JPEG 2000 image
- 4	string		ftyp		ISO Media

debian/patches/201-magic-update-avi.dpatch

@@ -1,18 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 201-magic-update-avi.dpatch by root <ap@insysnet.ru>
-##
-## DP: Adds magic for H.264 video in AVI files (Closes: #347263).
-
-@DPATCH@
-
-diff -Naur file-4.20.orig/magic/Magdir/riff file-4.20/magic/Magdir/riff
---- file-4.20.orig/magic/Magdir/riff	2006-11-17 16:09:54.000000000 +0000
-+++ file-4.20/magic/Magdir/riff	2007-04-03 15:49:16.000000000 +0000
-@@ -130,6 +130,7 @@
- >>>>>>>(104.l+132)      string/c        divx    DivX 4
- >>>>>>>(104.l+132)      string/c        dx50    DivX 5
- >>>>>>>(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)      lelong  0

debian/patches/203-magic-update-cow.dpatch

@@ -1,27 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 203-magic-update-cow.dpatch by Matthew Palmer <mpalmer@debian.org>
-##
-## DP: Update COW magic from 2.0 to 3.0 (Closes: #283515, #319128).
-
-@DPATCH@
-
-diff -Naur file-4.20.orig/magic/Magdir/linux file-4.20/magic/Magdir/linux
---- file-4.20.orig/magic/Magdir/linux	2006-11-25 18:36:10.000000000 +0000
-+++ file-4.20/magic/Magdir/linux	2007-03-27 16:33:53.000000000 +0000
-@@ -109,10 +109,12 @@
- 0	string	Begin3	Linux Software Map entry text
- 0	string	Begin4	Linux Software Map entry text (new format)
- 
--# From Matt Zimmerman
--0       belong  0x4f4f4f4d      User-mode Linux COW file
-->4      belong  x               \b, version %d
-->8      string  >\0             \b, backing file %s
-+# From Matt Zimmerman, enhanced for v3 by Matthew Palmer
-+0	belong	0x4f4f4f4d	User-mode Linux COW file
-+>4	belong	<3		\b, version %d
-+>>8	string	>\0		\b, backing file %s
-+>4	belong	>2		\b, version %d
-+>>32	string	>\0		\b, backing file %s
- 
- ############################################################################
- # Linux kernel versions

debian/patches/204-magic-update-cracklib.dpatch

@@ -1,17 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 204-magic-update-cracklib.dpatch by Michael Piefel <piefel@debian.org>
-##
-## DP: Improved over-confident 64bit-cracklib rule (closes: #343504).
-
-@DPATCH@
-
-diff -Naur file-4.20.orig/magic/Magdir/cracklib file-4.20/magic/Magdir/cracklib
---- file-4.20.orig/magic/Magdir/cracklib	2006-03-02 22:10:26.000000000 +0000
-+++ file-4.20/magic/Magdir/cracklib	2007-03-27 12:23:14.000000000 +0000
-@@ -9,5 +9,5 @@
- 0	belong	0x70775631	Cracklib password index, big endian
- >4	belong	>-1		(%i words)
- # really bellong 0x0000000070775631
--4	belong	0x70775631	Cracklib password index, big endian ("64-bit")
-+0	search/1	\0\0\0\0pwV1	Cracklib password index, big endian ("64-bit")
- >12	belong	>0		(%i words)

debian/patches/206-magic-update-elf-b.dpatch

@@ -1,30 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 206-magic-update-elf-b.dpatch by Robert Millan <rmh@aybabtu.com>
-##
-## DP: New magic for OpenRISC binary format (Closes: #316076).
-
-@DPATCH@
-
-diff -Naurp file-4.23.orig/magic/Magdir/elf file-4.23/magic/Magdir/elf
---- file-4.23.orig/magic/Magdir/elf	2007-11-19 19:25:53.000000000 +0000
-+++ file-4.23/magic/Magdir/elf	2008-01-12 16:41:29.000000000 +0000
-@@ -99,6 +99,9 @@
- >>18	leshort		62		x86-64,
- >>18	leshort		75		Digital VAX,
- >>18	leshort		88		Renesas M32R,
-+>>18	leshort		92		OpenRISC,
-+>>18	leshort		0x3426		OpenRISC (obsolete),
-+>>18	leshort		0x8472		OpenRISC (obsolete),
- >>18	leshort		94		Tensilica Xtensa,
- >>18	leshort		97		NatSemi 32k,
- >>18	leshort		106		Analog Devices Blackfin,
-@@ -194,6 +197,9 @@
- >>18	beshort		73		Cray NV1,
- >>18	beshort		75		Digital VAX,
- >>18	beshort		88		Renesas M32R,
-+>>18	leshort		92		OpenRISC,
-+>>18	leshort		0x3426		OpenRISC (obsolete),
-+>>18	leshort		0x8472		OpenRISC (obsolete),
- >>18	beshort		94		Tensilica Xtensa,
- >>18	beshort		97		NatSemi 32k,
- >>18	beshort		0x18ad		AVR32 (unofficial),

debian/patches/207-magic-update-elf-c.dpatch

@@ -1,55 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 207-magic-update-elf-c.dpatch by Matthias Urlichs <smurf@debian.org>
-##
-## DP: Missing elf architectures (Closes: #424859).
-
-@DPATCH@
-
-diff -Naur file-4.20.orig/magic/Magdir/elf file-4.20/magic/Magdir/elf
---- file-4.20.orig/magic/Magdir/elf	2007-05-17 17:05:34.000000000 +0000
-+++ file-4.20/magic/Magdir/elf	2007-05-17 17:09:08.000000000 +0000
-@@ -96,10 +96,44 @@
- >>18	leshort		51		Stanford MIPS-X,
- >>18	leshort		52		Motorola Coldfire,
- >>18	leshort		53		Motorola M68HC12,
-+>>18	leshort		54		Fujitsu MMA,
-+>>18	leshort		55		Siemens PCP,
-+>>18	leshort		56		Sony nCPU,
-+>>18	leshort		57		Denso NDR1,
-+>>18	leshort		58		Start*Core,
-+>>18	leshort		59		Toyota ME16,
-+>>18	leshort		60		ST100,
-+>>18	leshort		61		Tinyj emb.,
- >>18	leshort		62		x86-64,
-+>>18	leshort		63		Sony DSP,
-+>>18	leshort		66		FX66,
-+>>18	leshort		67		ST9+ 8/16 bit,
-+>>18	leshort		68		ST7 8 bit,
-+>>18	leshort		69		MC68HC16,
-+>>18	leshort		70		MC68HC11,
-+>>18	leshort		71		MC68HC08,
-+>>18	leshort		72		MC68HC05,
-+>>18	leshort		73		SGI SVx,
-+>>18	leshort		74		ST19 8 bit,
- >>18	leshort		75		Digital VAX,
-+>>18	leshort		76		Axis cris,
-+>>18	leshort		77		Infineon 32-bit embedded,
-+>>18	leshort		78		Element 14 64-bit DSP,
-+>>18	leshort		79		LSI Logic 16-bit DSP,
-+>>18	leshort		80		MMIX,
-+>>18	leshort		81		Harvard machine-independent,
-+>>18	leshort		82		SiTera Prism,
-+>>18	leshort		83		Atmel AVR 8-bit,
-+>>18	leshort		84		Fujitsu FR30,
-+>>18	leshort		85		Mitsubishi D10V,
-+>>18	leshort		86		Mitsubishi D30V,
-+>>18	leshort		87		NEC v850,
- >>18	leshort		88		Renesas M32R,
-+>>18	leshort		89		Matsushita MN10300,
-+>>18	leshort		90		Matsushita MN10200,
-+>>18	leshort		91		picoJava,
- >>18	leshort		92		OpenRISC,
-+>>18	leshort		93		ARC Cores Tangent-A5,
- >>18	leshort		0x3426		OpenRISC (obsolete),
- >>18	leshort		0x8472		OpenRISC (obsolete),
- >>18	leshort		94		Tensilica Xtensa,

debian/patches/208-magic-update-hp.dpatch

@@ -1,105 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 208-magic-update-hp.dpatch by Michael Piefel <piefel@debian.org>
-##
-## DP: Updated HP 38/39/40/48/49 magic (closes: #326680).
-
-@DPATCH@
-
-diff -Naur file-4.20.orig/magic/Magdir/hp file-4.20/magic/Magdir/hp
---- file-4.20.orig/magic/Magdir/hp	2003-02-08 18:30:39.000000000 +0000
-+++ file-4.20/magic/Magdir/hp	2007-04-03 12:48:02.000000000 +0000
-@@ -203,33 +203,36 @@
- >8	long		>0		%d messages
- 
- # addendum to /etc/magic with HP-48sx file-types by phk@data.fls.dk 1jan92
--0	string		HPHP48-		HP48 binary
-->7	byte		>0		- Rev %c
-->8	beshort		0x1129		(ADR)
-->8	beshort		0x3329		(REAL)
-->8	beshort		0x5529		(LREAL)
-->8	beshort		0x7729		(COMPLX)
-->8	beshort		0x9d29		(LCOMPLX)
-->8	beshort		0xbf29		(CHAR)
-->8	beshort		0xe829		(ARRAY)
-->8	beshort		0x0a2a		(LNKARRAY)
-->8	beshort		0x2c2a		(STRING)
-->8	beshort		0x4e2a		(HXS)
-->8	beshort		0x742a		(LIST)
-->8	beshort		0x962a		(DIR)
-->8	beshort		0xb82a		(ALG)
-->8	beshort		0xda2a		(UNIT)
-->8	beshort		0xfc2a		(TAGGED)
-->8	beshort		0x1e2b		(GROB)
-->8	beshort		0x402b		(LIB)
-->8	beshort		0x622b		(BACKUP)
-->8	beshort		0x882b		(LIBDATA)
-->8	beshort		0x9d2d		(PROG)
-->8	beshort		0xcc2d		(CODE)
-->8	beshort		0x482e		(GNAME)
-->8	beshort		0x6d2e		(LNAME)
-->8	beshort		0x922e		(XLIB)
--0	string		%%HP:		HP48 text
-+0	string		HPHP4		HP
-+>5	string		8		48 binary
-+>5	string		9		49 binary
-+>7	byte		>64		- Rev %c
-+>8	leshort		0x2911		(ADR)
-+>8	leshort		0x2933		(REAL)
-+>8	leshort		0x2955		(LREAL)
-+>8	leshort		0x2977		(COMPLX)
-+>8	leshort		0x299d		(LCOMPLX)
-+>8	leshort		0x29bf		(CHAR)
-+>8	leshort		0x29e8		(ARRAY)
-+>8	leshort		0x2a0a		(LNKARRAY)
-+>8	leshort		0x2a2c		(STRING)
-+>8	leshort		0x2a4e		(HXS)
-+>8	leshort		0x2a74		(LIST)
-+>8	leshort		0x2a96		(DIR)
-+>8	leshort		0x2ab8		(ALG)
-+>8	leshort		0x2ada		(UNIT)
-+>8	leshort		0x2afc		(TAGGED)
-+>8	leshort		0x2b1e		(GROB)
-+>8	leshort		0x2b40		(LIB)
-+>8	leshort		0x2b62		(BACKUP)
-+>8	leshort		0x2b88		(LIBDATA)
-+>8	leshort		0x2d9d		(PROG)
-+>8	leshort		0x2dcc		(CODE)
-+>8	leshort		0x2e48		(GNAME)
-+>8	leshort		0x2e6d		(LNAME)
-+>8	leshort		0x2e92		(XLIB)
-+
-+0	string		%%HP:		HP text
- >6	string		T(0)		- T(0)
- >6	string		T(1)		- T(1)
- >6	string		T(2)		- T(2)
-@@ -240,6 +243,23 @@
- >14	string		F(.)		F(.);
- >14	string		F(,)		F(,);
- 
-+0	string		HP3		HP
-+>3	string		8		38
-+>3	string		9		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
-@@ -391,5 +411,5 @@
- >>>>>>>>>0xC4	belong	34		- received SIGXFSZ
- 
- # From: AMAKAWA Shuhei <sa264@cam.ac.uk>
--0	string	HPHP49-			HP49 binary
-+#0	string	HPHP49-			HP49 binary
- 

debian/patches/209-magic-update-jpeg.dpatch

@@ -1,19 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 209-magic-update-jpeg.dpatch by Mathieu Malaterre <mathieu.malaterre@gmail.com>
-##
-## DP: Extends JPEG 2000 magic (Closes: #439005).
-
-@DPATCH@
-
-diff -Naur file-4.21.orig/magic/Magdir/jpeg file-4.21/magic/Magdir/jpeg
---- file-4.21.orig/magic/Magdir/jpeg	2004-07-24 20:38:55.000000000 +0000
-+++ file-4.21/magic/Magdir/jpeg	2007-08-26 08:12:23.000000000 +0000
-@@ -153,3 +153,8 @@
- 
- # From: David Santinoli <david@santinoli.com>
- 0	string		\x00\x00\x00\x0C\x6A\x50\x20\x20\x0D\x0A\x87\x0A	JPEG 2000 image data
-+
-+# Type: JPEG 2000 codesream
-+# From: Mathieu Malaterre <mathieu.malaterre@gmail.com>
-+0	belong		0xff4fff51						JPEG 2000 codestream
-+45	beshort		0xff52

debian/patches/210-magic-update-m4v.dpatch

@@ -1,29 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 209-magic-update-m4v.dpatch by Nigel McNie <nigel@mcnie.name>
-##
-## DP: Detect m4v files as m4v instead of mp4 (Closes: #384018).
-
-@DPATCH@
-
-diff -Naurp file-4.23.orig/magic/Magdir/animation file-4.23/magic/Magdir/animation
---- file-4.23.orig/magic/Magdir/animation	2007-11-08 00:28:03.000000000 +0000
-+++ file-4.23/magic/Magdir/animation	2008-01-12 16:42:17.000000000 +0000
-@@ -36,6 +36,7 @@
- >8	string		mmp4		\b, MPEG v4 system, 3GPP Mobile
- >8	string		avc1		\b, MPEG v4 system, 3GPP JVT AVC
- >8	string/B	M4A		\b, MPEG v4 system, iTunes AAC-LC
-+>8	string/B	M4V		\b, MPEG v4 system, iTunes AVC-LC
- >8	string/B	M4P		\b, MPEG v4 system, iTunes AES encrypted
- >8	string/B	M4B		\b, MPEG v4 system, iTunes bookmarked
- >8	string/B	qt		\b, Apple QuickTime movie
-diff -Naurp file-4.23.orig/magic/magic.mime file-4.23/magic/magic.mime
---- file-4.23.orig/magic/magic.mime	2007-12-27 16:19:37.000000000 +0000
-+++ file-4.23/magic/magic.mime	2008-01-12 16:42:17.000000000 +0000
-@@ -672,6 +672,7 @@
- >8      string          avc1          video/3gpp
- >8	string		mmp4	      video/mp4
- >8	string/B	M4A	      audio/mp4
-+>8	string/B	M4V	      video/mp4
- >8	string/B	qt	      video/quicktime
- # The contributor claims:
- #   I couldn't find a real magic number for these, however, this

debian/patches/211-magic-update-macintosh.dpatch

@@ -1,44 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 210-magic-update-macintosh.dpatch by Josef Spillner <2005@kuarepoti-dju.net>
-##
-## DP: Extend HFS+ partition table detection (Closes: #405313).
-
-@DPATCH@
-
-diff -Naur file-4.20.orig/magic/Magdir/macintosh file-4.20/magic/Magdir/macintosh
---- file-4.20.orig/magic/Magdir/macintosh	2005-01-19 17:56:21.000000000 +0000
-+++ file-4.20/magic/Magdir/macintosh	2007-05-17 17:18:23.000000000 +0000
-@@ -321,7 +321,7 @@
- # cstring. Of course, partitions can contain more than four entries, but 
- # what're you gonna do?
- 0x200		beshort		0x504D		Apple Partition data
-->0x2		beshort		x		block size: %d,
-+>0x2		beshort		x		(block size: %d):
- >0x230		string		x		first type: %s,
- >0x210		string		x		name: %s,
- >0x254		belong		x		number of blocks: %d,
-@@ -329,14 +329,22 @@
- >>0x430		string		x		second type: %s,
- >>0x410		string		x		name: %s,
- >>0x454		belong		x		number of blocks: %d,
-+>>0x600		beshort		0x504D
-+>>>0x630	string		x		third type: %s,
-+>>>0x610	string		x		name: %s,
-+>>>0x654	belong		x		number of blocks: %d,
- >>0x800		beshort		0x504D		
-->>>0x830	string		x		third type: %s,
-+>>>0x830	string		x		fourth type: %s,
- >>>0x810	string		x		name: %s,
- >>>0x854	belong		x		number of blocks: %d,
- >>>0xa00	beshort		0x504D		
-->>>>0xa30	string		x		fourth type: %s,
-+>>>>0xa30	string		x		fifth type: %s,
- >>>>0xa10	string		x		name: %s,
- >>>>0xa54	belong		x		number of blocks: %d
-+>>>0xc00	beshort		0x504D
-+>>>>0xc30	string		x		sixth type: %s,
-+>>>>0xc10	string		x		name: %s,
-+>>>>0xc54	belong		x		number of blocks: %d
- # AFAIK, only the signature is different
- 0x200		beshort		0x5453		Apple Old Partition data
- >0x2		beshort		x		block size: %d,

debian/patches/213-magic-update-pcp.dpatch

@@ -1,43 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 212-magic-update-pcp.dpatch by Werner Fink <werner@suse.de>
-##
-## DP: Correct PCP entries.
-
-@DPATCH@
-
-diff -Naurp file-4.23.orig/magic/Magdir/sgi file-4.23/magic/Magdir/sgi
---- file-4.23.orig/magic/Magdir/sgi	2007-09-26 20:23:49.000000000 +0000
-+++ file-4.23/magic/Magdir/sgi	2008-01-12 16:47:49.000000000 +0000
-@@ -8,12 +8,17 @@
- 0	string	PmNs				PCP compiled namespace (V.0)
- 0	string	PmN				PCP compiled namespace
- >3	string	>\0				(V.%1.1s)
--3	lelong	0x84500526			PCP archive
-+#3	lelong	0x84500526			PCP archive
-+3	belong	0x84500526			PCP archive
- >7	byte	x				(V.%d)
-->20	lelong	-2				temporal index
-->20	lelong	-1				metadata
-->20	lelong	0				log volume #0
-->20	lelong	>0				log volume #%ld
-+#>20	lelong	-2				temporal index
-+#>20	lelong	-1				metadata
-+#>20	lelong	0				log volume #0
-+#>20	lelong	>0				log volume #%ld
-+>20	belong	-2				temporal index
-+>20	belong	-1				metadata
-+>20	belong	0				log volume #0
-+>20	belong	>0				log volume #%ld
- >24	string	>\0				host: %s
- 0	string	PCPFolio			PCP
- >9	string	Version:			Archive Folio
-@@ -30,6 +35,9 @@
- 0	string	#pmlogger			PCP pmlogger config
- >10	string	Version
- >18	string	>\0				(V%1.1s)
-+0	string	#pmdahotproc			PCP pmdahotproc config
-+>13	string	Version
-+>21	string	>\0				(V%-3.3s)
- 0	string	PcPh				PCP Help
- >4	string	1				Index
- >4	string	2				Text

debian/patches/214-magic-update-perl.dpatch

@@ -1,21 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 213-magic-update-perl.dpatch by Michael Piefel <piefel@debian.org>
-##
-## DP: Make Perl script entries consistent (closes: #394523).
-
-@DPATCH@
-
-diff -Naur file-4.20.orig/magic/Magdir/perl file-4.20/magic/Magdir/perl
---- file-4.20.orig/magic/Magdir/perl	2007-03-01 23:20:19.000000000 +0000
-+++ file-4.20/magic/Magdir/perl	2007-03-27 12:23:14.000000000 +0000
-@@ -9,8 +9,8 @@
- 0	string		eval\ "exec\ /bin/perl		perl script text
- 0	string/b	#!\ /usr/bin/perl		perl script text executable
- 0	string		eval\ "exec\ /usr/bin/perl	perl script text
--0	string/b	#!\ /usr/local/bin/perl		perl script text
--0	string		eval\ "exec\ /usr/local/bin/perl	perl script text executable
-+0	string/b	#!\ /usr/local/bin/perl		perl script text executable
-+0	string		eval\ "exec\ /usr/local/bin/perl	perl script text
- 0	string		eval\ '(exit\ $?0)'\ &&\ eval\ 'exec	perl script text
- 
- 

debian/patches/215-magic-update-sh.dpatch

@@ -1,19 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 214-magic-update-sh.dpatch by Mark Hindley <mark@hindley.org.uk>
-##
-## DP: Changing sh identifier from Bourne to POSIX (Closes: #368613).
-
-@DPATCH@
-
-diff -Naur file-4.20.orig/magic/Magdir/commands file-4.20/magic/Magdir/commands
---- file-4.20.orig/magic/Magdir/commands	2007-01-19 19:28:01.000000000 +0000
-+++ file-4.20/magic/Magdir/commands	2007-03-27 15:48:37.000000000 +0000
-@@ -3,7 +3,7 @@
- # commands:  file(1) magic for various shells and interpreters
- #
- 0	string		:			shell archive or script for antique kernel text
--0	string/b	#!\ /bin/sh		Bourne shell script text executable
-+0	string/b	#!\ /bin/sh		POSIX shell script text executable
- 0	string/b	#!\ /bin/csh		C shell script text executable
- # korn shell magic, sent by George Wu, gwu@clyde.att.com
- 0	string/b	#!\ /bin/ksh		Korn shell script text executable

debian/patches/216-magic-update-spectrum.dpatch

@@ -1,33 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 215-magic-update-spectrum.dpatch by Philip Kendall <pak21@srcf.ucam.org>
-##
-## DP: Adding additional magics (Closes: #296202).
-
-@DPATCH@
-
-diff -Naur file-4.20.orig/magic/Magdir/spectrum file-4.20/magic/Magdir/spectrum
---- file-4.20.orig/magic/Magdir/spectrum	2003-05-23 21:05:59.000000000 +0000
-+++ file-4.20/magic/Magdir/spectrum	2007-03-27 16:55:24.000000000 +0000
-@@ -31,14 +31,19 @@
- # TZX tape images
- 0      string          ZXTape!\x1a     Spectrum .TZX data
- >8     byte            x               version %d
-->9     byte            x               .%d
-+>9     byte            x               \b.%d
- 
- # RZX input recording files
- 0      string          RZX!            Spectrum .RZX data
- >4     byte            x               version %d
-->5     byte            x               .%d
-+>5     byte            x               \b.%d
- 
--# And three sorts of disk image
-+# Floppy disk images
- 0      string          MV\ -\ CPCEMU\ Disk-Fil Amstrad/Spectrum .DSK data
- 0      string          MV\ -\ CPC\ format\ Dis Amstrad/Spectrum DU54 .DSK data
- 0      string          EXTENDED\ CPC\ DSK\ Fil Amstrad/Spectrum Extended .DSK data
-+0      string          SINCLAIR        Spectrum .SCL Betadisk image
-+
-+# Hard disk images
-+0      string          RS-IDE\x1a      Spectrum .HDF hard disk image
-+>7     byte            x               \b, version 0x%02x

debian/patches/301-magic-add-adf.dpatch

@@ -1,18 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 301-magic-add-adf.dpatch by Nicolas Chauvat <nicolas.chauvat@logilab.fr>
-##
-## DP: New magic for the CGNS Advnaced Data Format (Closes: #242644).
-
-@DPATCH@
-
-diff -Naurp file-4.23.orig/magic/Magdir/database file-4.23/magic/Magdir/database
---- file-4.23.orig/magic/Magdir/database	2007-07-01 23:43:03.000000000 +0000
-+++ file-4.23/magic/Magdir/database	2008-01-12 16:49:28.000000000 +0000
-@@ -220,3 +220,7 @@
- >5	beshort		>0x100
- >>7	byte		x		\b-%d
- 
-+# Type: Advanced Data Format (ADF) database
-+# URL:  http://www.grc.nasa.gov/WWW/cgns/adf/
-+# From: Nicolas Chauvat <nicolas.chauvat@logilab.fr>
-+0	string	@(#)ADF\ Database	CGNS Advanced Data Format

debian/patches/302-magic-add-apple2.dpatch

@@ -1,34 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 303-magic-add-apple2.dpatch by Radek Vokal <rvokal@redhat.com>
-##
-## DP: Adds new magic for Apple Emulator 2IMG format.
-
-@DPATCH@
-
-diff -Naur file-4.20.orig/magic/Magdir/apple file-4.20/magic/Magdir/apple
---- file-4.20.orig/magic/Magdir/apple	2006-03-02 22:10:26.000000000 +0000
-+++ file-4.20/magic/Magdir/apple	2007-04-03 14:03:21.000000000 +0000
-@@ -10,6 +10,23 @@
- 0	belong		0x00051600		AppleSingle encoded Macintosh file
- 0	belong		0x00051607		AppleDouble encoded Macintosh file
- 
-+# Type: Apple Emulator 2IMG format
-+# From: Radek Vokal <rvokal@redhat.com>
-+0	string		2IMG	Apple ][ 2IMG Disk Image
-+>4	string		XGS!	\b, XGS
-+>4	string		CTKG	\b, Catakig
-+>4	string		ShIm	\b, Sheppy's ImageMaker
-+>4	string		WOOF	\b, Sweet 16
-+>4	string		B2TR	\b, Bernie ][ the Rescue
-+>4	string		!nfc	\b, ASIMOV2
-+>4	string		x	\b, Unknown Format
-+>0xc	byte		00	\b, DOS 3.3 sector order
-+>>0x10	byte		00	\b, Volume 254
-+>>0x10	byte&0x7f	x	\b, Volume %u
-+>0xc	byte		01	\b, ProDOS sector order
-+>>0x14	short		x	\b, %u Blocks
-+>0xc	byte		02	\b, NIB data
-+
- # magic for Newton PDA package formats
- # from Ruda Moura <ruda@helllabs.org>
- 0	string	package0	Newton package, NOS 1.x,

debian/patches/303-magic-add-arm.dpatch

@@ -1,18 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 304-magic-add-arm.dpatch by Russell Coker <russell@coker.com.au>
-##
-## DP: New magic for Adaptive Multi-Rate Codec files (Closes: #279322).
-
-@DPATCH@
-
-diff -Naurp file-4.23.orig/magic/Magdir/audio file-4.23/magic/Magdir/audio
---- file-4.23.orig/magic/Magdir/audio	2007-11-02 15:51:38.000000000 +0000
-+++ file-4.23/magic/Magdir/audio	2008-01-12 16:50:30.000000000 +0000
-@@ -563,3 +563,7 @@
- # From: "Leslie P. Polzer" <leslie.polzer@gmx.net>
- 60	string	SONG		SoundFX Module sound file
- 
-+# Type: Adaptive Multi-Rate Codec
-+# URL:  http://filext.com/detaillist.php?extdetail=AMR
-+# From: Russell Coker <russell@coker.com.au>
-+0	string	#!AMR		Adaptive Multi-Rate Codec (GSM telephony)

debian/patches/304-magic-add-avg.dpatch

@@ -1,18 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 305-magic-add-avg.dpatch by David Newgas <david@newgas.net>
-##
-## DP: New magic for the AVG vault files (Closes: #381053).
-
-@DPATCH@
-
-diff -Naur file-4.20.orig/magic/Magdir/fsav file-4.20/magic/Magdir/fsav
---- file-4.20.orig/magic/Magdir/fsav	2006-03-02 22:10:26.000000000 +0000
-+++ file-4.20/magic/Magdir/fsav	2007-04-03 15:42:06.000000000 +0000
-@@ -58,3 +58,7 @@
- >>>>769	string		ustar\0		\b, tared
- >512	string		\037\213	\b, gzipped
- >769	string		ustar\0		\b, tared
-+
-+# Type: Grisoft AVG AntiVirus
-+# From: David Newgas <david@newgas.net>
-+0	string	AVG7_ANTIVIRUS_VAULT_FILE	AVG 7 Antivirus vault file data

debian/patches/305-magic-add-clarion.dpatch

@@ -1,56 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 306-magic-add-clarion.dpatch by Julien Blache <jblache@debian.org>
-##
-## DP: New magic for the Clarion files (Closes: #282680).
-
-@DPATCH@
-
-diff -Naurp file-4.23.orig/magic/Magdir/clarion file-4.23/magic/Magdir/clarion
---- file-4.23.orig/magic/Magdir/clarion	1970-01-01 00:00:00.000000000 +0000
-+++ file-4.23/magic/Magdir/clarion	2008-01-12 16:51:53.000000000 +0000
-@@ -0,0 +1,23 @@
-+# Type: Clarion Personal/Professional Developer (v2 and above)
-+# From: Julien Blache <jb@jblache.org>
-+
-+# Database files
-+# signature
-+0	leshort	0x3343	Clarion Personal/Professional Developer (v2 and above) data file
-+# attributes
-+>2	leshort	&0x0001	\b, locked
-+>2	leshort	&0x0004	\b, encrypted
-+>2	leshort	&0x0008	\b, memo file exists
-+>2	leshort	&0x0010	\b, compressed
-+>2	leshort	&0x0040	\b, read only
-+# number of records
-+>5	lelong	x	\b, %ld records
-+
-+# Memo files
-+0	leshort	0x334d	Clarion Personal/Professional Developer (v2 and above) memo data
-+
-+# Key/Index files
-+# No magic? :(
-+
-+# Help files
-+0	leshort	0x49e0	Clarion Personal/Professional Developer (v2 and above) help data
-diff -Naurp file-4.23.orig/magic/Makefile.am file-4.23/magic/Makefile.am
---- file-4.23.orig/magic/Makefile.am	2007-11-07 22:09:58.000000000 +0000
-+++ file-4.23/magic/Makefile.am	2008-01-12 16:51:53.000000000 +0000
-@@ -60,6 +60,7 @@ Magdir/chord \
- Magdir/cisco \
- Magdir/citrus \
- Magdir/claris \
-+Magdir/clarion \
- Magdir/clipper \
- Magdir/cracklib \
- Magdir/spec \
-diff -Naurp file-4.23.orig/magic/Makefile.in file-4.23/magic/Makefile.in
---- file-4.23.orig/magic/Makefile.in	2007-12-28 20:35:02.000000000 +0000
-+++ file-4.23/magic/Makefile.in	2008-01-12 16:51:53.000000000 +0000
-@@ -199,6 +199,7 @@ Magdir/chord \
- Magdir/cisco \
- Magdir/citrus \
- Magdir/claris \
-+Magdir/clarion \
- Magdir/clipper \
- Magdir/cracklib \
- Magdir/spec \

debian/patches/306-magic-add-dds.dpatch

@@ -1,21 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 307-magic-add-dds.dpatch from Morten Hustveit <morten@debian.org>
-##
-## DP: New magic for DirectDraw Surface files (Closes: #276133).
-
-@DPATCH@
-
-diff -Naurp file-4.23.orig/magic/Magdir/msdos file-4.23/magic/Magdir/msdos
---- file-4.23.orig/magic/Magdir/msdos	2007-12-28 15:14:13.000000000 +0000
-+++ file-4.23/magic/Magdir/msdos	2008-01-12 16:53:00.000000000 +0000
-@@ -663,3 +663,10 @@
- >23	string Dell			%s system BIOS
- >48	string x			version %.3s
- 
-+# Type: Microsoft DirectDraw Surface
-+# URL:  http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c/directx/graphics/reference/DDSFileReference/ddsfileformat.asp
-+# From: Morten Hustveit <morten@debian.org>
-+0	string	DDS\040\174\000\000\000	Microsoft DirectDraw Surface (DDS),
-+>16	lelong	>0			%hd x
-+>12	lelong	>0			%hd,
-+>84	string	x			%.4s

debian/patches/307-magic-add-erlang.dpatch

@@ -1,49 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 308-magic-add-erlang.dpatch
-##
-## DP: New magic for Erlang BEAM and JAM files (Closes: #388356).
-
-@DPATCH@
-
-diff -Naurp file-4.23.orig/magic/Magdir/erlang file-4.23/magic/Magdir/erlang
---- file-4.23.orig/magic/Magdir/erlang	1970-01-01 00:00:00.000000000 +0000
-+++ file-4.23/magic/Magdir/erlang	2008-01-12 16:55:58.000000000 +0000
-@@ -0,0 +1,16 @@
-+# Type: Erlang JAM and BEAM files
-+# URL:  http://www.erlang.org/faq/x779.html#AEN812
-+
-+# OTP R3-R4
-+0	string	\0177BEAM!	Old Erlang BEAM file
-+>6	short	>0		- version %d
-+
-+# OTP R5 and onwards
-+0	string	FOR1
-+>8	string	BEAM		Erlang BEAM file
-+
-+# 4.2 version may have a copyright notice!
-+4	string	Tue Jan 22 14:32:44 MET 1991	Erlang JAM file - version 4.2
-+79	string	Tue Jan 22 14:32:44 MET 1991	Erlang JAM file - version 4.2
-+
-+4	string	1.0 Fri Feb 3 09:55:56 MET 1995	Erlang JAM file - version 4.3
-diff -Naurp file-4.23.orig/magic/Makefile.am file-4.23/magic/Makefile.am
---- file-4.23.orig/magic/Makefile.am	2008-01-12 16:55:37.000000000 +0000
-+++ file-4.23/magic/Makefile.am	2008-01-12 16:55:58.000000000 +0000
-@@ -82,6 +82,7 @@ Magdir/efi \
- Magdir/elf \
- Magdir/encore \
- Magdir/epoc \
-+Magdir/erlang \
- Magdir/esri \
- Magdir/fcs \
- Magdir/filesystems \
-diff -Naurp file-4.23.orig/magic/Makefile.in file-4.23/magic/Makefile.in
---- file-4.23.orig/magic/Makefile.in	2008-01-12 16:55:37.000000000 +0000
-+++ file-4.23/magic/Makefile.in	2008-01-12 16:55:58.000000000 +0000
-@@ -221,6 +221,7 @@ Magdir/efi \
- Magdir/elf \
- Magdir/encore \
- Magdir/epoc \
-+Magdir/erlang \
- Magdir/esri \
- Magdir/fcs \
- Magdir/filesystems \

debian/patches/308-magic-add-gedcom.dpatch

@@ -1,22 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 309-magic-add-gedcom.dpatch by Phil Endecott <phil05@chezphil.org>
-##
-## DP: New magic for GEDCOME genealogical data files (Closes: #277339).
-
-@DPATCH@
-
-diff -Naur file-4.20.orig/magic/Magdir/scientific file-4.20/magic/Magdir/scientific
---- file-4.20.orig/magic/Magdir/scientific	2005-08-18 15:52:56.000000000 +0000
-+++ file-4.20/magic/Magdir/scientific	2007-04-03 16:29:26.000000000 +0000
-@@ -58,3 +58,11 @@
- >1104	ulong	>0		%d x
- >1108	ulong	>0		%d,
- >1120	ulong	>0		%d bits/pixel
-+
-+# Type: GEDCOME genealogical (family history) data
-+# From: Phil Endecott <phil05@chezphil.org>
-+0	string	0\ HEAD								GEDCOM text
-+0	string	\000\060\000\040\000\110\000\105\000\101\000\104		GEDCOM text
-+0	string	\060\000\040\000\110\000\105\000\101\000\104\000		GEDCOM text
-+0	string	\376\377\000\060\000\040\000\110\000\105\000\101\000\104	GEDCOM text
-+0	string	\377\376\060\000\040\000\110\000\105\000\101\000\104\000	GEDCOM text

debian/patches/309-magic-add-git.dpatch

@@ -1,18 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 309-magic-add-git.dpatch by Josh Triplett <josh@freedesktop.org>
-##
-## DP: New magic for Git bundles (Closes: #430070).
-
-@DPATCH@
-
-diff -Naur file-4.21.orig/magic/Magdir/revision file-4.21/magic/Magdir/revision
---- file-4.21.orig/magic/Magdir/revision	2007-04-09 16:33:07.000000000 +0000
-+++ file-4.21/magic/Magdir/revision	2007-08-26 08:05:22.000000000 +0000
-@@ -7,3 +7,7 @@
- # Conary changesets
- # From: Jonathan Smith <smithj@rpath.com>
- 0	belong	0xea3f81bb	Conary changeset data
-+
-+# Type: Git bundles (git-bundle)
-+# From: Josh Triplett <josh@freedesktop.org>
-+0	string	#\ v2\ git\ bundle\n	Git bundle

debian/patches/309-magic-add-inform.dpatch

@@ -1,53 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 310-magic-add-inform.dpatch by Reuben Thomas <rrt@sc3d.org>
-##
-## DP: New magic for the Inform interactive fiction language (Closes: #394522).
-
-@DPATCH@
-
-diff -Naurp file-4.23.orig/magic/Magdir/inform file-4.23/magic/Magdir/inform
---- file-4.23.orig/magic/Magdir/inform	1970-01-01 00:00:00.000000000 +0000
-+++ file-4.23/magic/Magdir/inform	2008-01-12 16:57:33.000000000 +0000
-@@ -0,0 +1,5 @@
-+# Type: Inform interactive fiction language
-+# URL:  http://www.inform-fiction.org/
-+# From: Reuben Thomas <rrt@sc3d.org>
-+
-+0	regex	[Cc]onstant[[:space:]]+[Ss]tory	Inform source text
-diff -Naurp file-4.23.orig/magic/Makefile.am file-4.23/magic/Makefile.am
---- file-4.23.orig/magic/Makefile.am	2008-01-12 16:56:46.000000000 +0000
-+++ file-4.23/magic/Makefile.am	2008-01-12 16:57:33.000000000 +0000
-@@ -106,6 +106,7 @@ Magdir/ibm370 \
- Magdir/ibm6000 \
- Magdir/iff \
- Magdir/images \
-+Magdir/inform \
- Magdir/intel \
- Magdir/interleaf \
- Magdir/island \
-diff -Naurp file-4.23.orig/magic/Makefile.in file-4.23/magic/Makefile.in
---- file-4.23.orig/magic/Makefile.in	2008-01-12 16:56:46.000000000 +0000
-+++ file-4.23/magic/Makefile.in	2008-01-12 16:57:33.000000000 +0000
-@@ -245,6 +245,7 @@ Magdir/ibm370 \
- Magdir/ibm6000 \
- Magdir/iff \
- Magdir/images \
-+Magdir/inform \
- Magdir/intel \
- Magdir/interleaf \
- Magdir/island \
-diff -Naurp file-4.23.orig/magic/magic.mime file-4.23/magic/magic.mime
---- file-4.23.orig/magic/magic.mime	2008-01-12 16:56:44.000000000 +0000
-+++ file-4.23/magic/magic.mime	2008-01-12 16:57:33.000000000 +0000
-@@ -629,6 +629,11 @@
- 0	search/400	\\chapter	text/x-tex
- 0	search/400	\\documentclass	text/x-tex
- 
-+# Type: Inform interactive fiction language
-+# URL:  http://www.inform-fiction.org/
-+# From: Reuben Thomas <rrt@sc3d.org>
-+0	regex		[Cc]onstant[[:space:]]+[Ss]tory	text/x-inform
-+
- #------------------------------------------------------------------------------
- # animation:  file(1) magic for animation/movie formats
- #

debian/patches/310-magic-add-llvm.dpatch

@@ -1,41 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 311-magic-add-llvm.dpatch by Al Stone <ahs3@debian.org>
-##
-## DP: New magic for the LLVM byte-codes (Closes: #293427).
-
-@DPATCH@
-
-diff -Naurp file-4.23.orig/magic/Magdir/llvm file-4.23/magic/Magdir/llvm
---- file-4.23.orig/magic/Magdir/llvm	1970-01-01 00:00:00.000000000 +0000
-+++ file-4.23/magic/Magdir/llvm	2008-01-12 16:59:31.000000000 +0000
-@@ -0,0 +1,8 @@
-+# Type: LLVM byte-codes
-+# URL:  http://llvm.cs.uiuc.edu/docs/BytecodeFormat.html#signature
-+# From: Al Stone <ahs3@fc.hp.com>
-+
-+0	string	llvm	LLVM byte-codes, uncompressed
-+0	string	llvc0	LLVM byte-codes, null compression
-+0	string	llvc1	LLVM byte-codes, gzip compression
-+0	string	llvc2	LLVM byte-codes, bzip2 compression
-diff -Naurp file-4.23.orig/magic/Makefile.am file-4.23/magic/Makefile.am
---- file-4.23.orig/magic/Makefile.am	2008-01-12 16:59:23.000000000 +0000
-+++ file-4.23/magic/Makefile.am	2008-01-12 16:59:31.000000000 +0000
-@@ -119,6 +119,7 @@ Magdir/lex \
- Magdir/lif \
- Magdir/linux \
- Magdir/lisp \
-+Magdir/llvm \
- Magdir/mach \
- Magdir/macintosh \
- Magdir/magic \
-diff -Naurp file-4.23.orig/magic/Makefile.in file-4.23/magic/Makefile.in
---- file-4.23.orig/magic/Makefile.in	2008-01-12 16:59:23.000000000 +0000
-+++ file-4.23/magic/Makefile.in	2008-01-12 16:59:31.000000000 +0000
-@@ -258,6 +258,7 @@ Magdir/lex \
- Magdir/lif \
- Magdir/linux \
- Magdir/lisp \
-+Magdir/llvm \
- Magdir/mach \
- Magdir/macintosh \
- Magdir/magic \

debian/patches/311-magic-add-lua.dpatch

@@ -1,66 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 312-magic-add-lua.dpatch by Reuben Thomas <rrt@sc3d.org> and
-## Seo Sanghyeon <tinuviel@sparcs.kaist.ac.kr>
-##
-## DP: New magic for the Lua scripting language (Closes: #394524).
-
-@DPATCH@
-
-diff -Naurp file-4.23.orig/magic/Magdir/lua file-4.23/magic/Magdir/lua
---- file-4.23.orig/magic/Magdir/lua	1970-01-01 00:00:00.000000000 +0000
-+++ file-4.23/magic/Magdir/lua	2008-01-12 17:01:09.000000000 +0000
-@@ -0,0 +1,14 @@
-+# Type: Lua scripting language
-+# URL:  http://www.lua.org/
-+# From: Reuben Thomas <rrt@sc3d.org>, Seo Sanghyeon <tinuviel@sparcs.kaist.ac.kr>
-+
-+# Lua scripts
-+0	string/b	#!\ /usr/bin/lua	Lua script text executable
-+0	string/b	#!\ /usr/local/bin/lua	Lua script text executable
-+0	string		#!/usr/bin/env\ lua	Lua script text executable
-+0	string		#!\ /usr/bin/env\ lua	Lua script text executable
-+
-+# Lua bytecode
-+0	string		\033Lua			Lua bytecode,
-+>4	byte		0x50			version 5.0
-+>4	byte		0x51			version 5.1
-diff -Naurp file-4.23.orig/magic/Makefile.am file-4.23/magic/Makefile.am
---- file-4.23.orig/magic/Makefile.am	2008-01-12 17:00:34.000000000 +0000
-+++ file-4.23/magic/Makefile.am	2008-01-12 17:01:09.000000000 +0000
-@@ -120,6 +120,7 @@ Magdir/lif \
- Magdir/linux \
- Magdir/lisp \
- Magdir/llvm \
-+Magdir/lua \
- Magdir/mach \
- Magdir/macintosh \
- Magdir/magic \
-diff -Naurp file-4.23.orig/magic/Makefile.in file-4.23/magic/Makefile.in
---- file-4.23.orig/magic/Makefile.in	2008-01-12 17:00:34.000000000 +0000
-+++ file-4.23/magic/Makefile.in	2008-01-12 17:01:09.000000000 +0000
-@@ -259,6 +259,7 @@ Magdir/lif \
- Magdir/linux \
- Magdir/lisp \
- Magdir/llvm \
-+Magdir/lua \
- Magdir/mach \
- Magdir/macintosh \
- Magdir/magic \
-diff -Naurp file-4.23.orig/magic/magic.mime file-4.23/magic/magic.mime
---- file-4.23.orig/magic/magic.mime	2008-01-12 17:00:33.000000000 +0000
-+++ file-4.23/magic/magic.mime	2008-01-12 17:01:09.000000000 +0000
-@@ -314,6 +314,14 @@
- 0       string          #!\ /usr/local/bin/perl         application/x-perl
- 0       string          eval\ "exec\ /usr/local/bin/perl application/x-perl
- 
-+# Type: Lua scripting language
-+# URL:  http://www.lua.org/
-+# From: Reuben Thomas <rrt@sc3d.org>
-+0	string/B	#!\ /usr/bin/lua	application/x-lua
-+0	string/B	#!\ /usr/local/bin/lua	application/x-lua
-+0	string		#!/usr/bin/env\ lua	application/x-lua
-+0	string		#!\ /usr/bin/env\ lua	application/x-lua
-+
- #------------------------------------------------------------------------------
- # compress:  file(1) magic for pure-compression formats (no archives)
- #

debian/patches/312-magic-add-luks.dpatch

@@ -1,43 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 313-magic-add-luks.dpatch by Anthon van der Neut <anthon@mnt.org>
-##
-## DP: New magic for the Linux Unified Key Setup (Closes: #394246).
-
-@DPATCH@
-
-diff -Naurp file-4.23.orig/magic/Magdir/luks file-4.23/magic/Magdir/luks
---- file-4.23.orig/magic/Magdir/luks	1970-01-01 00:00:00.000000000 +0000
-+++ file-4.23/magic/Magdir/luks	2008-01-12 17:03:02.000000000 +0000
-@@ -0,0 +1,10 @@
-+# Type:	Linux Unified Key Setup
-+# URL:	http://luks.endorphin.org/spec
-+# From:	Anthon van der Neut <anthon@mnt.org>
-+
-+0	string		LUKS\xba\xbe	LUKS encrypted file,
-+>6	beshort		x		ver %d
-+>8	string		x		[%s,
-+>40	string		x		%s,
-+>72	string		x		%s]
-+>168	string		x		UUID: %s
-diff -Naurp file-4.23.orig/magic/Makefile.am file-4.23/magic/Makefile.am
---- file-4.23.orig/magic/Makefile.am	2008-01-12 17:03:36.000000000 +0000
-+++ file-4.23/magic/Makefile.am	2008-01-12 17:03:02.000000000 +0000
-@@ -121,6 +121,7 @@ Magdir/linux \
- Magdir/lisp \
- Magdir/llvm \
- Magdir/lua \
-+Magdir/luks \
- Magdir/mach \
- Magdir/macintosh \
- Magdir/magic \
-diff -Naurp file-4.23.orig/magic/Makefile.in file-4.23/magic/Makefile.in
---- file-4.23.orig/magic/Makefile.in	2008-01-12 17:03:36.000000000 +0000
-+++ file-4.23/magic/Makefile.in	2008-01-12 17:03:02.000000000 +0000
-@@ -260,6 +260,7 @@ Magdir/linux \
- Magdir/lisp \
- Magdir/llvm \
- Magdir/lua \
-+Magdir/luks \
- Magdir/mach \
- Magdir/macintosh \
- Magdir/magic \

debian/patches/313-magic-add-lzma.dpatch

@@ -1,22 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 314-magic-add-lzma.dpatch by Robert Millan <rmh@aybabtu.com>
-##
-## DP: New magic for the LZMA compression format (Closes: #364260).
-
-@DPATCH@
-
-diff -Naur file-4.20.orig/magic/Magdir/compress file-4.20/magic/Magdir/compress
---- file-4.20.orig/magic/Magdir/compress	2007-04-03 13:10:23.000000000 +0000
-+++ file-4.20/magic/Magdir/compress	2007-04-03 13:15:02.000000000 +0000
-@@ -174,6 +174,11 @@
- >6	byte		x			version %d
- >7	byte		x			\b.%d
- 
-+# Type: LZMA
-+# URL:  http://www.7-zip.org/sdk.html
-+# From: Robert Millan <rmh@aybabtu.com>
-+0	string		]\000\000\200\000\377\377\377\377\377\377\377\377	LZMA compressed data
-+
- # AFX compressed files (Wolfram Kleff)
- 2	string		-afx-		AFX compressed file data
- 

debian/patches/314-magic-add-mathcad.dpatch

@@ -1,38 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 315-magic-add-mathcad.dpatch by Josh Triplett <josh@freedesktop.org>
-##
-## DP: New magic for Mathcad documents (Closes: #421426).
-
-@DPATCH@
-
-diff -Naurp file-4.23.orig/magic/Magdir/mathcad file-4.23/magic/Magdir/mathcad
---- file-4.23.orig/magic/Magdir/mathcad	1970-01-01 00:00:00.000000000 +0000
-+++ file-4.23/magic/Magdir/mathcad	2008-01-12 17:09:40.000000000 +0000
-@@ -0,0 +1,5 @@
-+# Type:	Mathcad documents
-+# URL:	http://www.mathsoft.com/
-+# From:	Josh Triplett <josh@freedesktop.org>
-+
-+0	string	.MCAD\		Mathcad document
-diff -Naurp file-4.23.orig/magic/Makefile.am file-4.23/magic/Makefile.am
---- file-4.23.orig/magic/Makefile.am	2008-01-12 17:09:50.000000000 +0000
-+++ file-4.23/magic/Makefile.am	2008-01-12 17:09:40.000000000 +0000
-@@ -127,6 +127,7 @@ Magdir/macintosh \
- Magdir/magic \
- Magdir/mail.news \
- Magdir/maple \
-+Magdir/mathcad \
- Magdir/mathematica \
- Magdir/matroska \
- Magdir/mcrypt \
-diff -Naurp file-4.23.orig/magic/Makefile.in file-4.23/magic/Makefile.in
---- file-4.23.orig/magic/Makefile.in	2008-01-12 17:09:50.000000000 +0000
-+++ file-4.23/magic/Makefile.in	2008-01-12 17:09:40.000000000 +0000
-@@ -266,6 +266,7 @@ Magdir/macintosh \
- Magdir/magic \
- Magdir/mail.news \
- Magdir/maple \
-+Magdir/mathcad \
- Magdir/mathematica \
- Magdir/matroska \
- Magdir/mcrypt \

debian/patches/315-magic-add-mdi.dpatch

@@ -1,19 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 315-magic-add-mdi.dpatch by Daniele Sempione <scrows@oziosi.org>
-##
-## DP: New magic for Microsoft Document Imaging Format (.mdi) (Closes: #430548).
-
-@DPATCH@
-
-diff -Naurp file-4.23.orig/magic/Magdir/msdos file-4.23/magic/Magdir/msdos
---- file-4.23.orig/magic/Magdir/msdos	2008-01-12 17:11:42.000000000 +0000
-+++ file-4.23/magic/Magdir/msdos	2008-01-12 17:11:33.000000000 +0000
-@@ -670,3 +670,8 @@
- >16	lelong	>0			%hd x
- >12	lelong	>0			%hd,
- >84	string	x			%.4s
-+
-+# Type: Microsoft Document Imaging Format (.mdi)
-+# URL:  http://en.wikipedia.org/wiki/Microsoft_Document_Imaging_Format
-+# From: Daniele Sempione <scrows@oziosi.org>
-+0	short	0x5045			Microsoft Document Imaging Format

debian/patches/316-magic-add-mercurial.dpatch

@@ -1,20 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 315-magic-add-mercurial.dpatch by Seo Sanghyeon <tinuviel@sparcs.kaist.ac.kr>
-##
-## DP: New magic for Mercurial bundles (Closes: #451067).
-
-@DPATCH@
-
-diff -Naur file-4.21.orig/magic/Magdir/revision file-4.21/magic/Magdir/revision
---- file-4.21.orig/magic/Magdir/revision	2007-12-23 17:25:09.000000000 +0000
-+++ file-4.21/magic/Magdir/revision	2007-12-23 17:24:59.000000000 +0000
-@@ -11,3 +11,9 @@
- # Type: Git bundles (git-bundle)
- # From: Josh Triplett <josh@freedesktop.org>
- 0	string	#\ v2\ git\ bundle\n	Git bundle
-+
-+# Type:	Mercurial bundles
-+# From:	Seo Sanghyeon <tinuviel@sparcs.kaist.ac.kr>
-+0	string	HG10		Mercurial bundle,
-+>4	string	UN		uncompressed
-+>4	string	BZ		bzip2 compressed

debian/patches/317-magic-add-mozilla.dpatch

@@ -1,18 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 315-magic-add-mozilla.dpatch by Josh Triplett <josh@freedesktop.org>
-##
-## DP: New magic for Mozilla XUL fastload files,
-## DP: commonly found in a Mozilla profile as XUL.mfasl and XPC.mfasl
-## DP: (Closes: #452354).
-
-@DPATCH@
-
-diff -Naur file-4.21.orig/magic/Magdir/mozilla file-4.21/magic/Magdir/mozilla
---- file-4.21.orig/magic/Magdir/mozilla	1970-01-01 00:00:00.000000000 +0000
-+++ file-4.21/magic/Magdir/mozilla	2007-12-23 17:13:40.000000000 +0000
-@@ -0,0 +1,5 @@
-+# Type:	Mozilla XUL fastload files (XUL.mfasl and XPC.mfasl)
-+# URL:	http://www.mozilla.org/
-+# From:	Josh Triplett <josh@freedesktop.org>
-+
-+0	string	XPCOM\nMozFASL\r\n\x1A		Mozilla XUL fastload data

debian/patches/318-magic-add-nlm.dpatch

@@ -1,37 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 316-magic-add-nlm.dpatch by Mads Martin Joergensen <mmj@suse.de>
-##
-## DP: New magic for NetWare Loadable Modules (NLMs).
-
-@DPATCH@
-
-diff -Naurp file-4.23.orig/magic/Magdir/netware file-4.23/magic/Magdir/netware
---- file-4.23.orig/magic/Magdir/netware	1970-01-01 00:00:00.000000000 +0000
-+++ file-4.23/magic/Magdir/netware	2008-01-12 17:12:21.000000000 +0000
-@@ -0,0 +1,4 @@
-+# Type: NetWare Loadable Modules (NLMs)
-+# From: Mads Martin Joergensen <mmj@suse.de>
-+
-+0	string	NetWare\ Loadable\ Module	NetWare Loadable Module
-diff -Naurp file-4.23.orig/magic/Makefile.am file-4.23/magic/Makefile.am
---- file-4.23.orig/magic/Makefile.am	2008-01-12 17:12:43.000000000 +0000
-+++ file-4.23/magic/Makefile.am	2008-01-12 17:12:21.000000000 +0000
-@@ -147,6 +147,7 @@ Magdir/natinst \
- Magdir/ncr \
- Magdir/netbsd \
- Magdir/netscape \
-+Magdir/netware \
- Magdir/news \
- Magdir/nitpicker \
- Magdir/ocaml \
-diff -Naurp file-4.23.orig/magic/Makefile.in file-4.23/magic/Makefile.in
---- file-4.23.orig/magic/Makefile.in	2008-01-12 17:12:43.000000000 +0000
-+++ file-4.23/magic/Makefile.in	2008-01-12 17:12:21.000000000 +0000
-@@ -286,6 +286,7 @@ Magdir/natinst \
- Magdir/ncr \
- Magdir/netbsd \
- Magdir/netscape \
-+Magdir/netware \
- Magdir/news \
- Magdir/nitpicker \
- Magdir/ocaml \

debian/patches/320-magic-add-par2.dpatch

@@ -5,14 +5,13 @@
 
 @DPATCH@
 
-diff -Naurp file-4.23.orig/magic/Magdir/archive file-4.23/magic/Magdir/archive
---- file-4.23.orig/magic/Magdir/archive	2007-12-27 16:18:28.000000000 +0000
-+++ file-4.23/magic/Magdir/archive	2008-01-12 17:33:01.000000000 +0000
-@@ -748,3 +748,7 @@
- # .kgb
- 0	string KGB_arch		KGB Archiver file
- >10	string x		with compression level %.1s
-+
+diff -Naurp file-4.24.orig/magic/Magdir/archive file-4.24/magic/Magdir/archive
+--- file-4.24.orig/magic/Magdir/archive	2008-02-28 18:57:34.000000000 +0000
++++ file-4.24/magic/Magdir/archive	2008-04-07 08:05:47.000000000 +0000
+@@ -803,3 +803,6 @@
+ >24	belong	1		SHA-1 checksum
+ >24	belong	2		MD5 checksum
+ 
 +# Type: Parity Archive
 +# From: Daniel van Eeden <daniel_e@dds.nl>
-+0	string	PAR2		Parity Archive Volume Set
++0	string	 PAR2		Parity Archive Volume Set

debian/patches/321-magic-add-pe5.dpatch

@@ -5,13 +5,13 @@
 
 @DPATCH@
 
-diff -Naurp file-4.23.orig/magic/Magdir/images file-4.23/magic/Magdir/images
---- file-4.23.orig/magic/Magdir/images	2007-05-03 15:11:33.000000000 +0000
-+++ file-4.23/magic/Magdir/images	2008-01-12 17:33:52.000000000 +0000
-@@ -529,3 +529,8 @@
- # Xara (for a while: Corel Xara) is a graphic package, see
- # http://www.xara.com/ for Windows and as GPL application for
- 0	string	XARA\243\243	Xara graphics file
+diff -Naurp file-4.24.orig/magic/Magdir/images file-4.24/magic/Magdir/images
+--- file-4.24.orig/magic/Magdir/images	2008-03-07 14:58:54.000000000 +0000
++++ file-4.24/magic/Magdir/images	2008-04-07 08:07:42.000000000 +0000
+@@ -588,3 +588,8 @@
+ 0	string	\xed\xfe\xda\xbe	Cytovision FLEX file
+ 0	string	\xed\xab\xed\xfe	Cytovision FLEX file
+ 0	string	\xad\xfd\xea\xad	Cytovision RATS file
 +
 +# Type: Ulead Photo Explorer5 (.pe5)
 +# URL:  http://www.jisyo.com/cgibin/view.cgi?EXT=pe5 (Japanese)

debian/patches/325-magic-add-sgf.dpatch

@@ -5,13 +5,13 @@
 
 @DPATCH@
 
-diff -Naur file-4.21.orig/magic/Magdir/games file-4.21/magic/Magdir/games
---- file-4.21.orig/magic/Magdir/games	2004-03-22 20:24:48.000000000 +0000
-+++ file-4.21/magic/Magdir/games	2007-08-26 07:59:12.000000000 +0000
-@@ -155,3 +155,16 @@
- 
- 0	string	MComprHD	MAME CHD compressed hard disk image,
- >12	belong	x		version %lu
+diff -Naurp file-4.24.orig/magic/Magdir/games file-4.24/magic/Magdir/games
+--- file-4.24.orig/magic/Magdir/games	2008-02-19 17:27:30.000000000 +0000
++++ file-4.24/magic/Magdir/games	2008-04-07 08:09:12.000000000 +0000
+@@ -151,3 +151,16 @@
+ >4	lelong	x		containing %d lumps
+ 0	string	=PWAD		doom patch PWAD data
+ >4	lelong	x		containing %d lumps
 +
 +# Type: SGF Smart Game Format
 +# URL:  http://www.red-bean.com/sgf/

debian/patches/326-magic-add-sisu.dpatch

@@ -5,9 +5,9 @@
 
 @DPATCH@
 
-diff -Naurp file-4.23.orig/magic/Magdir/sisu file-4.23/magic/Magdir/sisu
---- file-4.23.orig/magic/Magdir/sisu	1970-01-01 00:00:00.000000000 +0000
-+++ file-4.23/magic/Magdir/sisu	2008-01-12 17:37:22.000000000 +0000
+diff -Naurp file-4.24.orig/magic/Magdir/sisu file-4.24/magic/Magdir/sisu
+--- file-4.24.orig/magic/Magdir/sisu	1970-01-01 00:00:00.000000000 +0000
++++ file-4.24/magic/Magdir/sisu	2008-04-07 08:10:25.000000000 +0000
 @@ -0,0 +1,18 @@
 +# Type: SiSU Markup Language
 +# URL:  http://www.sisudoc.org/
@@ -27,25 +27,25 @@ diff -Naurp file-4.23.orig/magic/Magdir/sisu file-4.23/magic/Magdir/sisu
 +
 +0	regex	\^%*[\ \t]*sisu-[0-9.]+		SiSU text
 +>5	regex	[0-9.]+				%s
-diff -Naurp file-4.23.orig/magic/Makefile.am file-4.23/magic/Makefile.am
---- file-4.23.orig/magic/Makefile.am	2008-01-12 17:38:00.000000000 +0000
-+++ file-4.23/magic/Makefile.am	2008-01-12 17:37:22.000000000 +0000
-@@ -186,6 +186,7 @@ Magdir/sgi \
- Magdir/sgml \
- Magdir/sharc \
- Magdir/sinclair \
-+Magdir/sisu \
- Magdir/sketch \
- Magdir/smalltalk \
- Magdir/sniffer \
-diff -Naurp file-4.23.orig/magic/Makefile.in file-4.23/magic/Makefile.in
---- file-4.23.orig/magic/Makefile.in	2008-01-12 17:38:00.000000000 +0000
-+++ file-4.23/magic/Makefile.in	2008-01-12 17:37:22.000000000 +0000
-@@ -325,6 +325,7 @@ Magdir/sgi \
- Magdir/sgml \
- Magdir/sharc \
- Magdir/sinclair \
-+Magdir/sisu \
- Magdir/sketch \
- Magdir/smalltalk \
- Magdir/sniffer \
+diff -Naurp file-4.24.orig/magic/Makefile.am file-4.24/magic/Makefile.am
+--- file-4.24.orig/magic/Makefile.am	2008-03-22 21:41:00.000000000 +0000
++++ file-4.24/magic/Makefile.am	2008-04-07 08:11:04.000000000 +0000
+@@ -170,6 +170,7 @@ $(MAGIC_FRAGMENT_DIR)/sgi \
+ $(MAGIC_FRAGMENT_DIR)/sgml \
+ $(MAGIC_FRAGMENT_DIR)/sharc \
+ $(MAGIC_FRAGMENT_DIR)/sinclair \
++$(MAGIC_FRAGMENT_DIR)/sisu \
+ $(MAGIC_FRAGMENT_DIR)/sketch \
+ $(MAGIC_FRAGMENT_DIR)/smalltalk \
+ $(MAGIC_FRAGMENT_DIR)/sniffer \
+diff -Naurp file-4.24.orig/magic/Makefile.in file-4.24/magic/Makefile.in
+--- file-4.24.orig/magic/Makefile.in	2008-03-22 21:41:06.000000000 +0000
++++ file-4.24/magic/Makefile.in	2008-04-07 08:11:10.000000000 +0000
+@@ -330,6 +330,7 @@ $(MAGIC_FRAGMENT_DIR)/sgi \
+ $(MAGIC_FRAGMENT_DIR)/sgml \
+ $(MAGIC_FRAGMENT_DIR)/sharc \
+ $(MAGIC_FRAGMENT_DIR)/sinclair \
++$(MAGIC_FRAGMENT_DIR)/sisu \
+ $(MAGIC_FRAGMENT_DIR)/sketch \
+ $(MAGIC_FRAGMENT_DIR)/smalltalk \
+ $(MAGIC_FRAGMENT_DIR)/sniffer \

debian/patches/332-magic-add-svg.dpatch

@@ -1,20 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 327-magic-add-svg.dpatch by Noel Torres <tecnico@ejerciciosresueltos.com>
-##
-## DP: Adds magic for SVG (Closes: #417331).
-
-@DPATCH@
-
-diff -Naur file-4.20.orig/magic/Magdir/sgml file-4.20/magic/Magdir/sgml
---- file-4.20.orig/magic/Magdir/sgml	2007-01-19 21:09:07.000000000 +0000
-+++ file-4.20/magic/Magdir/sgml	2007-05-17 16:54:52.000000000 +0000
-@@ -33,3 +33,9 @@
- 0	string	#\ HTTP\ Cookie\ File	Web browser cookie text
- 0	string	#\ Netscape\ HTTP\ Cookie\ File	Netscape cookie text
- 0	string	#\ KDE\ Cookie\ File	Konqueror cookie text
-+
-+# Type:	SVG Vectorial Graphics
-+# From:	Noel Torres <tecnico@ejerciciosresueltos.com>
-+0	string	\<?xml\ version="
-+>15	string	>\0
-+>>23	regex	.*\<svg			SVG Scalable Vector Graphics image

debian/patches/901-file-elf.dpatch

@@ -1,52 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 901-file-elf.dpatch by Alessandro Rubini <rubini@gnudd.com>
-##
-## DP: Revert ELF file-reading (closes: #345089).
-
-@DPATCH@
-
-diff -Naurp file-4.23.orig/src/readelf.c file-4.23/src/readelf.c
---- file-4.23.orig/src/readelf.c	2007-12-27 16:30:52.000000000 +0000
-+++ file-4.23/src/readelf.c	2008-01-12 17:48:48.000000000 +0000
-@@ -919,29 +919,30 @@ file_tryelf(struct magic_set *ms, int fd
- 	off_t fsize;
- 	int flags = 0;
- 
--	/*
--	 * If we cannot seek, it must be a pipe, socket or fifo.
--	 */
--	if((lseek(fd, (off_t)0, SEEK_SET) == (off_t)-1) && (errno == ESPIPE))
--		fd = file_pipe2file(ms, fd, buf, nbytes);
--
--	if (fstat(fd, &st) == -1) {
--  		file_badread(ms);
--		return -1;
--	}
--	fsize = st.st_size;
- 
- 	/*
- 	 * ELF executables have multiple section headers in arbitrary
- 	 * file locations and thus file(1) cannot determine it from easily.
- 	 * Instead we traverse thru all section headers until a symbol table
- 	 * one is found or else the binary is stripped.
-+	 * Return immediately if it's not ELF (so we avoid pipe2file unless needed).
- 	 */
- 	if (buf[EI_MAG0] != ELFMAG0
- 	    || (buf[EI_MAG1] != ELFMAG1 && buf[EI_MAG1] != OLFMAG1)
- 	    || buf[EI_MAG2] != ELFMAG2 || buf[EI_MAG3] != ELFMAG3)
- 	    return 0;
- 
-+	/*
-+	 * If we cannot seek, it must be a pipe, socket or fifo.
-+	 */
-+	if((lseek(fd, (off_t)0, SEEK_SET) == (off_t)-1) && (errno == ESPIPE))
-+		fd = file_pipe2file(ms, fd, buf, nbytes);
-+
-+	if (fstat(fd, &st) == -1) {
-+  		file_badread(ms);
-+		return -1;
-+	}
-+	fsize = st.st_size;
- 
- 	class = buf[EI_CLASS];
- 

debian/patches/902-file-kfreebsd.dpatch

@@ -1,36 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 902-file-kfreebsd.dpatch by Robert Millan <rmh@aybabtu.com>
-##
-## DP: Detect GNU/kFreeBSD binaries (closes: #307475).
-
-@DPATCH@
-
-diff -Naurp file-4.23.orig/src/readelf.c file-4.23/src/readelf.c
---- file-4.23.orig/src/readelf.c	2008-01-12 17:50:20.000000000 +0000
-+++ file-4.23/src/readelf.c	2008-01-12 17:50:01.000000000 +0000
-@@ -397,6 +397,14 @@ donote(struct magic_set *ms, unsigned ch
- 			if (file_printf(ms, "Solaris") == -1)
- 				return size;
- 			break;
-+		case GNU_OS_KFREEBSD:
-+			if (file_printf(ms, "kFreeBSD") == -1)
-+				return size;
-+			break;
-+		case GNU_OS_KNETBSD:
-+			if (file_printf(ms, "kNetBSD") == -1)
-+				return size;
-+			break;
- 		default:
- 			if (file_printf(ms, "<unknown>") == -1)
- 				return size; 
-diff -Naurp file-4.23.orig/src/readelf.h file-4.23/src/readelf.h
---- file-4.23.orig/src/readelf.h	2007-12-27 16:08:22.000000000 +0000
-+++ file-4.23/src/readelf.h	2008-01-12 17:50:01.000000000 +0000
-@@ -229,5 +229,7 @@ typedef struct {
- #define GNU_OS_LINUX	0
- #define GNU_OS_HURD	1
- #define GNU_OS_SOLARIS	2
-+#define GNU_OS_KFREEBSD	3
-+#define GNU_OS_KNETBSD	4
- 
- #endif

debian/patches/903-file-localmagic.dpatch

@@ -6,9 +6,9 @@
 
 @DPATCH@
 
-diff -Naurp file-4.23.orig/magic/Header file-4.23/magic/Header
---- file-4.23.orig/magic/Header	2000-08-05 17:36:46.000000000 +0000
-+++ file-4.23/magic/Header	2008-01-12 17:54:27.000000000 +0000
+diff -Naurp file-4.24.orig/magic/Header file-4.24/magic/Header
+--- file-4.24.orig/magic/Header	2000-08-05 17:36:46.000000000 +0000
++++ file-4.24/magic/Header	2008-04-07 08:17:11.000000000 +0000
 @@ -1,5 +1,5 @@
 -# Magic
  # Magic data for file(1) command.
@@ -19,17 +19,17 @@ diff -Naurp file-4.23.orig/magic/Header file-4.23/magic/Header
 +# 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).
 +
-diff -Naurp file-4.23.orig/magic/magic.local file-4.23/magic/magic.local
---- file-4.23.orig/magic/magic.local	1970-01-01 00:00:00.000000000 +0000
-+++ file-4.23/magic/magic.local	2008-01-12 17:54:27.000000000 +0000
+diff -Naurp file-4.24.orig/magic/magic.local file-4.24/magic/magic.local
+--- file-4.24.orig/magic/magic.local	1970-01-01 00:00:00.000000000 +0000
++++ file-4.24/magic/magic.local	2008-04-07 08:17:11.000000000 +0000
 @@ -0,0 +1,3 @@
 +# Magic local data for file(1) command.
 +# Insert here your local magic data. Format is described in magic(5).
 +
-diff -Naurp file-4.23.orig/src/Makefile.am file-4.23/src/Makefile.am
---- file-4.23.orig/src/Makefile.am	2007-12-02 17:32:23.000000000 +0000
-+++ file-4.23/src/Makefile.am	2008-01-12 17:54:27.000000000 +0000
-@@ -5,7 +5,7 @@ EXTRA_DIST = test.c
+diff -Naurp file-4.24.orig/src/Makefile.am file-4.24/src/Makefile.am
+--- file-4.24.orig/src/Makefile.am	2008-02-24 01:33:05.000000000 +0000
++++ file-4.24/src/Makefile.am	2008-04-07 08:16:39.000000000 +0000
+@@ -5,7 +5,7 @@ EXTRA_DIST = getopt_long.c
  
  bin_PROGRAMS = file
  
@@ -38,13 +38,13 @@ diff -Naurp file-4.23.orig/src/Makefile.am file-4.23/src/Makefile.am
  
  libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
  	compress.c is_tar.c readelf.c print.c fsmagic.c \
-diff -Naurp file-4.23.orig/src/Makefile.in file-4.23/src/Makefile.in
---- file-4.23.orig/src/Makefile.in	2007-12-28 20:35:02.000000000 +0000
-+++ file-4.23/src/Makefile.in	2008-01-12 17:54:27.000000000 +0000
-@@ -199,7 +199,7 @@ MAGIC = $(pkgdatadir)/magic
+diff -Naurp file-4.24.orig/src/Makefile.in file-4.24/src/Makefile.in
+--- file-4.24.orig/src/Makefile.in	2008-03-22 21:40:13.000000000 +0000
++++ file-4.24/src/Makefile.in	2008-04-07 08:16:47.000000000 +0000
+@@ -198,7 +198,7 @@ MAGIC = $(pkgdatadir)/magic
  lib_LTLIBRARIES = libmagic.la
  include_HEADERS = magic.h
- EXTRA_DIST = test.c
+ EXTRA_DIST = getopt_long.c
 -AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
 +AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
  libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \

debian/patches/905-file-segfault.dpatch

@@ -1,22 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 905-file-segfault.dpatch by Sven Anders <anders@anduras.de>
-##
-## DP: Fixes a segfault with -c.
-
-@DPATCH@
-
-diff -Naurp file-4.23.orig/src/print.c file-4.23/src/print.c
---- file-4.23.orig/src/print.c	2007-12-27 16:35:59.000000000 +0000
-+++ file-4.23/src/print.c	2008-01-12 17:57:26.000000000 +0000
-@@ -189,7 +189,10 @@ file_magwarn(struct magic_set *ms, const
- 	/* cuz we use stdout for most, stderr here */
- 	(void) fflush(stdout); 
- 
--	(void) fprintf(stderr, "%s, %lu: Warning ", ms->file,
-+	if (!ms->file)
-+	  fprintf(stderr, "Warning ");
-+	else
-+	  (void) fprintf(stderr, "%s, %lu: Warning ", ms->file,
- 	    (unsigned long)ms->line);
- 	(void) vfprintf(stderr, f, va);
- 	va_end(va);

debian/patches/998-doc-manpages.dpatch

@@ -5,95 +5,30 @@
 
 @DPATCH@
 
-diff -Naurp file-4.23.orig/doc/file.man file-4.23/doc/file.man
---- file-4.23.orig/doc/file.man	2007-10-23 19:58:59.000000000 +0000
-+++ file-4.23/doc/file.man	2008-01-12 18:06:28.000000000 +0000
-@@ -49,9 +49,8 @@ meaning anything else (data is usually 
+diff -Naurp file-4.24.orig/doc/file.man file-4.24/doc/file.man
+--- file-4.24.orig/doc/file.man	2008-03-07 15:00:07.000000000 +0000
++++ file-4.24/doc/file.man	2008-04-07 08:26:06.000000000 +0000
+@@ -51,7 +51,7 @@ meaning anything else (data is usually 
  or non-printable).
  Exceptions are well-known file formats (core files, tar archives)
  that are known to contain binary data.
--When modifying the file
--.Pa __MAGIC__
--or the program itself, make sure to
-+When adding local definitions to
-+.Pa /etc/magic ,
+-When modifying magic files or the program itself, make sure to
++When adding local definitions to /etc/magic, make sure to
  .Em "preserve these keywords" .
- People depend on knowing that all the readable files in a directory
+ Users depend on knowing that all the readable files in a directory
  have the word 
-@@ -78,17 +77,17 @@ Any known file types appropriate to the 
- implement them)
- are intuited if they are defined in
- the system header file
--.In sys/stat.h .
-+.Pa sys/stat.h .
- .Pp
- The magic number tests are used to check for files with data in
- particular fixed formats.
- The canonical example of this is a binary executable (compiled program)
- .Dv a.out
- file, whose format is defined in 
--.In elf.h ,
--.In a.out.h
-+.Pa elf.h ,
-+.Pa a.out.h
- and possibly
--.In exec.h
-+.Pa exec.h
- in the standard include directory.
- These files have a 
- .Sq "magic number"
-@@ -101,12 +100,14 @@ The concept of a
+@@ -95,7 +95,8 @@ The concept of a
  has been applied by extension to data files.
  Any file with some invariant identifier at a small fixed
  offset into the file can usually be described in this way.
 -The information identifying these files is read from the compiled
-+The information identifying these files is read from
-+.Pa /etc/magic
-+and the compiled
++The information identifying these files is read from /etc/magic
++and the the compiled
  magic file
  .Pa __MAGIC__.mgc ,
- or 
- .Pa __MAGIC__
--if the compile file does not exist. In addition
-+if the compiled file does not exist. In addition
- .Nm
- will look in
- .Pa $HOME/.magic.mgc ,
-@@ -146,7 +147,7 @@ has determined the character set used in
- it will
- attempt to determine in what language the file is written.
- The language tests look for particular strings (cf
--.In names.h
-+.Pa names.h
- that can appear anywhere in the first few blocks of a file.
- For example, the keyword
- .Em .br
-@@ -163,7 +164,8 @@ The language test routines also test for
- archives).
- .Pp
- Any file that cannot be identified as having been written
--in any of the character sets listed above is simply said to be ``data''.
-+in any of the character sets listed above is simply said to be
-+.Dq data .
- .Sh OPTIONS
- .Bl -tag -width indent
- .It Fl b , -brief
-@@ -244,7 +246,12 @@ Like
- .Fl i ,
- but print only the specified element(s).
- .It Fl k , -keep-going
--Don't stop at the first match, keep going.
-+Don't stop at the first match, keep going. Subsequent matches will be
-+prepended by
-+.Dq "\[rs]012\- ".
-+(If you want a newline, see
-+.Dq "\-r"
-+option.)
- .It Fl L , -dereference
- option causes symlinks to be followed, as the like-named option in
- .Xr ls 1
-@@ -345,6 +352,11 @@ adds
- and/or
+ or the files in the directory
+@@ -326,6 +327,11 @@ will not attempt to open
+ adds
  .Dq .mgc
  to the value of this variable as appropriate.
 +However,
@@ -103,8 +38,8 @@ diff -Naurp file-4.23.orig/doc/file.man file-4.23/doc/file.man
 +to be considered.
  The environment variable
  .Dv POSIXLY_CORRECT
- controls (on systems that support symbolic links), if
-@@ -419,12 +431,6 @@ will be distributed periodically.
+ controls (on systems that support symbolic links), whether
+@@ -401,12 +407,6 @@ will be distributed periodically.
  The order of entries in the magic file is significant.
  Depending on what system you are using, the order that
  they are put together may be incorrect.
@@ -117,16 +52,7 @@ diff -Naurp file-4.23.orig/doc/file.man file-4.23/doc/file.man
  .Sh EXAMPLES
  .Bd -literal -offset indent 
  $ file file.c file /dev/{wd0a,hda}
-@@ -591,9 +597,17 @@ This program is slower than some vendors
- The new support for multiple character codes makes it even slower.
- .Pp
- This manual page, and particularly this section, is too long.
-+.Sh RETURN CODE
-+.Nm
-+almost always returns 0. It returns a different code if it cannot open a file.
- .Sh AVAILABILITY
- You can obtain the original author's latest version by anonymous FTP
- on
+@@ -548,3 +548,8 @@ on
  .Dv ftp.astron.com
  in the directory
  .Dv /pub/file/file-X.YZ.tar.gz
@@ -135,27 +61,3 @@ diff -Naurp file-4.23.orig/doc/file.man file-4.23/doc/file.man
 +obtained from every site carrying a Debian distribution (that is
 +.Dv ftp.debian.org
 +and mirrors).
-diff -Naurp file-4.23.orig/doc/libmagic.man file-4.23/doc/libmagic.man
---- file-4.23.orig/doc/libmagic.man	2007-10-09 20:14:57.000000000 +0000
-+++ file-4.23/doc/libmagic.man	2008-01-12 18:04:15.000000000 +0000
-@@ -39,7 +39,7 @@
- .Nm magic_load
- .Nd Magic number recognition library.
- .Sh LIBRARY
--.Lb libmagic
-+.Lb libmagic1
- .Sh SYNOPSIS
- .In magic.h
- .Ft magic_t
-diff -Naurp file-4.23.orig/doc/magic.man file-4.23/doc/magic.man
---- file-4.23.orig/doc/magic.man	2007-11-08 00:31:37.000000000 +0000
-+++ file-4.23/doc/magic.man	2008-01-12 18:04:15.000000000 +0000
-@@ -69,7 +69,7 @@ Finally the
- .Dq c
- flag, specifies case insensitive matching: lowercase
- characters in the magic match both lower and upper case characters in the
--targer, whereas upper case characters in the magic, only much uppercase
-+target, whereas upper case characters in the magic, only much uppercase
- characters in the target.
- .It Dv pstring
- A pascal style string where the first byte is interpreted as the an

debian/patches/999-conglomeration.dpatch

@@ -5,151 +5,10 @@
 
 @DPATCH@
 
-diff -Naurp file-4.23.orig/magic/magic.mime file-4.23/magic/magic.mime
---- file-4.23.orig/magic/magic.mime	2008-01-12 18:23:14.000000000 +0000
-+++ file-4.23/magic/magic.mime	2008-01-12 18:25:28.000000000 +0000
-@@ -184,6 +184,7 @@
- 0	string	MThd			audio/x-midi
- #>9 	byte	>0			(format %d)
- #>11	byte	>1			using %d channels
-+0	string	MThd			audio/midi
- #					Creative Music (CMF) data
- 0	string	CTMF			audio/x-unknown
- #					SoundBlaster instrument data
-@@ -332,7 +333,7 @@
- # because it tries to uncompress it to figure out what's inside.
- 
- # standard unix compress
--0	string		\037\235	application/x-compress
-+#0	string		\037\235	application/x-compress
- 
- # gzip (GNU zip, not to be confused with [Info-ZIP/PKWARE] zip archiver)
- 0       string          \037\213        application/x-gzip
-@@ -437,18 +438,14 @@
- #------------------------------------------------------------------------------
- # html:  file(1) magic for HTML (HyperText Markup Language) docs
- #
--# from Daniel Quinlan <quinlan@yggdrasil.com>
-+# from Michael Piefel <piefel@debian.org>
- #
--0	string		\<HEAD	text/html
--0	string		\<head	text/html
--0	string		\<TITLE	text/html
--0	string		\<title	text/html
--0       string          \<html	text/html
--0       string          \<HTML	text/html
--0	string		\<!--	text/html
--0	string		\<h1	text/html
--0	string		\<H1	text/html
--0	string/c	\<!doctype\ html	text/html
-+0	string/cB	\<!DOCTYPE\ html	text/html
-+0	string/cb	\<head			text/html
-+0	string/cb	\<title			text/html
-+0	string/bc	\<html			text/html
-+0	string		\<!--			text/html
-+0	string/c	\<h1			text/html
- 
- #------------------------------------------------------------------------------
- # images:  file(1) magic for image formats (see also "c-lang" for XPM bitmaps)
-@@ -511,7 +508,7 @@
- 0	beshort		0xffd8		image/jpeg
- 
- # PC bitmaps (OS/2, Windoze BMP files)  (Greg Roelofs, newt@uchicago.edu)
--0	string		BM		image/bmp
-+0	string		BM		image/x-ms-bmp
- #>14	byte		12		(OS/2 1.x format)
- #>14	byte		64		(OS/2 2.x format)
- #>14	byte		40		(Windows 3.x format)
-@@ -749,8 +746,10 @@
- #------------------------------------------------------------------------------
- # Hierarchical Data Format, used to facilitate scientific data exchange
- # specifications at http://hdf.ncsa.uiuc.edu/
--0	belong		0x0e031301	Hierarchical Data Format (version 4) data
--0	string		\211HDF\r\n\032	Hierarchical Data Format (version 5) data
-+#Hierarchical Data Format (version 4) data
-+0	belong		0x0e031301		application/x-hdf
-+#Hierarchical Data Format (version 5) data
-+0	string		\211HDF\r\n\032		application/x-hdf
- 
- # Adobe Photoshop
- 0	string		8BPS			image/vnd.adobe.photoshop
-@@ -820,21 +819,39 @@
- # Debian has entries for the old PGP formats:
- # pgp:  file(1) magic for Pretty Good Privacy
- # see http://lists.gnupg.org/pipermail/gnupg-devel/1999-September/016052.html
--0       beshort         0x9900                  application/x-pgp-keyring
--0       beshort         0x9501                  application/x-pgp-keyring
--0       beshort         0x9500                  application/x-pgp-keyring
--0       beshort         0xa600                  application/pgp-encrypted
--0       string          -----BEGIN\040PGP       text/PGP armored data
-->15     string          PUBLIC\040KEY\040BLOCK- public key block
-->15     string          MESSAGE-                message
-->15     string          SIGNED\040MESSAGE-      signed message
-->15     string          PGP\040SIGNATURE-       signature
--0       beshort         0x8501                  data
-+#0       beshort         0x9900                  application/x-pgp-keyring
-+#0       beshort         0x9501                  application/x-pgp-keyring
-+#0       beshort         0x9500                  application/x-pgp-keyring
-+#0       beshort         0xa600                  application/pgp-encrypted
-+#0       string          -----BEGIN\040PGP       text/PGP armored data
-+#>15     string          PUBLIC\040KEY\040BLOCK- public key block
-+#>15     string          MESSAGE-                message
-+#>15     string          SIGNED\040MESSAGE-      signed message
-+#>15     string          PGP\040SIGNATURE-       signature
-+#0       beshort         0x8501                  data
-+#text/PGP key public ring
-+0	beshort		0x9900		application/pgp
-+#text/PGP key security ring
-+0	beshort		0x9501		application/pgp
-+#text/PGP key security ring
-+0	beshort		0x9500		application/pgp
-+#text/PGP encrypted data
-+0	beshort		0xa600		application/pgp-encrypted
-+#text/PGP armored data
-+##public key block
-+2	string	---BEGIN\ PGP\ PUBLIC\ KEY\ BLOCK-	application/pgp-keys
-+0	string	-----BEGIN\040PGP\40MESSAGE-		application/pgp
-+0	string	-----BEGIN\040PGP\40SIGNATURE-		application/pgp-signature
-+
- #
- # GnuPG Magic:
- #
--0       beshort         0x9901                  application/x-gnupg-keyring
--0       beshort         0x8501                  text/OpenPGP data
-+#0       beshort         0x9901                  application/x-gnupg-keyring
-+#0       beshort         0x8501                  text/OpenPGP data
-+#text/GnuPG key public ring
-+0	beshort		0x9901		application/pgp
-+#text/OpenPGP data
-+0	beshort		0x8501		application/pgp-encrypted
- 
- # flash:        file(1) magic for Macromedia Flash file format
- #
-@@ -1003,3 +1020,8 @@
- 0	lelong	0x10201A7A	x-epoc/x-sisx-app
- # FORTRAN source
- 0	string/c	c\ 		text/x-fortran
-+
-+# 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
-+39	string	=<gmr:Workbook	application/x-gnumeric
-diff -Naurp file-4.23.orig/src/file.c file-4.23/src/file.c
---- file-4.23.orig/src/file.c	2007-12-27 16:35:58.000000000 +0000
-+++ file-4.23/src/file.c	2008-01-12 18:25:28.000000000 +0000
-@@ -350,7 +350,7 @@ main(int argc, char *argv[])
- 	}
- 
- 	magic_close(magic);
--	return 0;
-+	return magic->haderr ? -1 : 0;
- }
- 
- 
-diff -Naurp file-4.23.orig/src/fsmagic.c file-4.23/src/fsmagic.c
---- file-4.23.orig/src/fsmagic.c	2007-11-07 21:33:23.000000000 +0000
-+++ file-4.23/src/fsmagic.c	2008-01-12 18:25:28.000000000 +0000
-@@ -93,7 +93,8 @@ file_fsmagic(struct magic_set *ms, const
+diff -Naurp file-4.24.orig/src/fsmagic.c file-4.24/src/fsmagic.c
+--- file-4.24.orig/src/fsmagic.c	2008-02-14 20:14:52.000000000 +0000
++++ file-4.24/src/fsmagic.c	2008-04-07 08:32:13.000000000 +0000
+@@ -110,7 +110,8 @@ file_fsmagic(struct magic_set *ms, const
  		if (file_printf(ms, "cannot open `%s' (%s)",
  		    fn, strerror(errno)) == -1)
  			return -1;