Import Debian version 4.23-1

debian/copyright

@@ -12,7 +12,7 @@ Upstream Author:
 License:
 
 	Copyright (C) 1985-1995 Ian F. Darwin
-	Copyright (C) 1994-2007 Christos Zoulas <christos@zoulas.com>
+	Copyright (C) 1994-2008 Christos Zoulas <christos@zoulas.com>
 
 	This software is not subject to any export provision of the United
 	States Department of Commerce, and may be exported to any country or
@@ -78,5 +78,5 @@ License (magic/Magdir/os9):
 	ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 
-The Debian packaging is (C) 2007, Daniel Baumann <daniel@debian.org> and
+The Debian packaging is (C) 2007-2008, Daniel Baumann <daniel@debian.org> and
 is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.

debian/patches/00list

@@ -1,23 +1,18 @@
-101-magic-remove-awk.dpatch
 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
-107-magic-remove-msi.dpatch
 108-magic-remove-quicktime.dpatch
 201-magic-update-avi.dpatch
-202-magic-update-blender.dpatch
 203-magic-update-cow.dpatch
 204-magic-update-cracklib.dpatch
-205-magic-update-elf-a.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
-212-magic-update-os2rexx.dpatch
 213-magic-update-pcp.dpatch
 214-magic-update-perl.dpatch
 215-magic-update-sh.dpatch
@@ -41,7 +36,6 @@
 316-magic-add-mercurial.dpatch
 317-magic-add-mozilla.dpatch
 318-magic-add-nlm.dpatch
-319-magic-add-ocfs.dpatch
 320-magic-add-par2.dpatch
 321-magic-add-pe5.dpatch
 322-magic-add-pmenu.dpatch

debian/patches/101-magic-remove-awk.dpatch

