Import Debian version 5.04-3

debian/control

@@ -6,7 +6,7 @@ Uploaders: Daniel Baumann <daniel@debian.org>
 Build-Depends:
  debhelper (>= 7.4.3~), autotools-dev, python, python-all-dev, python-all-dbg,
  quilt (>= 0.46-7), zlib1g-dev
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 Homepage: http://www.darwinsys.com/file/
 Vcs-Browser: http://git.debian-maintainers.org/?p=daniel/file.git
 Vcs-Git: git://git.debian-maintainers.org/git/daniel/file.git

debian/libmagic1.dirs

@@ -0,0 +1 @@
+/usr/share/file/magic

debian/libmagic1.links

@@ -1 +1,2 @@
 /usr/share/file/magic.mgc	/usr/share/misc/magic.mgc
+/usr/share/file/magic		/usr/share/misc/magic

debian/patches/127-magic-update-lzma.patch

@@ -0,0 +1,21 @@
+Author: Eloi Notario <entfe001@gmail.com>
+Description: Updatng magic for lzma (Closes: #576950).
+
+diff -Naurp file.orig/magic/Magdir/compress file/magic/Magdir/compress
+--- file.orig/magic/Magdir/compress	2010-03-27 11:55:00.000000000 +0100
++++ file/magic/Magdir/compress	2010-07-11 00:07:23.645946357 +0200
+@@ -190,11 +190,9 @@
+ >7	byte		x			\b.%d
+ 
+ # Type: LZMA
+-# URL:  http://www.7-zip.org/sdk.html
+-# From: Robert Millan <rmh@aybabtu.com> and Reuben Thomas <rrt@sc3d.org>
+-# Commented out because apparently not reliable (according to Debian
+-# bug #364260)
+-#0	string		]\000\000\200\000	LZMA compressed data
++0	lelong		0x8000005d		LZMA compressed data,
++>5	lequad		=0xffffffffffffffff	streamed
++>5	lequad		!0xffffffffffffffff	non-streamed, size %lld
+ 
+ # http://tukaani.org/xz/xz-file-format.txt
+ 0	ustring		\xFD7zXZ\x00		xz compressed data

debian/patches/128-magic-update-xz.patch

@@ -0,0 +1,15 @@
+Author: Daniel Baumann <daniel@debian.org>
+Description: Updatng magic for xz (Closes: #541087).
+
+diff -Naurp file.orig/magic/Magdir/compress file/magic/Magdir/compress
+--- file.orig/magic/Magdir/compress	2010-07-11 02:03:39.853952057 +0200
++++ file/magic/Magdir/compress	2010-07-11 02:04:12.528952297 +0200
+@@ -196,7 +196,7 @@
+ >5	lequad		!0xffffffffffffffff	non-streamed, size %lld
+ 
+ # http://tukaani.org/xz/xz-file-format.txt
+-0	ustring		\xFD7zXZ\x00		xz compressed data
++0	ustring		\xFD7zXZ\x00		XZ compressed data
+ !:mime	application/x-xz
+ 
+ # AFX compressed files (Wolfram Kleff)

debian/patches/238-magic-add-dact.patch

@@ -0,0 +1,18 @@
+Author: n/a
+Description: Adding new magics for DACT (Closes: #582945).
+
+diff -Naurp file.orig/magic/Magdir/compress file/magic/Magdir/compress
+--- file.orig/magic/Magdir/compress	2010-06-21 00:50:12.608254012 +0200
++++ file/magic/Magdir/compress	2010-06-21 00:53:13.743273541 +0200
+@@ -219,3 +219,11 @@
+ # URL: http://tukaani.org/xz/
+ 0	string		\xfd\x37\x7a\x58\x5a\x00	XZ compressed data
+ !:mime application/x-xz
++
++# Type:	DACT compressed files
++0	long	0x444354C3	DACT compressed data
++>4	byte	>-1		(version %i.
++>5	byte	>-1		%i.
++>6	byte	>-1		%i)
++>7	long	>0		, original size: %i bytes
++>15	long	>30		, block size: %i bytes

debian/patches/series

@@ -21,6 +21,8 @@
 123-magic-update-tgif.patch
 125-magic-update-truetype-fonts.patch
 126-magic-update-7zip.patch
+127-magic-update-lzma.patch
+128-magic-update-xz.patch
 200-magic-add-par2.patch
 201-magic-add-pe5.patch
 202-magic-add-pmenu.patch
@@ -58,6 +60,7 @@
 235-magic-add-hdr.patch
 236-magic-add-foveon-x3f.patch
 237-magic-add-paint-net.patch
+238-magic-add-dact.patch
 901-file-localmagic.patch
 902-file-make.patch
 904-doc-manpages.patch