Import Debian version 5.03-4

debian/README.source

@@ -0,0 +1,37 @@
+Package Repositories
+--------------------
+
+Backports for the current stable debian distribution as well as snapshots of
+unreleased versions may be available in repositories listed on the maintainers
+homepage. The current URL of the maintainer homepage can be seen in
+debian/copyright.
+
+
+Source Access
+-------------
+
+You can obtain the sources of this package with:
+
+  $ apt-get source ${PACKAGE}
+
+whereas '${PACKAGE}' has to be replaced with the actual name of the package.
+
+This package is maintained with the Git version control system. The current git
+source tree can be obtained with:
+
+  $ git clone ${GIT_URI}
+
+whereas '${GIT_URI}' has to be replaced with the actual URI for the Git
+repository. The current Git URI can be seen in debian/control in the extracted
+package sources.
+
+More information about Git can be found in the git-core package.
+
+This package may use the Quilt patch system to manage all modifications to the
+upstream source. Changes, if any, are stored in the source package as diffs in
+debian/diff and are applied during the build. Current modifications can be
+applied to the source tree with:
+
+  $ QUILT_PATCHES=debian/patches quilt push -a
+
+More information about Quilt can be found in the quilt package.

debian/patches/124-magic-update-postscript-fonts.patch

@@ -0,0 +1,25 @@
+Author: Daniel Novotny <dnovotny@redhat.com>
+Description: one more PostScript font magic added.
+
+diff -Naurp file.orig/magic/Magdir/fonts file/magic/Magdir/fonts
+--- file.orig/magic/Magdir/fonts	2009-12-05 17:30:09.000000000 +0100
++++ file/magic/Magdir/fonts	2009-12-05 17:39:58.000000000 +0100
+@@ -9,6 +9,9 @@
+ 0	string		%!PS-AdobeFont-1.	PostScript Type 1 font text
+ >20	string		>\0			(%s)
+ 6	string		%!PS-AdobeFont-1.	PostScript Type 1 font program data
++0	string		%!FontType1		PostScript Type 1 font program data
++6	string		%!FontType1		PostScript Type 1 font program data
++0	string		%!PS-Adobe-3.0\ Resource-Font	PostScript Type 1 font text
+ 
+ # X11 font files in SNF (Server Natural Format) format
+ 0	belong		00000004		X11 SNF font data, MSB first
+@@ -58,7 +61,7 @@
+ 0	string		ttcf		TrueType font collection data
+ 
+ # Opentype font data from Avi Bercovich
+-0	string		OTTO		OpenType font data 
++0	string		OTTO		OpenType font data
+ 
+ # Gürkan Sengün <gurkan@linuks.mine.nu>, www.linuks.mine.nu 
+ 0	string		SplineFontDB:	Spline Font Database 

debian/patches/125-magic-update-truetype-fonts.patch