@@ -1,22 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 101-magic-remove-awk.dpatch by Michael Piefel <piefel@debian.org>
-##
-## DP: Remove AWK detection by regular expression testing just for 'BEGIN:';
-## DP: this caused a lot of false guesses (and problems with naughty programs
-## DP: reading other programs' files), this closes: #308305, #375403 and makes
-## DP: others disappear (for the time being, for example, it closes: #375722).
-
-@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 12:23:14.000000000 +0000
-@@ -28,7 +28,7 @@
- 0	string/b	#!\ /bin/awk		awk script text executable
- 0	string/b	#!\ /usr/bin/awk	awk script text executable
- # update to distinguish from *.vcf files
--0	regex		BEGIN[[:space:]]*[{]	awk script text
-+#0	regex		BEGIN[[:space:]]*[{]	awk script text
- 
- # AT&T Bell Labs' Plan 9 shell
- 0	string/b	#!\ /bin/rc	Plan 9 rc shell script text executable

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

@@ -5,9 +5,9 @@
 
 @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-03 12:28:49.000000000 +0000
+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
@@ -19,7 +19,7 @@ diff -Naur file-4.20.orig/magic/Magdir/images file-4.20/magic/Magdir/images
  
  # MGR bitmaps  (Michael Haardt, u31b3hs@pool.informatik.rwth-aachen.de)
  0	string	yz	MGR bitmap, modern format, 8-bit aligned
-@@ -506,7 +506,7 @@
+@@ -510,7 +510,7 @@
  0	string	AT&TFORM		DjVu Image file
  
  # From: Jason Bacon <bacon@smithers.neuro.mcw.edu>

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

@@ -6,10 +6,10 @@
 
 @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:39:57.000000000 +0000
-@@ -579,17 +579,17 @@
+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

debian/patches/107-magic-remove-msi.dpatch

@@ -1,17 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 107-magic-remove-msi.dpatch by Michael Piefel <piefel@debian.org>
-##
-## DP: Disable second MS Installer entry (closes: #409895).
-
-@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:41:40.000000000 +0000
-@@ -617,5 +617,5 @@
- 0	lelong	0x02468ace			Bochs Sparse disk image
- 
- # from http://filext.com by Derek M Jones <derek@knosof.co.uk>
--0	string	\xD0\xCF\x11\xE0\xA1\xB1\x1A\xE1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x3E\x00\x03\x00\xFE\xFF	Microsoft Installer
-+#0	string	\xD0\xCF\x11\xE0\xA1\xB1\x1A\xE1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x3E\x00\x03\x00\xFE\xFF	Microsoft Installer
- 0	string	\320\317\021\340\241\261\032\341	Microsoft Office Document

debian/patches/202-magic-update-blender.dpatch

@@ -1,16 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 202-magic-update-blender.dpatch by Josh Babcock <jbabcock@atlantech.net>
-##
-## DP: Adds magic for Blender python scripts (Closes: #323291).
-
-@DPATCH@
-
-diff -Naur file-4.20.orig/magic/Magdir/blender file-4.20/magic/Magdir/blender
---- file-4.20.orig/magic/Magdir/blender	2000-08-05 17:12:09.000000000 +0000
-+++ file-4.20/magic/Magdir/blender	2007-03-27 16:28:58.000000000 +0000
-@@ -15,3 +15,5 @@
- >9	byte	x		with version %c.
- >10	byte	x		\b%c
- >11	byte	x		\b%c
-+
-+0	string	#!BPY		Blender3D Python file

debian/patches/205-magic-update-elf-a.dpatch

@@ -1,19 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 205-magic-update-elf-a.dpatch by Michael Piefel <piefel@debian.org>
-##
-## DP: FIXME
-
-@DPATCH@
-
-diff -Naur file-4.20.orig/magic/Magdir/elf file-4.20/magic/Magdir/elf
---- file-4.20.orig/magic/Magdir/elf	2006-12-18 14:14:34.000000000 +0000
-+++ file-4.20/magic/Magdir/elf	2007-03-27 12:23:14.000000000 +0000
-@@ -51,7 +51,7 @@
- >>>>36  lelong&0xf0000000	0x20000000	MIPS-III
- >>>>36  lelong&0xf0000000	0x30000000	MIPS-IV
- >>>>36  lelong&0xf0000000	0x40000000	MIPS-V
-->>>>36  lelong&0xf0000000	0x60000000	MIPS32
-+>>>>36  lelong&0xf0000000	0x5fffffff	MIPS32
- >>>>36  lelong&0xf0000000	0x70000000	MIPS64
- >>>>36  lelong&0xf0000000	0x80000000	MIPS32 rel2
- >>>>36  lelong&0xf0000000	0x90000000	MIPS64 rel2

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

@@ -5,9 +5,9 @@
 
 @DPATCH@
 
-diff -Naur file-4.20.orig/magic/Magdir/elf file-4.20/magic/Magdir/elf
---- file-4.20.orig/magic/Magdir/elf	2006-12-18 14:14:34.000000000 +0000
-+++ file-4.20/magic/Magdir/elf	2007-03-27 16:47:26.000000000 +0000
+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,
@@ -17,8 +17,8 @@ diff -Naur file-4.20.orig/magic/Magdir/elf file-4.20/magic/Magdir/elf
 +>>18	leshort		0x8472		OpenRISC (obsolete),
  >>18	leshort		94		Tensilica Xtensa,
  >>18	leshort		97		NatSemi 32k,
- >>18	leshort		0x9026		Alpha (unofficial),
-@@ -193,6 +196,9 @@
+ >>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,
@@ -27,4 +27,4 @@ diff -Naur file-4.20.orig/magic/Magdir/elf file-4.20/magic/Magdir/elf
 +>>18	leshort		0x8472		OpenRISC (obsolete),
  >>18	beshort		94		Tensilica Xtensa,
  >>18	beshort		97		NatSemi 32k,
- >>18	beshort		0x9026		Alpha (unofficial),
+ >>18	beshort		0x18ad		AVR32 (unofficial),

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

@@ -5,9 +5,9 @@
 
 @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 15:42:27.000000000 +0000
+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
@@ -16,10 +16,10 @@ diff -Naur file-4.20.orig/magic/Magdir/animation file-4.20/magic/Magdir/animatio
  >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 -Naur file-4.20.orig/magic/magic.mime file-4.20/magic/magic.mime
---- file-4.20.orig/magic/magic.mime	2007-01-25 22:10:35.000000000 +0000
-+++ file-4.20/magic/magic.mime	2007-03-27 15:42:27.000000000 +0000
-@@ -643,6 +643,7 @@
+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

debian/patches/212-magic-update-os2rexx.dpatch

@@ -1,23 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 211-magic-update-os2rexx.dpatch by Werner Fink <werner@suse.de>
-##
-## DP: Workaround regex DoS (CVE-2007-2026)
-
-@DPATCH@
-
-diff -Naur file-4.21.orig/magic/Magdir/msdos file-4.21/magic/Magdir/msdos
---- file-4.21.orig/magic/Magdir/msdos	2007-06-01 18:32:10.000000000 +0000
-+++ file-4.21/magic/Magdir/msdos	2007-06-01 18:35:45.000000000 +0000
-@@ -18,8 +18,10 @@
- 100	regex/c =^[\ \t]{0,10}say\ ['"]	     OS/2 REXX batch file text
- 
- 
--100 regex/c =^\\s*call\\s+rxfuncadd.*sysloadfu OS/2 REXX batch file text
--100 regex/c =^\\s*say\ ['"] OS/2 REXX batch file text
-+#100 regex/c =^\\s*call\\s+rxfuncadd.*sysloadfu OS/2 REXX batch file text
-+#100 regex/c =^\\s*say\ ['"] OS/2 REXX batch file text
-+100  regex/c =^\\s{0,255}call\\s{1,99}rxfuncadd	OS/2 REXX batch file text
-+100  regex/c =^\\s{0,255}say\ ['"]		OS/2 REXX batch file text
- 
- 0	leshort		0x14c	MS Windows COFF Intel 80386 object file
- #>4	ledate		x	stamp %s

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

@@ -5,34 +5,39 @@
 
 @DPATCH@
 
-diff -Naur file-4.20.orig/magic/Magdir/sgi file-4.20/magic/Magdir/sgi
---- file-4.20.orig/magic/Magdir/sgi	2005-06-22 21:42:48.000000000 +0000
-+++ file-4.20/magic/Magdir/sgi	2007-04-03 14:18:32.000000000 +0000
-@@ -8,12 +8,12 @@
+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 
+ 0	string	PCPFolio			PCP
  >9	string	Version:			Archive Folio
-@@ -27,6 +27,9 @@
+@@ -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 
+ 0	string	PcPh				PCP Help
  >4	string	1				Index
  >4	string	2				Text

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

@@ -5,14 +5,13 @@
 
 @DPATCH@
 
-diff -Naur file-4.20.orig/magic/Magdir/database file-4.20/magic/Magdir/database
---- file-4.20.orig/magic/Magdir/database	2007-01-22 06:40:00.000000000 +0000
-+++ file-4.20/magic/Magdir/database	2007-04-03 12:54:46.000000000 +0000
-@@ -210,3 +210,8 @@
- 16	string		MIT-MAGIC-COOKIE-1	X11 Xauthority data
- 17	string		MIT-MAGIC-COOKIE-1	X11 Xauthority data
- 18	string		MIT-MAGIC-COOKIE-1	X11 Xauthority data
-+
+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>

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

@@ -5,12 +5,12 @@
 
 @DPATCH@
 
-diff -Naur file-4.21.orig/magic/Magdir/audio file-4.21/magic/Magdir/audio
---- file-4.21.orig/magic/Magdir/audio	2007-03-13 13:57:59.000000000 +0000
-+++ file-4.21/magic/Magdir/audio	2007-06-01 18:42:38.000000000 +0000
-@@ -556,3 +556,7 @@
- # From: Matthew Flaschen <matthew.flaschen@gatech.edu>
- 0	string	#EXTM3U 	M3U playlist text
+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

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

@@ -5,9 +5,9 @@
 
 @DPATCH@
 
-diff -Naur file-4.20.orig/magic/Magdir/clarion file-4.20/magic/Magdir/clarion
---- file-4.20.orig/magic/Magdir/clarion	1970-01-01 00:00:00.000000000 +0000
-+++ file-4.20/magic/Magdir/clarion	2007-04-03 13:02:27.000000000 +0000
+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>
@@ -32,10 +32,10 @@ diff -Naur file-4.20.orig/magic/Magdir/clarion file-4.20/magic/Magdir/clarion
 +
 +# Help files
 +0	leshort	0x49e0	Clarion Personal/Professional Developer (v2 and above) help data
-diff -Naur file-4.20.orig/magic/Makefile.am file-4.20/magic/Makefile.am
---- file-4.20.orig/magic/Makefile.am	2006-11-25 18:36:10.000000000 +0000
-+++ file-4.20/magic/Makefile.am	2007-04-03 12:57:46.000000000 +0000
-@@ -60,6 +60,7 @@
+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 \
@@ -43,10 +43,10 @@ diff -Naur file-4.20.orig/magic/Makefile.am file-4.20/magic/Makefile.am
  Magdir/clipper \
  Magdir/cracklib \
  Magdir/spec \
-diff -Naur file-4.20.orig/magic/Makefile.in file-4.20/magic/Makefile.in
---- file-4.20.orig/magic/Makefile.in	2007-03-01 23:21:09.000000000 +0000
-+++ file-4.20/magic/Makefile.in	2007-04-03 12:57:46.000000000 +0000
-@@ -200,6 +200,7 @@
+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 \

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

@@ -5,14 +5,13 @@
 
 @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 16:35:15.000000000 +0000
-@@ -619,3 +619,11 @@
- # from http://filext.com by Derek M Jones <derek@knosof.co.uk>
- 0	string	\xD0\xCF\x11\xE0\xA1\xB1\x1A\xE1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x3E\x00\x03\x00\xFE\xFF	Microsoft Installer
- 0	string	\320\317\021\340\241\261\032\341	Microsoft Office Document
-+
+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>

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

@@ -5,9 +5,9 @@
 
 @DPATCH@
 
-diff -Naur file-4.20.orig/magic/Magdir/erlang file-4.20/magic/Magdir/erlang
---- file-4.20.orig/magic/Magdir/erlang	1970-01-01 00:00:00.000000000 +0000
-+++ file-4.20/magic/Magdir/erlang	2007-04-03 15:36:54.000000000 +0000
+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
@@ -25,10 +25,10 @@ diff -Naur file-4.20.orig/magic/Magdir/erlang file-4.20/magic/Magdir/erlang
 +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 -Naur file-4.20.orig/magic/Makefile.am file-4.20/magic/Makefile.am
---- file-4.20.orig/magic/Makefile.am	2006-11-25 18:36:10.000000000 +0000
-+++ file-4.20/magic/Makefile.am	2007-04-03 15:33:45.000000000 +0000
-@@ -80,6 +80,7 @@
+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 \
@@ -36,10 +36,10 @@ diff -Naur file-4.20.orig/magic/Makefile.am file-4.20/magic/Makefile.am
  Magdir/esri \
  Magdir/fcs \
  Magdir/filesystems \
-diff -Naur file-4.20.orig/magic/Makefile.in file-4.20/magic/Makefile.in
---- file-4.20.orig/magic/Makefile.in	2007-03-01 23:21:09.000000000 +0000
-+++ file-4.20/magic/Makefile.in	2007-04-03 15:33:57.000000000 +0000
-@@ -220,6 +220,7 @@
+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 \

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

@@ -5,19 +5,19 @@
 
 @DPATCH@
 
-diff -Naur file-4.20.orig/magic/Magdir/inform file-4.20/magic/Magdir/inform
---- file-4.20.orig/magic/Magdir/inform	1970-01-01 00:00:00.000000000 +0000
-+++ file-4.20/magic/Magdir/inform	2007-04-03 15:16:07.000000000 +0000
+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 -Naur file-4.20.orig/magic/Makefile.am file-4.20/magic/Makefile.am
---- file-4.20.orig/magic/Makefile.am	2006-11-25 18:36:10.000000000 +0000
-+++ file-4.20/magic/Makefile.am	2007-04-03 15:16:24.000000000 +0000
-@@ -102,6 +103,7 @@
+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 \
@@ -25,10 +25,10 @@ diff -Naur file-4.20.orig/magic/Makefile.am file-4.20/magic/Makefile.am
  Magdir/intel \
  Magdir/interleaf \
  Magdir/island \
-diff -Naur file-4.20.orig/magic/Makefile.in file-4.20/magic/Makefile.in
---- file-4.20.orig/magic/Makefile.in	2007-03-01 23:21:09.000000000 +0000
-+++ file-4.20/magic/Makefile.in	2007-04-03 15:16:31.000000000 +0000
-@@ -242,6 +243,7 @@
+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 \
@@ -36,10 +36,10 @@ diff -Naur file-4.20.orig/magic/Makefile.in file-4.20/magic/Makefile.in
  Magdir/intel \
  Magdir/interleaf \
  Magdir/island \
-diff -Naur file-4.20.orig/magic/magic.mime file-4.20/magic/magic.mime
---- file-4.20.orig/magic/magic.mime	2007-01-25 22:10:35.000000000 +0000
-+++ file-4.20/magic/magic.mime	2007-04-03 15:18:29.000000000 +0000
-@@ -600,6 +600,11 @@
+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
  

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

@@ -5,9 +5,9 @@
 
 @DPATCH@
 
-diff -Naur file-4.20.orig/magic/Magdir/llvm file-4.20/magic/Magdir/llvm
---- file-4.20.orig/magic/Magdir/llvm	1970-01-01 00:00:00.000000000 +0000
-+++ file-4.20/magic/Magdir/llvm	2007-04-03 13:06:24.000000000 +0000
+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
@@ -17,10 +17,10 @@ diff -Naur file-4.20.orig/magic/Magdir/llvm file-4.20/magic/Magdir/llvm
 +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 -Naur file-4.20.orig/magic/Makefile.am file-4.20/magic/Makefile.am
---- file-4.20.orig/magic/Makefile.am	2007-04-03 13:05:24.000000000 +0000
-+++ file-4.20/magic/Makefile.am	2007-04-03 13:05:37.000000000 +0000
-@@ -115,6 +115,7 @@
+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 \
@@ -28,10 +28,10 @@ diff -Naur file-4.20.orig/magic/Makefile.am file-4.20/magic/Makefile.am
  Magdir/mach \
  Magdir/macintosh \
  Magdir/magic \
-diff -Naur file-4.20.orig/magic/Makefile.in file-4.20/magic/Makefile.in
---- file-4.20.orig/magic/Makefile.in	2007-04-03 13:05:24.000000000 +0000
-+++ file-4.20/magic/Makefile.in	2007-04-03 13:05:37.000000000 +0000
-@@ -255,6 +255,7 @@
+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 \

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

@@ -6,9 +6,9 @@
 
 @DPATCH@
 
-diff -Naur file-4.20.orig/magic/Magdir/lua file-4.20/magic/Magdir/lua
---- file-4.20.orig/magic/Magdir/lua	1970-01-01 00:00:00.000000000 +0000
-+++ file-4.20/magic/Magdir/lua	2007-04-03 15:56:38.000000000 +0000
+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/
@@ -24,10 +24,10 @@ diff -Naur file-4.20.orig/magic/Magdir/lua file-4.20/magic/Magdir/lua
 +0	string		\033Lua			Lua bytecode,
 +>4	byte		0x50			version 5.0
 +>4	byte		0x51			version 5.1
-diff -Naur file-4.20.orig/magic/Makefile.am file-4.20/magic/Makefile.am
---- file-4.20.orig/magic/Makefile.am	2007-04-03 15:55:15.000000000 +0000
-+++ file-4.20/magic/Makefile.am	2007-04-03 15:54:51.000000000 +0000
-@@ -118,6 +118,7 @@
+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 \
@@ -35,10 +35,10 @@ diff -Naur file-4.20.orig/magic/Makefile.am file-4.20/magic/Makefile.am
  Magdir/mach \
  Magdir/macintosh \
  Magdir/magic \
-diff -Naur file-4.20.orig/magic/Makefile.in file-4.20/magic/Makefile.in
---- file-4.20.orig/magic/Makefile.in	2007-04-03 15:55:15.000000000 +0000
-+++ file-4.20/magic/Makefile.in	2007-04-03 15:54:51.000000000 +0000
-@@ -258,6 +258,7 @@
+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 \
@@ -46,10 +46,10 @@ diff -Naur file-4.20.orig/magic/Makefile.in file-4.20/magic/Makefile.in
  Magdir/mach \
  Magdir/macintosh \
  Magdir/magic \
-diff -Naur file-4.20.orig/magic/magic.mime file-4.20/magic/magic.mime
---- file-4.20.orig/magic/magic.mime	2007-04-03 15:55:15.000000000 +0000
-+++ file-4.20/magic/magic.mime	2007-04-03 15:54:51.000000000 +0000
-@@ -288,6 +288,14 @@
+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
  

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

@@ -5,9 +5,9 @@
 
 @DPATCH@
 
-diff -Naur file-4.20.orig/magic/Magdir/luks file-4.20/magic/Magdir/luks
---- file-4.20.orig/magic/Magdir/luks	1970-01-01 00:00:00.000000000 +0000
-+++ file-4.20/magic/Magdir/luks	2007-05-17 16:22:35.000000000 +0000
+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
@@ -19,10 +19,10 @@ diff -Naur file-4.20.orig/magic/Magdir/luks file-4.20/magic/Magdir/luks
 +>40	string		x		%s,
 +>72	string		x		%s]
 +>168	string		x		UUID: %s
-diff -Naur file-4.20.orig/magic/Makefile.am file-4.20/magic/Makefile.am
---- file-4.20.orig/magic/Makefile.am	2007-05-17 16:20:03.000000000 +0000
-+++ file-4.20/magic/Makefile.am	2007-05-17 16:22:54.000000000 +0000
-@@ -119,6 +119,7 @@
+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 \
@@ -30,10 +30,10 @@ diff -Naur file-4.20.orig/magic/Makefile.am file-4.20/magic/Makefile.am
  Magdir/mach \
  Magdir/macintosh \
  Magdir/magic \
-diff -Naur file-4.20.orig/magic/Makefile.in file-4.20/magic/Makefile.in
---- file-4.20.orig/magic/Makefile.in	2007-05-17 16:20:03.000000000 +0000
-+++ file-4.20/magic/Makefile.in	2007-05-17 16:22:48.000000000 +0000
-@@ -259,6 +259,7 @@
+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 \

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

@@ -5,19 +5,19 @@
 
 @DPATCH@
 
-diff -Naur file-4.20.orig/magic/Magdir/mathcad file-4.20/magic/Magdir/mathcad
---- file-4.20.orig/magic/Magdir/mathcad	1970-01-01 00:00:00.000000000 +0000
-+++ file-4.20/magic/Magdir/mathcad	2007-05-17 17:00:39.000000000 +0000
+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 -Naur file-4.20.orig/magic/Makefile.am file-4.20/magic/Makefile.am
---- file-4.20.orig/magic/Makefile.am	2007-05-17 16:59:17.000000000 +0000
-+++ file-4.20/magic/Makefile.am	2007-05-17 17:01:07.000000000 +0000
-@@ -125,6 +125,7 @@
+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 \
@@ -25,10 +25,10 @@ diff -Naur file-4.20.orig/magic/Makefile.am file-4.20/magic/Makefile.am
  Magdir/mathematica \
  Magdir/matroska \
  Magdir/mcrypt \
-diff -Naur file-4.20.orig/magic/Makefile.in file-4.20/magic/Makefile.in
---- file-4.20.orig/magic/Makefile.in	2007-05-17 16:59:17.000000000 +0000
-+++ file-4.20/magic/Makefile.in	2007-05-17 17:01:02.000000000 +0000
-@@ -265,6 +265,7 @@
+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 \

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

@@ -5,10 +5,10 @@
 
 @DPATCH@
 
-diff -Naur file-4.21.orig/magic/Magdir/msdos file-4.21/magic/Magdir/msdos
---- file-4.21.orig/magic/Magdir/msdos	2007-08-26 08:16:22.000000000 +0000
-+++ file-4.21/magic/Magdir/msdos	2007-08-26 08:18:07.000000000 +0000
-@@ -636,3 +636,8 @@
+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

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

@@ -5,18 +5,18 @@
 
 @DPATCH@
 
-diff -Naur file-4.20.orig/magic/Magdir/netware file-4.20/magic/Magdir/netware
---- file-4.20.orig/magic/Magdir/netware	1970-01-01 00:00:00.000000000 +0000
-+++ file-4.20/magic/Magdir/netware	2007-04-03 14:28:28.000000000 +0000
+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 -Naur file-4.20.orig/magic/Makefile.am file-4.20/magic/Makefile.am
---- file-4.20.orig/magic/Makefile.am	2007-04-03 14:26:17.000000000 +0000
-+++ file-4.20/magic/Makefile.am	2007-04-03 14:26:54.000000000 +0000
-@@ -141,6 +141,7 @@
+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 \
@@ -24,10 +24,10 @@ diff -Naur file-4.20.orig/magic/Makefile.am file-4.20/magic/Makefile.am
  Magdir/news \
  Magdir/nitpicker \
  Magdir/ocaml \
-diff -Naur file-4.20.orig/magic/Makefile.in file-4.20/magic/Makefile.in
---- file-4.20.orig/magic/Makefile.in	2007-04-03 14:26:17.000000000 +0000
-+++ file-4.20/magic/Makefile.in	2007-04-03 14:27:04.000000000 +0000
-@@ -281,6 +281,7 @@
+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 \

debian/patches/319-magic-add-ocfs.dpatch

@@ -1,32 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 317-magic-add-ocfs.dpatch by Aaron Botsis <redhat@digitalmafia.org>
-##
-## DP: New magic for the Oracle Clustered Filesystem.
-
-@DPATCH@
-
-diff -Naur file-4.21.orig/magic/Magdir/filesystems file-4.21/magic/Magdir/filesystems
---- file-4.21.orig/magic/Magdir/filesystems	2007-05-16 00:02:54.000000000 +0000
-+++ file-4.21/magic/Magdir/filesystems	2007-06-01 18:46:57.000000000 +0000
-@@ -1185,6 +1185,21 @@
- >>>>>>>>&0      bedate          =0                      full dump
- >>>>>>>>&0      bedate          !0                      incremental since: %s
- 
-+# Type: Oracle Clustered Filesystem
-+# From: Aaron Botsis <redhat@digitalmafia.org>
-+8	string	OracleCFS	Oracle Clustered Filesystem,
-+>4	long	x		rev %d
-+>0	long	x		\b.%d,
-+>560	string	x		label: %.64s,
-+>136	string	x		mountpoint: %.128s
-+
-+# Type: Oracle ASM tagged volume
-+# From: Aaron Botsis <redhat@digitalmafia.org>
-+32	string	ORCLDISK	Oracle ASM Volume,
-+>40	string	x		Disk Name: %0.12s
-+32	string	ORCLCLRD	Oracle ASM Volume (cleared),
-+>40	string	x		Disk Name: %0.12s
-+
- #----------------------------------------------------------
- # VMS backup savesets - gerardo.cacciari@gmail.com
- #

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

@@ -5,13 +5,13 @@
 
 @DPATCH@
 
-diff -Naur file-4.21.orig/magic/Magdir/archive file-4.21/magic/Magdir/archive
---- file-4.21.orig/magic/Magdir/archive	2007-04-03 21:11:28.000000000 +0000
-+++ file-4.21/magic/Magdir/archive	2007-06-01 18:49:15.000000000 +0000
-@@ -731,3 +731,7 @@
- >4	lelong	0x1000006D	(EPOC release 3/4/5)
- >4	lelong	0x10003A12	(EPOC release 6)
- 0	lelong	0x10201A7A	Symbian installation file (Symbian OS 9.x)
+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
 +
 +# Type: Parity Archive
 +# From: Daniel van Eeden <daniel_e@dds.nl>

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

@@ -5,10 +5,10 @@
 
 @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-03-27 16:14:16.000000000 +0000
-@@ -525,3 +525,8 @@
+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

debian/patches/322-magic-add-pmenu.dpatch

@@ -5,10 +5,10 @@
 
 @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-04-03 13:21:02.000000000 +0000
-@@ -54,3 +54,8 @@
+diff -Naurp file-4.23.orig/magic/Magdir/commands file-4.23/magic/Magdir/commands
+--- file-4.23.orig/magic/Magdir/commands	2007-06-01 19:40:26.000000000 +0000
++++ file-4.23/magic/Magdir/commands	2008-01-12 17:34:41.000000000 +0000
+@@ -55,3 +55,8 @@
  0	string		Zend\x00		PHP script Zend Optimizer data
  
  0	string		$!			DCL command file

debian/patches/324-magic-add-scummvm.dpatch

@@ -5,14 +5,13 @@
 
 @DPATCH@
 
-diff -Naur file-4.21.orig/magic/Magdir/console file-4.21/magic/Magdir/console
---- file-4.21.orig/magic/Magdir/console	2007-03-18 21:45:28.000000000 +0000
-+++ file-4.21/magic/Magdir/console	2007-06-01 18:51:01.000000000 +0000
-@@ -191,3 +191,8 @@
- 0	string	PPF10			Playstation Patch File version 1.0
- >5	byte	0			\b, Simple Encoding
- >6	string	x			\b, description: %s
-+
+diff -Naurp file-4.23.orig/magic/Magdir/console file-4.23/magic/Magdir/console
+--- file-4.23.orig/magic/Magdir/console	2007-09-26 20:22:31.000000000 +0000
++++ file-4.23/magic/Magdir/console	2008-01-12 17:36:55.000000000 +0000
+@@ -252,3 +252,7 @@
+ # .w3m
+ 0	string HM3W				Warcraft III map file
+ 
 +# Type: scummVM savegame files
 +# From: Sven Hartge <debian@ds9.argh.org>
 +0	string	SCVM	scummVM savegame

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

@@ -5,9 +5,9 @@
 
 @DPATCH@
 
-diff -Naur file-4.20.orig/magic/Magdir/sisu file-4.20/magic/Magdir/sisu
---- file-4.20.orig/magic/Magdir/sisu	1970-01-01 00:00:00.000000000 +0000
-+++ file-4.20/magic/Magdir/sisu	2007-04-26 06:12:12.000000000 +0000
+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
 @@ -0,0 +1,18 @@
 +# Type: SiSU Markup Language
 +# URL:  http://www.sisudoc.org/
@@ -27,10 +27,10 @@ diff -Naur file-4.20.orig/magic/Magdir/sisu file-4.20/magic/Magdir/sisu
 +
 +0	regex	\^%*[\ \t]*sisu-[0-9.]+		SiSU text
 +>5	regex	[0-9.]+				%s
-diff -Naur file-4.20.orig/magic/Makefile.am file-4.20/magic/Makefile.am
---- file-4.20.orig/magic/Makefile.am	2007-04-26 06:10:03.000000000 +0000
-+++ file-4.20/magic/Makefile.am	2007-04-26 06:10:24.000000000 +0000
-@@ -182,6 +182,7 @@
+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 \
@@ -38,10 +38,10 @@ diff -Naur file-4.20.orig/magic/Makefile.am file-4.20/magic/Makefile.am
  Magdir/sketch \
  Magdir/smalltalk \
  Magdir/sniffer \
-diff -Naur file-4.20.orig/magic/Makefile.in file-4.20/magic/Makefile.in
---- file-4.20.orig/magic/Makefile.in	2007-04-26 06:10:03.000000000 +0000
-+++ file-4.20/magic/Makefile.in	2007-04-26 06:10:24.000000000 +0000
-@@ -322,6 +322,7 @@
+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 \

debian/patches/331-magic-add-supercollider.dpatch

@@ -6,10 +6,10 @@
 
 @DPATCH@
 
-diff -Naur file-4.21.orig/magic/Magdir/audio file-4.21/magic/Magdir/audio
---- file-4.21.orig/magic/Magdir/audio	2007-06-01 18:56:31.000000000 +0000
-+++ file-4.21/magic/Magdir/audio	2007-06-01 18:57:19.000000000 +0000
-@@ -568,3 +568,8 @@
+diff -Naurp file-4.23.orig/magic/Magdir/audio file-4.23/magic/Magdir/audio
+--- file-4.23.orig/magic/Magdir/audio	2008-01-12 17:39:01.000000000 +0000
++++ file-4.23/magic/Magdir/audio	2008-01-12 17:38:49.000000000 +0000
+@@ -576,3 +576,8 @@
  # 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/333-magic-add-xen.dpatch

@@ -5,10 +5,10 @@
 
 @DPATCH@
 
-diff -Naur file-4.21.orig/magic/Magdir/linux file-4.21/magic/Magdir/linux
---- file-4.21.orig/magic/Magdir/linux	2007-04-23 14:32:39.000000000 +0000
-+++ file-4.21/magic/Magdir/linux	2007-06-01 19:00:29.000000000 +0000
-@@ -246,3 +246,9 @@
+diff -Naurp file-4.23.orig/magic/Magdir/linux file-4.23/magic/Magdir/linux
+--- file-4.23.orig/magic/Magdir/linux	2008-01-12 17:47:04.000000000 +0000
++++ file-4.23/magic/Magdir/linux	2008-01-12 17:46:42.000000000 +0000
+@@ -248,3 +248,9 @@
  >72	string	x		%s]
  >168	string	x		UUID: %s
  

debian/patches/901-file-elf.dpatch

@@ -5,10 +5,10 @@
 
 @DPATCH@
 
-diff -Naur file-4.20.orig/src/readelf.c file-4.20/src/readelf.c
---- file-4.20.orig/src/readelf.c	2007-01-18 05:45:35.000000000 +0000
-+++ file-4.20/src/readelf.c	2007-03-27 12:23:14.000000000 +0000
-@@ -907,29 +915,30 @@
+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;
  

debian/patches/902-file-kfreebsd.dpatch

@@ -5,10 +5,10 @@
 
 @DPATCH@
 
-diff -Naur file-4.20.orig/src/readelf.c file-4.20/src/readelf.c
---- file-4.20.orig/src/readelf.c	2007-01-18 05:45:35.000000000 +0000
-+++ file-4.20/src/readelf.c	2007-03-27 12:23:14.000000000 +0000
-@@ -396,6 +396,14 @@
+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;
@@ -23,10 +23,10 @@ diff -Naur file-4.20.orig/src/readelf.c file-4.20/src/readelf.c
  		default:
  			if (file_printf(ms, "<unknown>") == -1)
  				return size; 
-diff -Naur file-4.20.orig/src/readelf.h file-4.20/src/readelf.h
---- file-4.20.orig/src/readelf.h	2007-01-12 17:40:53.000000000 +0000
-+++ file-4.20/src/readelf.h	2007-03-27 12:23:14.000000000 +0000
-@@ -232,5 +232,7 @@
+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

debian/patches/903-file-localmagic.dpatch

@@ -6,17 +6,30 @@
 
 @DPATCH@
 
-diff -Naur file-4.20.orig/magic/magic.local file-4.20/magic/magic.local
---- file-4.20.orig/magic/magic.local	1970-01-01 00:00:00.000000000 +0000
-+++ file-4.20/magic/magic.local	2007-03-27 12:23:14.000000000 +0000
+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
+@@ -1,5 +1,5 @@
+-# Magic
+ # Magic data for file(1) command.
+-# Machine-generated from src/cmd/file/magdir/*; edit there only!
+-# Format is described in magic(files), where:
+-# files is 5 on V7 and BSD, 4 on SV, and ?? in the SVID.
++# Format is described in magic(5).
++# 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
 @@ -0,0 +1,3 @@
 +# Magic local data for file(1) command.
 +# Insert here your local magic data. Format is described in magic(5).
 +
-diff -Naur file-4.20.orig/src/Makefile.am file-4.20/src/Makefile.am
---- file-4.20.orig/src/Makefile.am	2007-01-12 17:40:53.000000000 +0000
-+++ file-4.20/src/Makefile.am	2007-03-27 12:23:14.000000000 +0000
-@@ -5,7 +5,7 @@
+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
  
  bin_PROGRAMS = file
  
@@ -25,10 +38,10 @@ diff -Naur file-4.20.orig/src/Makefile.am file-4.20/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 -Naur file-4.20.orig/src/Makefile.in file-4.20/src/Makefile.in
---- file-4.20.orig/src/Makefile.in	2007-03-01 23:21:09.000000000 +0000
-+++ file-4.20/src/Makefile.in	2007-03-27 12:23:14.000000000 +0000
-@@ -196,7 +196,7 @@
+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
  lib_LTLIBRARIES = libmagic.la
  include_HEADERS = magic.h
  EXTRA_DIST = test.c
@@ -36,17 +49,4 @@ diff -Naur file-4.20.orig/src/Makefile.in file-4.20/src/Makefile.in
 +AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
  libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
  	compress.c is_tar.c readelf.c print.c fsmagic.c \
- 	funcs.c file.h names.h patchlevel.h readelf.h tar.h apptype.c
-diff -Naur file-4.20.orig/magic/Header file-4.20/magic/Header
---- file-4.20.orig/magic/Header	2000-08-05 17:36:46.000000000 +0000
-+++ file-4.20/magic/Header	2007-03-27 12:23:14.000000000 +0000
-@@ -1,5 +1,5 @@
--# Magic
- # Magic data for file(1) command.
--# Machine-generated from src/cmd/file/magdir/*; edit there only!
--# Format is described in magic(files), where:
--# files is 5 on V7 and BSD, 4 on SV, and ?? in the SVID.
-+# Format is described in magic(5).
-+# 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).
-+
+ 	funcs.c file.h names.h patchlevel.h readelf.h tar.h apptype.c \

debian/patches/904-file-make.dpatch

@@ -5,15 +5,15 @@
 
 @DPATCH@
 
-diff -Naur file-4.20.orig/src/Makefile.in file-4.20/src/Makefile.in
---- file-4.20.orig/src/Makefile.in	2007-03-01 23:21:09.000000000 +0000
-+++ file-4.20/src/Makefile.in	2007-03-27 12:23:14.000000000 +0000
-@@ -296,7 +296,7 @@
+diff -Naurp file-4.23.orig/src/Makefile.in file-4.23/src/Makefile.in
+--- file-4.23.orig/src/Makefile.in	2008-01-12 17:55:24.000000000 +0000
++++ file-4.23/src/Makefile.in	2008-01-12 17:56:46.000000000 +0000
+@@ -300,7 +300,7 @@ clean-binPROGRAMS:
  	done
  file$(EXEEXT): $(file_OBJECTS) $(file_DEPENDENCIES) 
  	@rm -f file$(EXEEXT)
--	$(LINK) $(file_LDFLAGS) $(file_OBJECTS) $(file_LDADD) $(LIBS)
-+	$(LINK) $(file_LDFLAGS) $(file_OBJECTS) $(file_LDADD)
+-	$(LINK) $(file_OBJECTS) $(file_LDADD) $(LIBS)
++	$(LINK) $(file_OBJECTS) $(file_LDADD)
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)

debian/patches/905-file-segfault.dpatch

@@ -5,10 +5,10 @@
 
 @DPATCH@
 
-diff -Naur file-4.20.orig/src/print.c file-4.20/src/print.c
---- file-4.20.orig/src/print.c	2007-01-18 05:45:35.000000000 +0000
-+++ file-4.20/src/print.c	2007-05-17 16:39:17.000000000 +0000
-@@ -179,7 +179,10 @@
+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); 
  

