Import Debian version 5.04-1

debian/control

@@ -4,7 +4,7 @@ Priority: standard
 Maintainer: Daniel Baumann <daniel@lists.debian-maintainers.org>
 Uploaders: Daniel Baumann <daniel@debian.org>
 Build-Depends: debhelper (>= 7), quilt, autotools-dev, python, python-all-dev, python-all-dbg, zlib1g-dev
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 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/copyright

@@ -67,7 +67,7 @@ License: BSD
  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Files: debian/*
-Copyright: (C) 2007-2009 Daniel Baumann <daniel@debian.org>
+Copyright: (C) 2007-2010 Daniel Baumann <daniel@debian.org>
 License: BSD
  This software is not subject to any export provision of the United States
  Department of Commerce, and may be exported to any country or planet.

debian/libmagic1.bug-control

@@ -0,0 +1 @@
+Submit-As: file

debian/patches/100-magic-update-asf.patch

@@ -1,14 +0,0 @@
-Author: Daniel Baumann <daniel@debian.org>
-Description: Addding mime to asf magic.
-
-diff -Naurp file.orig/magic/Magdir/animation file/magic/Magdir/animation
---- file.orig/magic/Magdir/animation	2008-11-07 22:49:20.000000000 +0000
-+++ file/magic/Magdir/animation	2009-02-18 11:57:43.000000000 +0000
-@@ -697,6 +697,7 @@
- 
- # Microsoft Advanced Streaming Format (ASF) <mpruett@sgi.com>
- 0	belong			0x3026b275	Microsoft ASF
-+!:mime	video/x-ms-asf
- 
- # MNG Video Format, <URL:http://www.libpng.org/pub/mng/spec/>
- 0	string			\x8aMNG		MNG video data,

debian/patches/101-magic-update-awk.patch

@@ -2,13 +2,13 @@ Author: Werner Fink <werner@suse.de>
 Description: Updates (and re-enables) awk magic.
 
 diff -Naurp file.orig/magic/Magdir/commands file/magic/Magdir/commands
---- file.orig/magic/Magdir/commands	2008-05-04 14:12:49.000000000 +0000
-+++ file/magic/Magdir/commands	2008-05-21 09:36:15.000000000 +0000
-@@ -49,6 +49,7 @@
+--- file.orig/magic/Magdir/commands	2010-01-30 09:44:26.000000000 +0000
++++ file/magic/Magdir/commands	2010-02-01 11:51:38.000000000 +0000
+@@ -50,6 +50,7 @@
  # update to distinguish from *.vcf files
  # this is broken because postscript has /EBEGIN{ for example.
- #0	search/Bb	BEGIN {			awk script text
+ #0	search/Ww	BEGIN {			awk script text
 +0	regex		=^\\s*BEGIN\\s*[{]	awk script text
  
  # AT&T Bell Labs' Plan 9 shell
- 0	string/b	#!\ /bin/rc	Plan 9 rc shell script text executable
+ 0	string/w	#!\ /bin/rc	Plan 9 rc shell script text executable

debian/patches/102-magic-update-bash.patch

@@ -2,16 +2,16 @@ Author: Daniel Baumann <daniel@debian.org>
 Description: Adding another shebang path for bash.
 
 diff -Naurp file.orig/magic/Magdir/commands file/magic/Magdir/commands
---- file.orig/magic/Magdir/commands	2008-04-16 12:28:04.000000000 +0000
-+++ file/magic/Magdir/commands	2009-02-18 11:58:44.000000000 +0000
-@@ -56,6 +56,10 @@
+--- file.orig/magic/Magdir/commands	2010-01-30 09:44:26.000000000 +0000
++++ file/magic/Magdir/commands	2010-02-01 11:54:51.000000000 +0000
+@@ -57,6 +57,10 @@
  # bash shell magic, from Peter Tobias (tobias@server.et-inf.fho-emden.de)
- 0	string/b	#!\ /bin/bash	Bourne-Again shell script text executable
+ 0	string/w	#!\ /bin/bash	Bourne-Again shell script text executable
  !:mime	text/x-shellscript
-+0	string/b	#!\ /usr/bin/bash	Bourne-Again shell script text executable
-+!:mime text/x-shellscript
-+0	string/b	#!\ /usr/local/bash	Bourne-Again shell script text executable
-+!:mime text/x-shellscript
- 0	string/b	#!\ /usr/local/bin/bash	Bourne-Again shell script text executable
++0	string/w	#!\ /usr/bin/bash	Bourne-Again shell script text executable
++!:mime	text/x-shellscript
++0	string/w	#!\ /usr/local/bash	Bourne-Again shell script text executable
++!:mime	text/x-shellscript
+ 0	string/w	#!\ /usr/local/bin/bash	Bourne-Again shell script text executable
  !:mime	text/x-shellscript
  

debian/patches/104-magic-update-tcsh.patch

@@ -2,14 +2,14 @@ Author: Daniel Baumann <daniel@debian.org>
 Description: Addding another shebang path for tcsh.
 
 diff -Naurp file.orig/magic/Magdir/commands file/magic/Magdir/commands
---- file.orig/magic/Magdir/commands	2008-04-16 12:28:04.000000000 +0000
-+++ file/magic/Magdir/commands	2008-07-15 13:28:19.000000000 +0000
-@@ -12,6 +12,8 @@
+--- file.orig/magic/Magdir/commands	2010-01-30 09:44:26.000000000 +0000
++++ file/magic/Magdir/commands	2010-02-01 11:57:33.000000000 +0000
+@@ -13,6 +13,8 @@
  !:mime	text/x-shellscript
- 0	string/b 	#!\ /bin/tcsh		Tenex C shell script text executable
+ 0	string/w 	#!\ /bin/tcsh		Tenex C shell script text executable
  !:mime	text/x-shellscript
-+0	string/b	#!\ /usr/bin/tcsh	Tenex C shell script text executable
++0	string/w	#!\ /usr/bin/tcsh	Tenex C shell script text executable
 +!:mime	text/x-shellscript
- 0	string/b 	#!\ /usr/local/tcsh	Tenex C shell script text executable
+ 0	string/w 	#!\ /usr/local/tcsh	Tenex C shell script text executable
  !:mime	text/x-shellscript
- 0	string/b	#!\ /usr/local/bin/tcsh	Tenex C shell script text executable
+ 0	string/w	#!\ /usr/local/bin/tcsh	Tenex C shell script text executable

debian/patches/112-magic-update-linuxswap.patch

@@ -2,9 +2,9 @@ Author: Russell Coker <russell@coker.com.au>
 Description: Adding volume label and UUID support for linux swap (Closes: #489865).
 
 diff -Naurp file.orig/magic/Magdir/linux file/magic/Magdir/linux
---- file.orig/magic/Magdir/linux	2008-06-04 18:02:25.000000000 +0000
-+++ file/magic/Magdir/linux	2008-07-15 14:16:43.000000000 +0000
-@@ -56,11 +56,19 @@
+--- file.orig/magic/Magdir/linux	2010-01-30 09:44:26.000000000 +0000
++++ file/magic/Magdir/linux	2010-02-01 12:02:18.000000000 +0000
+@@ -58,11 +58,19 @@
  # Linux swap file with swsusp1 image, from Jeff Bailey <jbailey@ubuntu.com>
  4076	string		SWAPSPACE2S1SUSPEND	Linux/i386 swap file (new style) with SWSUSP1 image
  # according to man page of mkswap (8) March 1999
@@ -26,6 +26,6 @@ diff -Naurp file.orig/magic/Magdir/linux file/magic/Magdir/linux
 +>0x414	beshort		x		\b-%04x
 +>0x416	belong		x		\b-%08x
 +>0x41a	beshort		x		\b%04x
- # ECOFF magic for OSF/1 and Linux (only tested under Linux though)
- #
- #	from Erik Troan (ewt@redhat.com) examining od dumps, so this
+ # From Daniel Novotny <dnovotny@redhat.com>
+ # swap file for PowerPC
+ 65526	string		SWAPSPACE2	Linux/ppc swap file

debian/patches/115-magic-update-ruby.patch

@@ -1,17 +0,0 @@
-Author: Daniel Baumann <daniel@debian.org>
-Description: Adding mime entries for ruby (Closes: #502201).
-
-diff -Naurp file.orig/magic/Magdir/ruby file/magic/Magdir/ruby
---- file.orig/magic/Magdir/ruby	2008-10-19 14:31:15.000000000 +0000
-+++ file/magic/Magdir/ruby	2008-11-15 19:28:44.000000000 +0000
-@@ -5,6 +5,10 @@
- 
- # Ruby scripts
- 0	search/1/b	#!\ /usr/bin/ruby	Ruby script text executable
-+!:mime	application/x-ruby
- 0	search/1/b	#!\ /usr/local/bin/ruby	Ruby script text executable
-+!:mime	application/x-ruby
- 0	search/1	#!/usr/bin/env\ ruby	Ruby script text executable
-+!:mime	application/x-ruby
- 0	search/1	#!\ /usr/bin/env\ ruby	Ruby script text executable
-+!:mime	application/x-ruby

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

@@ -1,25 +0,0 @@
-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/200-magic-add-par2.patch

@@ -2,12 +2,13 @@ Author: Daniel van Eeden <daniel_e@dds.nl>
 Description: New magic for PAR2 archive files (Closes: #294070).
 
 diff -Naurp file.orig/magic/Magdir/archive file/magic/Magdir/archive
---- file.orig/magic/Magdir/archive	2008-02-28 18:57:34.000000000 +0000
-+++ file/magic/Magdir/archive	2008-04-07 08:05:47.000000000 +0000
-@@ -803,3 +803,6 @@
+--- file.orig/magic/Magdir/archive	2010-01-30 09:44:26.000000000 +0000
++++ file/magic/Magdir/archive	2010-02-01 12:09:56.000000000 +0000
+@@ -830,3 +830,7 @@
+ >24	belong	0		no checksum
  >24	belong	1		SHA-1 checksum
  >24	belong	2		MD5 checksum
- 
++
 +# Type: Parity Archive
 +# From: Daniel van Eeden <daniel_e@dds.nl>
-+0	string	 PAR2		Parity Archive Volume Set
++0	string	PAR2		Parity Archive Volume Set

debian/patches/214-magic-add-freemind.patch

@@ -11,5 +11,5 @@ diff -Naurp file.orig/magic/Magdir/wordprocessors file/magic/Magdir/wordprocesso
 +
 +# Type: Freemind mindmap documents
 +# From: Jamie Thompson <debian-bugs@jamie-thompson.co.uk>
-+0	string/cB	\<map\ version	Freemind document
++0	string/w	\<map\ version	Freemind document
 +!:mime	application/x-freemind

debian/patches/217-magic-add-cromfs.patch

@@ -2,13 +2,12 @@ Author: Werner Fink <werner@suse.de>
 Description: Adds new magic for CROM filesystem.
 
 diff -Naurp file.orig/magic/Magdir/filesystems file/magic/Magdir/filesystems
---- file.orig/magic/Magdir/filesystems	2008-07-02 13:47:23.000000000 +0000
-+++ file/magic/Magdir/filesystems	2008-07-15 13:43:26.000000000 +0000
-@@ -1327,3 +1327,15 @@
- # dvdisaster's .ecc
- # From: "Nelson A. de Oliveira" <naoliv@gmail.com>
- 0	string	*dvdisaster*	dvdisaster error correction file
-+
+--- file.orig/magic/Magdir/filesystems	2010-02-01 12:11:02.000000000 +0000
++++ file/magic/Magdir/filesystems	2010-02-01 12:12:16.000000000 +0000
+@@ -1500,3 +1500,14 @@
+ 0	string XFSM
+ >0x200	string XFSB	XFS filesystem metadump image
+ 
 +# Type:	CROM filesystem
 +# From:	Werner Fink <werner@suse.de>
 +0	string	CROMFS	CROMFS

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

@@ -2,12 +2,12 @@ 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 @@
+--- file.orig/magic/Magdir/archive	2010-02-01 12:13:41.000000000 +0000
++++ file/magic/Magdir/archive	2010-02-01 12:14:07.000000000 +0000
+@@ -834,3 +834,9 @@
  # Type: Parity Archive
  # From: Daniel van Eeden <daniel_e@dds.nl>
- 0	string	 PAR2		Parity Archive Volume Set
+ 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

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

@@ -1,17 +0,0 @@
-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/900-file-mgc.patch

@@ -2,25 +2,25 @@ Author: Daniel Baumann <daniel@debian.org>
 Description: Reverting upstream change of stopping to build plain magic file (Closes: #481247).
 
 diff -Naurp file.orig/magic/Makefile.am file/magic/Makefile.am
---- file.orig/magic/Makefile.am	2009-05-03 00:07:11.000000000 +0000
-+++ file/magic/Makefile.am	2009-05-03 08:51:56.000000000 +0000
-@@ -4,7 +4,7 @@
- MAGIC_FRAGMENT_BASE = Magdir
- MAGIC_FRAGMENT_DIR = $(top_srcdir)/magic/$(MAGIC_FRAGMENT_BASE)
+--- file.orig/magic/Makefile.am	2010-02-01 12:16:29.000000000 +0000
++++ file/magic/Makefile.am	2010-02-01 12:21:54.000000000 +0000
+@@ -5,7 +5,7 @@ MAGIC_FRAGMENT_BASE = Magdir
+ MAGIC_DIR = $(top_srcdir)/magic
+ MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE)
  
 -pkgdata_DATA = magic.mgc
 +pkgdata_DATA = magic.mgc magic
  
- EXTRA_DIST = Header Localstuff \
- $(MAGIC_FRAGMENT_DIR)/acorn \
-@@ -220,8 +220,20 @@ $(MAGIC_FRAGMENT_DIR)/xwindows \
+ EXTRA_DIST = \
+ $(MAGIC_DIR)/Header \
+@@ -229,8 +229,20 @@ $(MAGIC_FRAGMENT_DIR)/xwindows \
  $(MAGIC_FRAGMENT_DIR)/zilog \
  $(MAGIC_FRAGMENT_DIR)/zyxel 
  
 +RAW   = magic
  MAGIC = magic.mgc
--CLEANFILES = ${MAGIC}
-+CLEANFILES = ${MAGIC} ${RAW}
+-CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff
++CLEANFILES = ${RAW} ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff
 +
 +${RAW}: Header Localstuff $(EXTRA_DIST)
 +	cat /dev/null > $@
@@ -35,36 +35,37 @@ diff -Naurp file.orig/magic/Makefile.am file/magic/Makefile.am
  
  # FIXME: Build file natively as well so that it can be used to compile
  # the target's magic file
-@@ -233,6 +245,5 @@ FILE_COMPILE = $(top_builddir)/src/file
+@@ -242,7 +254,5 @@ FILE_COMPILE = $(top_builddir)/src/file
  FILE_COMPILE_DEP = $(FILE_COMPILE)
  endif
  
 -${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP)
--	$(FILE_COMPILE) -C -m $(MAGIC_FRAGMENT_DIR)
--	@mv $(MAGIC_FRAGMENT_BASE).mgc $@
+-	@mkdir magic && cp -p $(EXTRA_DIST) magic
+-	$(FILE_COMPILE) -C -m magic
+-	@rm -fr magic
 +${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) $(RAW)
 +	$(FILE_COMPILE) -C -m $(RAW)
 diff -Naurp file.orig/magic/Makefile.in file/magic/Makefile.in
---- file.orig/magic/Makefile.in	2009-05-03 00:07:11.000000000 +0000
-+++ file/magic/Makefile.in	2009-05-03 08:55:09.000000000 +0000
-@@ -170,7 +170,7 @@ top_srcdir = @top_srcdir@
- #
+--- file.orig/magic/Makefile.in	2010-02-01 12:16:29.000000000 +0000
++++ file/magic/Makefile.in	2010-02-01 12:24:46.000000000 +0000
+@@ -171,7 +171,7 @@ top_srcdir = @top_srcdir@
  MAGIC_FRAGMENT_BASE = Magdir
- MAGIC_FRAGMENT_DIR = $(top_srcdir)/magic/$(MAGIC_FRAGMENT_BASE)
+ MAGIC_DIR = $(top_srcdir)/magic
+ MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE)
 -pkgdata_DATA = magic.mgc
 +pkgdata_DATA = magic.mgc magic
- EXTRA_DIST = Header Localstuff \
- $(MAGIC_FRAGMENT_DIR)/acorn \
- $(MAGIC_FRAGMENT_DIR)/adi \
-@@ -385,8 +385,21 @@ $(MAGIC_FRAGMENT_DIR)/xwindows \
+ EXTRA_DIST = \
+ $(MAGIC_DIR)/Header \
+ $(MAGIC_DIR)/Localstuff \
+@@ -394,10 +394,22 @@ $(MAGIC_FRAGMENT_DIR)/xwindows \
  $(MAGIC_FRAGMENT_DIR)/zilog \
  $(MAGIC_FRAGMENT_DIR)/zyxel 
  
 +RAW = magic
  MAGIC = magic.mgc
--CLEANFILES = ${MAGIC}
-+CLEANFILES = ${MAGIC} ${RAW}
-+
+ CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff
+ @IS_CROSS_COMPILE_FALSE@FILE_COMPILE = $(top_builddir)/src/file
+ 
 +${RAW}: Header Localstuff $(EXTRA_DIST)
 +	cat /dev/null > $@
 +	for frag in $(EXTRA_DIST); do \
@@ -76,17 +77,18 @@ diff -Naurp file.orig/magic/Makefile.in file/magic/Makefile.in
 +	  cat $$f; \
 +	done >> $@
 +
- @IS_CROSS_COMPILE_FALSE@FILE_COMPILE = $(top_builddir)/src/file
- 
  # FIXME: Build file natively as well so that it can be used to compile
-@@ -582,10 +595,8 @@ uninstall-am: uninstall-pkgdataDATA
+ # the target's magic file
+ @IS_CROSS_COMPILE_TRUE@FILE_COMPILE = file
+@@ -591,11 +603,8 @@ uninstall-am: uninstall-pkgdataDATA
  	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
  	uninstall uninstall-am uninstall-pkgdataDATA
  
 -
 -${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP)
--	$(FILE_COMPILE) -C -m $(MAGIC_FRAGMENT_DIR)
--	@mv $(MAGIC_FRAGMENT_BASE).mgc $@
+-	@mkdir magic && cp -p $(EXTRA_DIST) magic
+-	$(FILE_COMPILE) -C -m magic
+-	@rm -fr magic
 +${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) $(RAW)
 +	$(FILE_COMPILE) -C -m $(RAW)
  # Tell versions [3.59,3.63) of GNU make to not export all variables.

debian/patches/903-file-hurd.patch

@@ -1,18 +0,0 @@
-Author: Michael Casadevall <sonicmctails@gmail.com>
-Description: Fixes a FTBFS on hurd (Closes: #433716).
-
-diff -Naur file.orig/src/magic.c file/src/magic.c
---- file.orig/src/magic.c	2007-03-26 17:59:50.000000000 +0000
-+++ file/src/magic.c	2007-07-19 06:25:16.000000000 +0000
-@@ -58,6 +58,11 @@
- #include <locale.h>
- #endif
- 
-+#ifndef PIPE_BUF
-+// Get the PIPE_BUF from pathconf
-+#define PIPE_BUF pathconf(".", _PC_PIPE_BUF)
-+#endif
-+
- #include <netinet/in.h>		/* for byte swapping */
- 
- #include "patchlevel.h"

