Import Debian version 4.15-2

debian/control

@@ -2,7 +2,7 @@ Source: file
 Section: utils
 Priority: standard
 Maintainer: Michael Piefel <piefel@debian.org>
-Build-Depends: debhelper (>= 4), zlib1g-dev, autotools-dev, libtool, python2.3-dev, python2.4-dev
+Build-Depends: debhelper (>= 4), zlib1g-dev, autotools-dev, libtool, python, python2.3-dev, python2.4-dev
 Standards-Version: 3.6.2
 
 Package: file

debian/libmagic1.dirs

@@ -1,3 +1,3 @@
 usr/lib
-usr/share/misc/file
+usr/share/file
 usr/share/man/man5

debian/libmagic1.install

@@ -1,3 +1,3 @@
 usr/lib/libmagic*.so.*
-usr/share/misc/file
+usr/share/file
 usr/share/man/man5

debian/rules

@@ -42,7 +42,7 @@ build-stamp:
 	mv config.sub config.sub.upstream && ln -s /usr/share/misc/config.sub
 	mv config.guess config.guess.upstream && ln -s /usr/share/misc/config.guess
 	./configure $(CONFFLAGS) --prefix=/usr \
-		'--datadir=$${prefix}/share/misc' '--mandir=$${prefix}/share/man' \
+		'--datadir=$${prefix}/share' '--mandir=$${prefix}/share/man' \
 		--enable-fsect-man5
 	rm config.sub && mv config.sub.upstream config.sub
 	rm config.guess && mv config.guess.upstream config.guess

magic/Magdir/msdos

@@ -503,24 +503,25 @@
 >4	byte	=0x30			Offline database
 
 
-# Windows Enhanced Metafile (EMF)
-# See msdn.microsoft.com/archive/en-us/dnargdi/html/msdn_enhmeta.asp 
-# for further information. Note that "0 lelong 1" should be true i.e.
-# the first double word in the file should be 1. With the extended
-# 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.
-# 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)
-# 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
+# This is pure ASCII magic, "EMF " at position 40 (MPi)
+## Windows Enhanced Metafile (EMF)
+## See msdn.microsoft.com/archive/en-us/dnargdi/html/msdn_enhmeta.asp 
+## for further information. Note that "0 lelong 1" should be true i.e.
+## the first double word in the file should be 1. With the extended
+## 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.
+## 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)
+## 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
 
 # From: Alex Beregszaszi <alex@fsn.hu>
 0	string	COWD		VMWare3 disk image