debian/patches/998-doc-manpages.dpatch

@@ -5,10 +5,10 @@
 
 @DPATCH@
 
-diff -Naur file-4.20.orig/doc/file.man file-4.20/doc/file.man
---- file-4.20.orig/doc/file.man	2007-01-25 21:05:46.000000000 +0000
-+++ file-4.20/doc/file.man	2007-04-03 17:57:01.000000000 +0000
-@@ -47,9 +47,8 @@
+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 
  or non-printable).
  Exceptions are well-known file formats (core files, tar archives)
  that are known to contain binary data.
@@ -20,7 +20,7 @@ diff -Naur file-4.20.orig/doc/file.man file-4.20/doc/file.man
  .Em "preserve these keywords" .
  People depend on knowing that all the readable files in a directory
  have the word 
-@@ -76,17 +75,17 @@
+@@ -78,17 +77,17 @@ Any known file types appropriate to the 
  implement them)
  are intuited if they are defined in
  the system header file
@@ -42,7 +42,7 @@ diff -Naur file-4.20.orig/doc/file.man file-4.20/doc/file.man
  in the standard include directory.
  These files have a 
  .Sq "magic number"
-@@ -99,12 +98,14 @@
+@@ -101,12 +100,14 @@ 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.
@@ -59,7 +59,7 @@ diff -Naur file-4.20.orig/doc/file.man file-4.20/doc/file.man
  .Nm
  will look in
  .Pa $HOME/.magic.mgc ,