debian/patches/series

@@ -1,4 +1,3 @@
-100-magic-update-asf.patch
 101-magic-update-awk.patch
 102-magic-update-bash.patch
 103-magic-update-reiserfs.patch
@@ -13,7 +12,6 @@
 112-magic-update-linuxswap.patch
 113-magic-update-linuxext.patch
 114-magic-update-llvm.patch
-115-magic-update-ruby.patch
 116-magic-update-gimp.patch
 117-magic-update-wav.patch
 118-magic-update-z-machine.patch
@@ -21,7 +19,6 @@
 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
@@ -54,7 +51,6 @@
 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
@@ -65,7 +61,6 @@
 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

debian/rules

@@ -94,13 +94,7 @@ install: build
 	cp src/file.h src/patchlevel.h debian/libmagic-dev/usr/include/file
 
 	# Installing plain magic.mime for compatibility
-	install -D -m 0644 debian/legacy/magic.mime debian/libmagic1/usr/share/file/magic.mime
-
-	# Installing bug congtrols
-	install -D -m 0644 debian/bug/presubj debian/file/usr/share/bug/file/presubj
-	install -D -m 0644 debian/bug/control debian/libmagic1/usr/share/bug/libmagic1/control
-	install -D -m 0644 debian/bug/presubj-lib debian/libmagic1/usr/share/bug/libmagic1/presubj
-	install -D -m 0644 debian/bug/control debian/libmagic-dev/usr/share/bug/libmagic-dev/control
+	install -D -m 0644 debian/local/magic.mime debian/libmagic1/usr/share/file/magic.mime
 
 binary: binary-arch
 
@@ -110,6 +104,7 @@ binary-arch: install
 	dh_installchangelogs ChangeLog
 	dh_installdocs
 	dh_installexamples
+	dh_bugfiles
 	dh_install --sourcedir=debian/tmp
 	dh_lintian
 	dh_link