@@ -0,0 +1,22 @@
+Author: Adam Buchbinder <adam.buchbinder@gmail.com>
+Description: Update magic of TrueType Collections (Closes: #545709).
+
+diff -Naurp file.orig/magic/Magdir/fonts file/magic/Magdir/fonts
+--- file.orig/magic/Magdir/fonts	2009-12-05 18:26:41.000000000 +0100
++++ file/magic/Magdir/fonts	2009-12-05 18:26:58.000000000 +0100
+@@ -58,7 +58,15 @@
+ 0	string		\007\001\001\000Copyright\ (c)\ 199	Adobe Multiple Master font
+ 0	string		\012\001\001\000Copyright\ (c)\ 199	Adobe Multiple Master font
+ 
++# TrueType/OpenType font collections (.ttc)
++# http://www.microsoft.com/typography/otspec/otff.htm
+ 0	string		ttcf		TrueType font collection data
++>4	belong		0x00010000	\b, 1.0
++>>8	belong		>0		\b, %d fonts
++>4	belong		0x00020000	\b, 2.0
++>>8	belong		>0		\b, %d fonts
++# 0x44454947 = 'DSIG'
++>>>16	belong		0x44534947	\b, digitally signed
+ 
+ # Opentype font data from Avi Bercovich
+ 0	string		OTTO		OpenType font data

debian/patches/126-magic-update-7zip.patch

@@ -0,0 +1,14 @@
+Author: Daniel Baumann <daniel@debian.org>
+Description: Adding mime type for 7-zip (Closes: #552742).
+
+diff -Naurp file.orig/magic/Magdir/compress file/magic/Magdir/compress
+--- file.orig/magic/Magdir/compress	2009-12-05 17:30:09.000000000 +0100
++++ file/magic/Magdir/compress	2009-12-05 18:54:52.000000000 +0100
+@@ -187,6 +187,7 @@
+ 0	string		7z\274\257\047\034	7-zip archive data,
+ >6	byte		x			version %d
+ >7	byte		x			\b.%d
++!:mime	application/x-7z-compressed
+ 
+ # Type: LZMA
+ # URL:  http://www.7-zip.org/sdk.html

debian/patches/224-magic-add-lyx.patch

@@ -0,0 +1,12 @@
+Author: Daniel Baumann <daniel@debian.org>
+Description: Adding new magic for Lyx (Closes: #556194).
+
+diff -Naurp file.orig/magic/Magdir/tex file/magic/Magdir/tex
+--- file.orig/magic/Magdir/tex	2009-10-02 14:14:27.000000000 +0200
++++ file/magic/Magdir/tex	2009-11-15 11:02:53.000000000 +0100
+@@ -91,3 +91,5 @@
+ 0	search/1	%\ BibTeX\ `	BibTeX custom bibliography style text file
+ 
+ 0	search/1	@c\ @mapfile{	TeX font aliases text file
++
++0	string		\#LyX		LyX document text

debian/patches/225-magic-add-bacula.patch

@@ -0,0 +1,16 @@
+Author: Adam Buchbinder <adam.buchbinder@gmail.com>
+Description: Add Bacula volume support (Closes: #556981).
+
+diff -Naurp file.orig/magic/Magdir/archive file/magic/Magdir/archive
+--- file.orig/magic/Magdir/archive	2009-11-18 19:44:34.000000000 +0000
++++ file/magic/Magdir/archive	2009-11-18 19:45:51.000000000 +0000
+@@ -806,3 +806,9 @@
+ # Type: Parity Archive
+ # From: Daniel van Eeden <daniel_e@dds.nl>
+ 0	string	 PAR2		Parity Archive Volume Set
++
++# Bacula volume format. (Volumes always start with a block header.)
++# URL: http://bacula.org/3.0.x-manuals/en/developers/developers/Block_Header.html
++# From: Adam Buchbinder <adam.buchbinder@gmail.com>
++12	string	BB02		Bacula volume
++>20	bedate	x		\b, started %s

debian/patches/226-magic-add-olympus.patch

@@ -0,0 +1,20 @@
+Author: Adam Buchbinder <adam.buchbinder@gmail.com>
+Description: Add Olympus ORF support (Closes: #519305).
+
+diff -Naurp file.orig/magic/Magdir/images file/magic/Magdir/images
+--- file.orig/magic/Magdir/images	2009-11-18 19:44:34.000000000 +0000
++++ file/magic/Magdir/images	2009-11-18 19:47:35.000000000 +0000
+@@ -624,3 +624,13 @@
+ # URL:	http://webcvs.freedesktop.org/mime/shared-mime-info/freedesktop.org.xml.in?view=markup
+ # From:	Mathias Brodala <info@noctus.net>
+ 0	string	Xcur			X11 cursor
++
++# Type:	Olympus ORF raw images.
++# URL:	http://libopenraw.freedesktop.org/wiki/Olympus_ORF
++# From:	Adam Buchbinder <adam.buchbinder@gmail.com>
++0	string		MMOR		Olympus ORF raw image data, big-endian
++!:mime	image/x-olympus-orf
++0	string		IIRO		Olympus ORF raw image data, little-endian
++!:mime	image/x-olympus-orf
++0	string		IIRS		Olympus ORF raw image data, little-endian
++!:mime	image/x-olympus-orf

debian/patches/227-magic-add-gstreamer.patch

@@ -0,0 +1,20 @@
+Author: Josh Triplett <josh@joshtriplett.org>
+Description:
+ Add new magic for gstreamer binary registry files (Closes: #559117).
+
+diff -Naurp file.orig/magic/Magdir/misctools file/magic/Magdir/misctools
+--- file.orig/magic/Magdir/misctools	2009-10-02 14:14:27.000000000 +0200
++++ file/magic/Magdir/misctools	2009-12-05 17:28:02.000000000 +0100
+@@ -10,6 +10,12 @@
+ 4	string	gtktalog		GNOME Catalogue (gtktalog)
+ >13	string	>\0			version %s
+ 
++# Summary: GStreamer binary registry
++# Extension: .bin
++# Submitted by: Josh Triplett <josh@joshtriplett.org>
++0	belong	0xc0def00d		GStreamer binary registry
++>4	string	x			\b, version %s
++
+ # Summary: Libtool library file
+ # Extension: .la
+ # Submitted by: Tomasz Trojanowski <tomek@uninet.com.pl>

debian/patches/228-magic-add-mdmp.patch

@@ -0,0 +1,13 @@
+Author: Daniel Novotny <dnovotny@redhat.com>
+Description: Add new magic for MDMP crash report data files.
+
+diff -Naurp file.orig/magic/Magdir/misctools file/magic/Magdir/misctools
+--- file.orig/magic/Magdir/misctools	2009-12-05 17:34:07.000000000 +0100
++++ file/magic/Magdir/misctools	2009-12-05 17:35:01.000000000 +0100
+@@ -25,3 +25,6 @@
+ # Extension: .lo
+ # Submitted by: Abel Cheung <abelcheung@gmail.com>
+ 0	search/80	.lo\ -\ a\ libtool\ object\ file	libtool object file
++
++# From: Daniel Novotny <dnovotny@redhat.com>
++0	string		MDMP\x93\xA7				MDMP crash report data

debian/patches/229-magic-add-xfsdump.patch

@@ -0,0 +1,17 @@
+Author: Daniel Novotny <dnovotny@redhat.com>
+Description: Add new magic for xfs dumps.
+
+diff -Naurp file.orig/magic/Magdir/filesystems file/magic/Magdir/filesystems
+--- file.orig/magic/Magdir/filesystems	2009-12-05 17:44:07.000000000 +0100
++++ file/magic/Magdir/filesystems	2009-12-05 17:46:52.000000000 +0100
+@@ -1414,3 +1414,10 @@
+ >40	ulelong	>0	\b fblock size = %ld,
+ >44	ulelong	>0	\b block size = %ld,
+ >48	ulequad	>0	\b bytes = %lld
++
++# Type:	xfs metadump image
++# From:	Daniel Novotny <dnovotny@redhat.com>
++# mb_magic XFSM at 0; superblock magic XFSB at 1 << mb_blocklog
++# but can we do the << ? For now it's always 512 (0x200) anyway.
++0	string	XFSM
++>0x200	string	XFSB	XFS filesystem metadump image

debian/patches/230-magic-add-ppc-swapfile.patch

@@ -0,0 +1,17 @@
+Author: Daniel Novotny <dnovotny@redhat.com>
+Description: Add new magic for ppc swapfiles.
+
+diff -Naurp file.orig/magic/Magdir/linux file/magic/Magdir/linux
+--- file.orig/magic/Magdir/linux	2009-12-05 17:44:07.000000000 +0100
++++ file/magic/Magdir/linux	2009-12-05 17:50:38.000000000 +0100
+@@ -69,6 +69,10 @@
+ >0x414	beshort		x		\b-%04x
+ >0x416	belong		x		\b-%08x
+ >0x41a	beshort		x		\b%04x
++
++# From: Daniel Novotny <dnovotny@redhat.com>
++65526	string		SWAPSPACE2	Linux/ppc swap file
++
+ # ECOFF magic for OSF/1 and Linux (only tested under Linux though)
+ #
+ #	from Erik Troan (ewt@redhat.com) examining od dumps, so this

debian/patches/231-magic-add-delta-iso.patch

@@ -0,0 +1,15 @@
+Author: Daniel Novotny <dnovotny@redhat.com>
+Description: Add new magic for delta iso files.
+
+diff -Naurp file.orig/magic/Magdir/filesystems file/magic/Magdir/filesystems
+--- file.orig/magic/Magdir/filesystems	2009-12-05 17:53:02.000000000 +0100
++++ file/magic/Magdir/filesystems	2009-12-05 17:54:22.000000000 +0100
+@@ -1421,3 +1421,8 @@
+ # but can we do the << ? For now it's always 512 (0x200) anyway.
+ 0	string	XFSM
+ >0x200	string	XFSB	XFS filesystem metadump image
++
++# Type:	delta ISO
++# From:	Daniel Novotny <dnovotny@redhat.com>
++0	string	DISO	Delta ISO data,
++>4	belong	x	version %d

debian/patches/232-magic-add-delta-rpm.patch

@@ -0,0 +1,16 @@
+Author: Daniel Novotny <dnovotny@redhat.com>
+Description: Add new magic for delta rpm files.
+
+diff -Naurp file.orig/magic/Magdir/rpm file/magic/Magdir/rpm
+--- file.orig/magic/Magdir/rpm	2009-12-05 17:30:09.000000000 +0100
++++ file/magic/Magdir/rpm	2009-12-05 17:56:35.000000000 +0100
+@@ -21,3 +21,9 @@
+ >>8	beshort		11		MIPSel
+ >>8	beshort		12		ARM
+ >>10	string		x		%s
++
++# Type:	Delta RPM
++# From:	Daniel Novotny (dnovotny@redhat.com)
++0	string		drpm		Delta RPM
++!:mime application/x-rpm
++>12	string		x		%s

debian/patches/233-magic-add-avchd.patch

@@ -0,0 +1,15 @@
+Author: Alexander Danilov <alexander.a.danilov@gmail.com>
+Description: Add new magic for AVCHD Clip Information files (Closes: #538847).
+
+diff -Naurp file.orig/magic/Magdir/images file/magic/Magdir/images
+--- file.orig/magic/Magdir/images	2009-12-05 18:09:09.000000000 +0100
++++ file/magic/Magdir/images	2009-12-05 18:10:44.000000000 +0100
+@@ -634,3 +634,8 @@
+ !:mime	image/x-olympus-orf
+ 0	string		IIRS		Olympus ORF raw image data, little-endian
+ !:mime	image/x-olympus-orf
++
++# Type: files used in modern AVCHD camcoders to store clip information
++# Extension: .cpi
++# From: Alexander Danilov <alexander.a.danilov@gmail.com>
++0	string	HDMV0100	AVCHD Clip Information

debian/patches/234-magic-add-chiasmus.patch

@@ -0,0 +1,38 @@
+Author: Daniel Baumann <daniel@debian.org>
+Description: Adding new magics for Chiasmus (Closes: #540368).
+
+diff -Naurp file.orig/magic/Magdir/bsi file/magic/Magdir/bsi
+--- file.orig/magic/Magdir/bsi	1970-01-01 01:00:00.000000000 +0100
++++ file/magic/Magdir/bsi	2009-12-05 18:16:59.000000000 +0100
+@@ -0,0 +1,9 @@
++# Chiasmus is a encryption standard developed by the German Federal
++# Office for Information Security (Bundesamt fuer Sicherheit in der
++# Informationstechnik).
++
++# Extension: .xia
++0	string	XIA1	Chiasmus encrypted data
++
++# Extension: .xis
++0	string	XIS	Chiasmus key
+diff -Naurp file.orig/magic/Makefile.am file/magic/Makefile.am
+--- file.orig/magic/Makefile.am	2009-12-05 18:09:09.000000000 +0100
++++ file/magic/Makefile.am	2009-12-05 18:17:20.000000000 +0100
+@@ -30,6 +30,7 @@ $(MAGIC_FRAGMENT_DIR)/blender \
+ $(MAGIC_FRAGMENT_DIR)/blit \
+ $(MAGIC_FRAGMENT_DIR)/bout \
+ $(MAGIC_FRAGMENT_DIR)/bsdi \
++$(MAGIC_FRAGMENT_DIR)/bsi \
+ $(MAGIC_FRAGMENT_DIR)/btsnoop \
+ $(MAGIC_FRAGMENT_DIR)/c-lang \
+ $(MAGIC_FRAGMENT_DIR)/c64 \
+diff -Naurp file.orig/magic/Makefile.in file/magic/Makefile.in
+--- file.orig/magic/Makefile.in	2009-12-05 18:09:09.000000000 +0100
++++ file/magic/Makefile.in	2009-12-05 18:17:24.000000000 +0100
+@@ -195,6 +195,7 @@ $(MAGIC_FRAGMENT_DIR)/blender \
+ $(MAGIC_FRAGMENT_DIR)/blit \
+ $(MAGIC_FRAGMENT_DIR)/bout \
+ $(MAGIC_FRAGMENT_DIR)/bsdi \
++$(MAGIC_FRAGMENT_DIR)/bsi \
+ $(MAGIC_FRAGMENT_DIR)/btsnoop \
+ $(MAGIC_FRAGMENT_DIR)/c-lang \
+ $(MAGIC_FRAGMENT_DIR)/c64 \

debian/patches/235-magic-add-hdr.patch

@@ -0,0 +1,26 @@
+Author: Adam Buchbinder <adam.buchbinder@gmail.com>
+Description: Adding new magics for HDR formats (Closes: #520416).
+
+diff -Naurp file.orig/magic/Magdir/images file/magic/Magdir/images
+--- file.orig/magic/Magdir/images	2009-12-05 18:35:08.000000000 +0100
++++ file/magic/Magdir/images	2009-12-05 18:40:05.000000000 +0100
+@@ -639,3 +639,19 @@
+ # Extension: .cpi
+ # From: Alexander Danilov <alexander.a.danilov@gmail.com>
+ 0	string	HDMV0100	AVCHD Clip Information
++
++# From: Adam Buchbinder <adam.buchbinder@gmail.com>
++# URL: http://local.wasp.uwa.edu.au/~pbourke/dataformats/pic/
++# Radiance HDR; usually has .pic or .hdr extension.
++0	string	#?RADIANCE\n	Radiance HDR image data
++#!mime	image/vnd.radiance
++
++# From: Adam Buchbinder <adam.buchbinder@gmail.com>
++# URL: http://www.mpi-inf.mpg.de/resources/pfstools/pfs_format_spec.pdf
++# Used by the pfstools packages. The regex matches for the image size could
++# probably use some work. The MIME type is made up; if there's one in
++# actual common use, it should replace the one below.
++0	string	PFS1\x0a	PFS HDR image data
++#!mime	image/x-pfs
++>1	regex	[0-9]*\ 		\b, %s
++>>1	regex	\ [0-9]{4}		\bx%s

debian/patches/236-magic-add-foveon-x3f.patch

@@ -0,0 +1,22 @@
+Author: Adam Buchbinder <adam.buchbinder@gmail.com>
+Description: Adding new magics for Foveon X3F (Closes: #516800).
+
+diff -Naurp file.orig/magic/Magdir/images file/magic/Magdir/images
+--- file.orig/magic/Magdir/images	2009-12-05 18:43:12.000000000 +0100
++++ file/magic/Magdir/images	2009-12-05 18:43:37.000000000 +0100
+@@ -655,3 +655,15 @@
+ #!mime	image/x-pfs
+ >1	regex	[0-9]*\ 		\b, %s
+ >>1	regex	\ [0-9]{4}		\bx%s
++
++# Type: Foveon X3F
++# URL:  http://www.photofo.com/downloads/x3f-raw-format.pdf
++# From: Adam Buchbinder <adam.buchbinder@gmail.com>
++# Note that the MIME type isn't defined anywhere that I can find; if
++# there's a canonical type for this format, it should replace this one.
++0	string	FOVb	Foveon X3F raw image data
++!:mime	image/x-x3f
++>6	leshort	x	\b, version %d.
++>4	leshort	x	\b%d
++>28	lelong	x	\b, %dx
++>32	lelong	x	\b%d

debian/patches/237-magic-add-paint-net.patch

@@ -0,0 +1,15 @@
+Author: Adam Buchbinder <adam.buchbinder@gmail.com>
+Description: Adding new magics for Paint.NET images (Closes: #504779).
+
+diff -Naurp file.orig/magic/Magdir/images file/magic/Magdir/images
+--- file.orig/magic/Magdir/images	2009-12-05 18:46:53.000000000 +0100
++++ file/magic/Magdir/images	2009-12-05 18:47:27.000000000 +0100
+@@ -667,3 +667,8 @@
+ >4	leshort	x	\b%d
+ >28	lelong	x	\b, %dx
+ >32	lelong	x	\b%d
++
++# Paint.NET file
++# From Adam Buchbinder <adam.buchbinder@gmail.com>
++0	string	PDN3	Paint.NET image data
++!:mime	image/x-paintnet

debian/patches/906-file-python.patch

@@ -0,0 +1,33 @@
+Author: Joerg Friedrich <Joerg.Friedrich@friedrich-kn.de>
+Description:
+ Adding support for all flags from magic.h in python-magic (Closes: #529354).
+
+diff -Naurp file.orig/python/py_magic.c file/python/py_magic.c
+--- file.orig/python/py_magic.c	2009-12-05 17:30:09.000000000 +0100
++++ file/python/py_magic.c	2009-12-05 18:35:22.000000000 +0100
+@@ -303,11 +303,24 @@ static struct const_vals {
+     { "MAGIC_SYMLINK", MAGIC_SYMLINK },
+     { "MAGIC_COMPRESS", MAGIC_COMPRESS },
+     { "MAGIC_DEVICES", MAGIC_DEVICES },
+-    { "MAGIC_MIME", MAGIC_MIME },
++    { "MAGIC_MIME_TYPE", MAGIC_MIME_TYPE },
+     { "MAGIC_CONTINUE", MAGIC_CONTINUE },
+     { "MAGIC_CHECK", MAGIC_CHECK },
+     { "MAGIC_PRESERVE_ATIME", MAGIC_PRESERVE_ATIME },
++    { "MAGIC_RAW", MAGIC_RAW},
+     { "MAGIC_ERROR", MAGIC_ERROR},
++    { "MAGIC_MIME_ENCODING", MAGIC_MIME_ENCODING },
++    { "MAGIC_MIME", MAGIC_MIME },
++    { "MAGIC_APPLE", MAGIC_APPLE },
++    { "MAGIC_NO_CHECK_COMPRESS", MAGIC_NO_CHECK_COMPRESS },
++    { "MAGIC_NO_CHECK_TAR", MAGIC_NO_CHECK_TAR },
++    { "MAGIC_NO_CHECK_SOFT", MAGIC_NO_CHECK_SOFT },
++    { "MAGIC_NO_CHECK_APPTYPE", MAGIC_NO_CHECK_APPTYPE },
++    { "MAGIC_NO_CHECK_ELF", MAGIC_NO_CHECK_ELF },
++    { "MAGIC_NO_CHECK_TEXT", MAGIC_NO_CHECK_TEXT },
++    { "MAGIC_NO_CHECK_CDF", MAGIC_NO_CHECK_CDF },
++    { "MAGIC_NO_CHECK_TOKENS", MAGIC_NO_CHECK_TOKENS },
++    { "MAGIC_NO_CHECK_ENCODING", MAGIC_NO_CHECK_ENCODING },
+     { NULL }
+ };
+ 

debian/patches/series

@@ -21,6 +21,9 @@
 121-magic-update-utf.patch
 122-magic-update-spectrum.patch
 123-magic-update-tgif.patch
+124-magic-update-postscript-fonts.patch
+125-magic-update-truetype-fonts.patch
+126-magic-update-7zip.patch
 200-magic-add-par2.patch
 201-magic-add-pe5.patch
 202-magic-add-pmenu.patch
@@ -45,10 +48,25 @@
 221-magic-add-git.patch
 222-magic-add-nut.patch
 223-magic-add-blcr.patch
+224-magic-add-lyx.patch
+225-magic-add-bacula.patch
+226-magic-add-olympus.patch
+227-magic-add-gstreamer.patch
+228-magic-add-mdmp.patch
+229-magic-add-xfsdump.patch
+230-magic-add-ppc-swapfile.patch
+231-magic-add-delta-iso.patch
+232-magic-add-delta-rpm.patch
+233-magic-add-avchd.patch
+234-magic-add-chiasmus.patch
+235-magic-add-hdr.patch
+236-magic-add-foveon-x3f.patch
+237-magic-add-paint-net.patch
 900-file-mgc.patch
 901-file-localmagic.patch
 902-file-make.patch
 903-file-hurd.patch
 904-doc-manpages.patch
 905-doc-manpages-typo.patch
+906-file-python.patch
 999-conglomeration.patch