-@@ -144,7 +145,7 @@
+@@ -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
@@ -68,7 +68,7 @@ diff -Naur file-4.20.orig/doc/file.man file-4.20/doc/file.man
  that can appear anywhere in the first few blocks of a file.
  For example, the keyword
  .Em .br
-@@ -161,7 +162,8 @@
+@@ -163,7 +164,8 @@ The language test routines also test for
  archives).
  .Pp
  Any file that cannot be identified as having been written
@@ -78,31 +78,21 @@ diff -Naur file-4.20.orig/doc/file.man file-4.20/doc/file.man
  .Sh OPTIONS
  .Bl -tag -width indent
  .It Fl b , -brief
-@@ -239,7 +241,12 @@
- .Dq FILES
- section, below).
+@@ -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 
++(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
-@@ -252,7 +259,8 @@
- This can be a single file, or a colon-separated list of files.
- If a compiled magic file is found alongside, it will be used instead.
- With the 
--.Fl i or 
-+.Fl i
-+or 
- .Fl "mime"
- option, the program adds
- .Dq .mime
-@@ -339,6 +347,11 @@
+@@ -345,6 +352,11 @@ adds
  and/or
  .Dq .mgc
  to the value of this variable as appropriate.
@@ -114,7 +104,7 @@ diff -Naur file-4.20.orig/doc/file.man file-4.20/doc/file.man
  The environment variable
  .Dv POSIXLY_CORRECT
  controls (on systems that support symbolic links), if
-@@ -413,12 +426,6 @@
+@@ -419,12 +431,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.
@@ -127,7 +117,7 @@ diff -Naur file-4.20.orig/doc/file.man file-4.20/doc/file.man
  .Sh EXAMPLES
  .Bd -literal -offset indent 
  $ file file.c file /dev/{wd0a,hda}
-@@ -586,9 +593,17 @@
+@@ -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.
@@ -145,9 +135,9 @@ diff -Naur file-4.20.orig/doc/file.man file-4.20/doc/file.man
 +obtained from every site carrying a Debian distribution (that is
 +.Dv ftp.debian.org
 +and mirrors).
-diff -Naur file-4.20.orig/doc/libmagic.man file-4.20/doc/libmagic.man
---- file-4.20.orig/doc/libmagic.man	2007-01-25 21:04:08.000000000 +0000
-+++ file-4.20/doc/libmagic.man	2007-04-03 17:56:16.000000000 +0000
+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.
@@ -157,10 +147,10 @@ diff -Naur file-4.20.orig/doc/libmagic.man file-4.20/doc/libmagic.man
  .Sh SYNOPSIS
  .In magic.h
  .Ft magic_t
-diff -Naur file-4.20.orig/doc/magic.man file-4.20/doc/magic.man
---- file-4.20.orig/doc/magic.man	2007-01-12 17:38:27.000000000 +0000
-+++ file-4.20/doc/magic.man	2007-04-03 17:56:16.000000000 +0000
-@@ -65,7 +65,7 @@
+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

debian/patches/999-conglomeration.dpatch

@@ -5,29 +5,18 @@
 
 @DPATCH@
 
-diff -Naur file-4.21.orig/magic/magic.mime file-4.21/magic/magic.mime
---- file-4.21.orig/magic/magic.mime	2007-06-01 19:04:43.000000000 +0000
-+++ file-4.21/magic/magic.mime	2007-06-01 19:18:52.000000000 +0000
-@@ -157,8 +157,7 @@
- # Creative Labs AUDIO stuff
- #					Standard MIDI data
- 0	string	MThd			audio/unknown
--#>9 	byte	>0			(format %d)
--#>11	byte	>1			using %d channels
+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/unknown
+ 0	string	CTMF			audio/x-unknown
  #					SoundBlaster instrument data
-@@ -273,7 +272,7 @@
- 0       string          #!/usr/bin/awk          application/x-awk
- 0       string          #!\ /usr/bin/awk        application/x-awk
- # update to distinguish from *.vcf files by Joerg Jenderek: joerg dot jenderek at web dot de
--0	regex		BEGIN[[:space:]]*[{]	application/x-awk
-+#0	regex		BEGIN[[:space:]]*[{]	application/x-awk
- 
- # For Larry Wall's perl language.  The ``eval'' line recognizes an
- # outrageously clever hack for USG systems.
-@@ -306,7 +305,7 @@
+@@ -332,7 +333,7 @@
  # because it tries to uncompress it to figure out what's inside.
  
  # standard unix compress
@@ -36,7 +25,7 @@ diff -Naur file-4.21.orig/magic/magic.mime file-4.21/magic/magic.mime
  
  # gzip (GNU zip, not to be confused with [Info-ZIP/PKWARE] zip archiver)
  0       string          \037\213        application/x-gzip
-@@ -408,18 +407,14 @@
+@@ -437,18 +438,14 @@
  #------------------------------------------------------------------------------
  # html:  file(1) magic for HTML (HyperText Markup Language) docs
  #
@@ -62,7 +51,7 @@ diff -Naur file-4.21.orig/magic/magic.mime file-4.21/magic/magic.mime
  
  #------------------------------------------------------------------------------
  # images:  file(1) magic for image formats (see also "c-lang" for XPM bitmaps)
-@@ -482,7 +477,7 @@
+@@ -511,7 +508,7 @@
  0	beshort		0xffd8		image/jpeg
  
  # PC bitmaps (OS/2, Windoze BMP files)  (Greg Roelofs, newt@uchicago.edu)
@@ -71,7 +60,7 @@ diff -Naur file-4.21.orig/magic/magic.mime file-4.21/magic/magic.mime
  #>14	byte		12		(OS/2 1.x format)
  #>14	byte		64		(OS/2 2.x format)
  #>14	byte		40		(Windows 3.x format)
-@@ -720,8 +715,10 @@
+@@ -749,8 +746,10 @@
  #------------------------------------------------------------------------------
  # Hierarchical Data Format, used to facilitate scientific data exchange
  # specifications at http://hdf.ncsa.uiuc.edu/
@@ -83,21 +72,31 @@ diff -Naur file-4.21.orig/magic/magic.mime file-4.21/magic/magic.mime
 +0	string		\211HDF\r\n\032		application/x-hdf
  
  # Adobe Photoshop
- 0	string		8BPS			image/x-photoshop
-@@ -791,21 +788,26 @@
+ 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                  text/PGP key public ring
--0       beshort         0x9501                  text/PGP key security ring
--0       beshort         0x9500                  text/PGP key security ring
--0       beshort         0xa600                  text/PGP encrypted 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
++#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
@@ -111,11 +110,14 @@ diff -Naur file-4.21.orig/magic/magic.mime file-4.21/magic/magic.mime
 +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                  text/GnuPG key public ring
+-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
@@ -123,19 +125,19 @@ diff -Naur file-4.21.orig/magic/magic.mime file-4.21/magic/magic.mime
  
  # flash:        file(1) magic for Macromedia Flash file format
  #
-@@ -969,3 +971,8 @@
- # Symbian installation files
- 8	lelong	0x10000419	application/vnd.symbian.install
+@@ -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 -Naur file-4.21.orig/src/file.c file-4.21/src/file.c
---- file-4.21.orig/src/file.c	2007-05-08 14:44:18.000000000 +0000
-+++ file-4.21/src/file.c	2007-06-01 19:19:33.000000000 +0000
-@@ -352,7 +352,7 @@
+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);
@@ -144,10 +146,10 @@ diff -Naur file-4.21.orig/src/file.c file-4.21/src/file.c
  }
  
  
-diff -Naur file-4.21.orig/src/fsmagic.c file-4.21/src/fsmagic.c
---- file-4.21.orig/src/fsmagic.c	2007-01-12 17:40:53.000000000 +0000
-+++ file-4.21/src/fsmagic.c	2007-06-01 19:19:33.000000000 +0000
-@@ -92,7 +92,8 @@
+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
  		if (file_printf(ms, "cannot open `%s' (%s)",
  		    fn, strerror(errno)) == -1)
  			return -1;
@@ -156,4 +158,4 @@ diff -Naur file-4.21.orig/src/fsmagic.c file-4.21/src/fsmagic.c
 +		return -1;
  	}
  
- 	if ((ms->flags & MAGIC_MIME) != 0) {
+ 	if (mime) {