Import Debian version 5.04-6

debian/patches/133-magic-update-icon.patch

@@ -0,0 +1,15 @@
+Author: Judit Foglszinger <fgrfgr@freenet.de>
+Description: Fixing typo in output for x-icon (Closes: #593488).
+
+diff -Naurp file.orig/magic/Magdir/msdos file/magic/Magdir/msdos
+--- file.orig/magic/Magdir/msdos	2010-09-18 11:42:55.297853937 +0200
++++ file/magic/Magdir/msdos	2010-09-18 11:43:05.326837856 +0200
+@@ -484,7 +484,7 @@
+ 
+ # Windows icons (Ian Springer <ips@fpk.hp.com>)
+ 0	string	\000\000\001\000	MS Windows icon resource
+-!:mime	image/x-ico
++!:mime	image/x-icon
+ >4	byte	1			- 1 icon
+ >4	byte	>1			- %d icons
+ >>6	byte	>0			\b, %dx

debian/patches/246-magic-add-epub.patch

@@ -0,0 +1,20 @@
+Author: Adam Buchbinder <adam.buchbinder@gmail.com>
+Description:
+ Add support for EPUB ebooks, fixing some false ZIP negatives (Closes: #596873).
+
+diff -Naurp file.orig/magic/Magdir/archive file/magic/Magdir/archive
+--- file.orig/magic/Magdir/archive	2010-09-18 11:35:32.913838992 +0200
++++ file/magic/Magdir/archive	2010-09-18 11:36:03.694842516 +0200
+@@ -662,6 +662,12 @@
+ >>>>78	string	-template		Template
+ !:mime	application/vnd.oasis.opendocument.image-template
+ 
++# EPUB (OEBPS) books using OCF (Open Container Format)
++# From: Adam Buchbinder <adam.buchbinder@gmail.com>
++# URL: http://www.idpf.org/ocf/ocf1.0/download/ocf10.htm, section 4.
++>>38	string	application/epub+zip	EPUB ebook
++!:mime	application/epub+zip
++
+ # Zoo archiver
+ 20	lelong		0xfdc4a7dc	Zoo archive data
+ !:mime	application/x-zoo

debian/patches/907-doc-manpages-typo3.patch

@@ -0,0 +1,15 @@
+Author: Judit Foglszinger <fgrfgr@freenet.de>
+Description: Fixing incorrect argument in manpage (Closes: #524648).
+
+diff -Naurp file.orig/doc/file.man file/doc/file.man
+--- file.orig/doc/file.man	2010-09-18 11:39:25.277836590 +0200
++++ file/doc/file.man	2010-09-18 11:39:37.825841079 +0200
+@@ -184,7 +184,7 @@ are:
+ .It apptype
+ .Dv EMX
+ application type (only on EMX).
+-.It text
++.It ascii
+ Various types of text files (this test will try to guess the text encoding, irrespective of the setting of the
+ .Sq encoding
+ option).

debian/patches/series

@@ -27,6 +27,7 @@
 130-magic-update-psf2.patch
 131-magic-update-dyatic.patch
 132-magic-update-bio-rad.patch
+133-magic-update-icon.patch
 200-magic-add-par2.patch
 201-magic-add-pe5.patch
 202-magic-add-pmenu.patch
@@ -72,11 +73,13 @@
 243-magic-add-git-index.patch
 244-magic-add-jfs.patch
 245-magic-add-erlang.patch
+246-magic-add-epub.patch
 901-file-localmagic.patch
 902-file-make.patch
 904-doc-manpages.patch
 905-doc-manpages-typo.patch
 906-doc-manpages-typo2.patch
-907-file-python.patch
-908-file-coredump.patch
+907-doc-manpages-typo3.patch
+908-file-python.patch
+909-file-coredump.patch
 999-conglomeration.patch