Import Debian version 5.00-1

debian/control

@@ -2,8 +2,8 @@ Source: file
 Section: utils
 Priority: standard
 Maintainer: Daniel Baumann <daniel@debian.org>
-Build-Depends: debhelper (>= 7), dpatch, autotools-dev, autoconf, automake, libtool, python, python-all-dev, python-all-dbg, zlib1g-dev
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 7), quilt, autotools-dev, python, python-all-dev, python-all-dbg, zlib1g-dev
+Standards-Version: 3.8.1
 Homepage: http://www.darwinsys.com/file/
 Vcs-Browser: http://git.debian.net/?p=debian/file.git
 Vcs-Git: git://git.debian.net/git/debian/file.git

debian/copyright

@@ -4,7 +4,7 @@ Download: ftp://ftp.astron.com/pub/file/
 Files: *
 Copyright:
  (C) 1985-1995 Ian F. Darwin
- (C) 1994-2008 Christos Zoulas <christos@zoulas.com>
+ (C) 1994-2009 Christos Zoulas <christos@zoulas.com>
 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.
@@ -67,7 +67,7 @@ License: BSD
  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Files: debian/*
-Copyright: (C) 2007-2008 Daniel Baumann <daniel@debian.org>
+Copyright: (C) 2007-2009 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/patches/00list

@@ -1,45 +0,0 @@
-202-magic-update-awk.dpatch
-203-magic-update-reiserfs.dpatch
-204-magic-update-asf.dpatch
-205-magic-update-tcsh.dpatch
-206-magic-update-bash.dpatch
-207-magic-update-zip.dpatch
-208-magic-update-real.dpatch
-209-magic-update-os2.dpatch
-210-magic-update-digifax.dpatch
-211-magic-update-mono.dpatch
-212-magic-update-pfm.dpatch
-213-magic-update-ocaml.dpatch
-214-magic-update-linuxswap.dpatch
-215-magic-update-linuxext.dpatch
-216-magic-update-llvm.dpatch
-217-magic-update-ruby.dpatch
-218-magic-update-gimp.dpatch
-219-magic-update-wav.dpatch
-320-magic-add-par2.dpatch
-321-magic-add-pe5.dpatch
-322-magic-add-pmenu.dpatch
-323-magic-add-powertab.dpatch
-324-magic-add-scummvm.dpatch
-325-magic-add-sgf.dpatch
-326-magic-add-sisu.dpatch
-327-magic-add-snes.dpatch
-328-magic-add-ssh.dpatch
-329-magic-add-ssl.dpatch
-330-magic-add-subversion.dpatch
-331-magic-add-supercollider.dpatch
-333-magic-add-xen.dpatch
-334-magic-add-xcursor.dpatch
-335-magic-add-freemind.dpatch
-336-magic-add-qdbm.dpatch
-337-magic-add-tokyocabinet.dpatch
-338-magic-add-cromfs.dpatch
-339-magic-add-scribus.dpatch
-340-magic-add-selinux.dpatch
-341-magic-add-bzr.dpatch
-901-file-mgc.dpatch
-903-file-localmagic.dpatch
-904-file-make.dpatch
-906-file-hurd.dpatch
-998-doc-manpages.dpatch
-999-conglomeration.dpatch

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

@@ -0,0 +1,14 @@
+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

@@ -0,0 +1,14 @@
+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 @@
+ # update to distinguish from *.vcf files
+ # this is broken because postscript has /EBEGIN{ for example.
+ #0	search/Bb	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

debian/patches/206-magic-update-bash.dpatch

@@ -1,14 +1,10 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 206-magic-update-bash.dpatch
-##
-## DP: Add another shebang path for bash.
-
-@DPATCH@
+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-07-15 13:31:02.000000000 +0000
-+++ file/magic/Magdir/commands	2008-07-15 13:30:55.000000000 +0000
-@@ -58,6 +58,10 @@ o	string/b	#!\ /usr/bin/tcsh	Tenex C she
+--- 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 @@
  # bash shell magic, from Peter Tobias (tobias@server.et-inf.fho-emden.de)
  0	string/b	#!\ /bin/bash	Bourne-Again shell script text executable
  !:mime	text/x-shellscript

debian/patches/103-magic-update-reiserfs.patch

@@ -0,0 +1,14 @@
+Author: Werner Fink <werner@suse.de>
+Description: Updating reiserfs magic to detect ReiserFS V3.6.19.
+
+diff -Naurp file.orig/magic/Magdir/filesystems file/magic/Magdir/filesystems
+--- file.orig/magic/Magdir/filesystems	2008-05-04 14:12:49.000000000 +0000
++++ file/magic/Magdir/filesystems	2008-05-21 09:43:04.000000000 +0000
+@@ -1178,6 +1178,7 @@
+ # reiserfs - russell@coker.com.au
+ 0x10034		string	ReIsErFs	ReiserFS V3.5
+ 0x10034		string	ReIsEr2Fs	ReiserFS V3.6
++0x10034		string	ReIsEr3Fs	ReiserFS V3.6.19
+ >0x1002c 	leshort	x		block size %d
+ >0x10032	leshort	&2		(mounted or unclean)
+ >0x10000	lelong	x		num blocks %d

debian/patches/205-magic-update-tcsh.dpatch

@@ -1,9 +1,5 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 205-magic-update-tcsh.dpatch
-##
-## DP: Add another shebang path for tcsh.
-
-@DPATCH@
+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

debian/patches/207-magic-update-zip.dpatch

@@ -1,9 +1,5 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 207-magic-update-zip.dpatch
-##
-## DP: Update zip magic.
-
-@DPATCH@
+Author: n/a
+Description: Updating zip magic.
 
 diff -Naurp file.orig/magic/Magdir/msdos file/magic/Magdir/msdos
 --- file.orig/magic/Magdir/msdos	2008-05-31 22:17:03.000000000 +0200

debian/patches/208-magic-update-real.dpatch

@@ -1,9 +1,5 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 207-magic-update-real.dpatch
-##
-## DP: Update RealMedia magic.
-
-@DPATCH@
+Author: n/a
+Description: Update RealMedia magic.
 
 diff -Naurp file.orig/magic/Magdir/audio file/magic/Magdir/audio
 --- file.orig/magic/Magdir/audio	2008-05-31 22:17:03.000000000 +0200

debian/patches/209-magic-update-os2.dpatch

@@ -1,9 +1,5 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 209-magic-update-os2.dpatch
-##
-## DP: Update OS/2 REXX magic.
-
-@DPATCH@
+Author: n/a
+Description: Updating OS/2 REXX magic.
 
 diff -Naurp file.orig/magic/Magdir/msdos file/magic/Magdir/msdos
 --- file.orig/magic/Magdir/msdos	2008-06-13 09:44:56.000000000 +0200

debian/patches/210-magic-update-digifax.dpatch

@@ -1,9 +1,5 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 210-magic-update-digifax.dpatch
-##
-## DP: Update Digifax magic.
-
-@DPATCH@
+Author: n/a
+Description: Updating Digifax magic.
 
 diff -Naurp file.orig/magic/Magdir/modem file/magic/Magdir/modem
 --- file.orig/magic/Magdir/modem	2008-06-13 15:00:30.000000000 +0200

debian/patches/211-magic-update-mono.dpatch

@@ -1,9 +1,5 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 211-magic-update-mono.dpatch
-##
-## DP: Update Mono magic.
-
-@DPATCH@
+Author: n/a
+Description: Updating Mono magic.
 
 diff -Naurp file.orig/magic/Magdir/msdos file/magic/Magdir/msdos
 --- file.orig/magic/Magdir/msdos	2008-07-02 15:16:52.000000000 +0000

debian/patches/212-magic-update-pfm.dpatch

@@ -1,9 +1,5 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 212-magic-update-pfm.dpatch
-##
-## DP: Update pfm magic.
-
-@DPATCH@
+Author: n/a
+Description: Updating pfm magic.
 
 diff -Naurp file.orig/magic/Magdir/msdos file/magic/Magdir/msdos
 --- file.orig/magic/Magdir/msdos	2008-07-02 15:16:52.000000000 +0000

debian/patches/213-magic-update-ocaml.dpatch

@@ -1,9 +1,5 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 213-magic-update-ocaml.dpatch by Eric Cooper <ecc@cmu.edu>
-##
-## DP: Update ocaml magic (Closes: #488992).
-
-@DPATCH@
+Author: Eric Cooper <ecc@cmu.edu>
+Description: Updating ocaml magic (Closes: #488992).
 
 diff -Naurp file.orig/magic/Magdir/ocaml file/magic/Magdir/ocaml
 --- file.orig/magic/Magdir/ocaml	2008-07-15 14:13:20.000000000 +0000

debian/patches/214-magic-update-linuxswap.dpatch

@@ -1,9 +1,5 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 214-magic-update-linuxswap.dpatch by Russell Coker <russell@coker.com.au>
-##
-## DP: Adding volume label and UUID support for linux swap (Closes: #489865).
-
-@DPATCH@
+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

debian/patches/215-magic-update-linuxext.dpatch

@@ -1,9 +1,5 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 215-magic-update-linuxext.dpatch by Russell Coker <russell@coker.com.au>
-##
-## DP: Adding volume label and UUID support for linux ext (Closes: #489865).
-
-@DPATCH@
+Author: Russell Coker <russell@coker.com.au>
+Description: Adding volume label and UUID support for linux ext (Closes: #489865).
 
 diff -Naurp file.orig/magic/Magdir/filesystems file/magic/Magdir/filesystems
 --- file.orig/magic/Magdir/filesystems	2008-07-02 13:47:23.000000000 +0000

debian/patches/216-magic-update-llvm.dpatch

@@ -1,9 +1,5 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 216-magic-update-llvm.dpatch by Toeroek Edwin <edwintorok@gmail.com>
-##
-## DP: Updating llvm magic (Closes: #505805).
-
-@DPATCH@
+Author: Toeroek Edwin <edwintorok@gmail.com>
+Description: Updating llvm magic (Closes: #505805).
 
 diff -Naurp file.orig/magic/Magdir/llvm file/magic/Magdir/llvm
 --- file.orig/magic/Magdir/llvm	2008-10-19 14:31:15.000000000 +0000

debian/patches/217-magic-update-ruby.dpatch

@@ -1,9 +1,5 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 217-magic-update-ruby.dpatch by Daniel Baumann <daniel@debian.org>
-##
-## DP: Adding mime entries for ruby (Closes: #502201).
-
-@DPATCH@
+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

debian/patches/218-magic-update-gimp.dpatch

@@ -1,9 +1,5 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 218-magic-update-gimp.dpatch by Ori Avtalion <ori@avtalion.name>
-##
-## DP: Adding mime entries for gimp (Closes: #501200).
-
-@DPATCH@
+Author: Ori Avtalion <ori@avtalion.name>
+Description: Adding mime entries for gimp (Closes: #501200).
 
 diff -Naurp file.orig/magic/Magdir/gimp file/magic/Magdir/gimp
 --- file.orig/magic/Magdir/gimp	2008-10-19 14:31:15.000000000 +0000

debian/patches/219-magic-update-wav.dpatch

@@ -1,9 +1,5 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 219-magic-update-wav.dpatch by Adam Buchbinder <adam.buchbinder@gmail.com>
-##
-## DP: Updating wav magics (Closes: #508174).
-
-@DPATCH@
+Author: Adam Buchbinder <adam.buchbinder@gmail.com>
+Description: pdating wav magics (Closes: #508174).
 
 diff -Naurp file.orig/magic/Magdir/riff file/magic/Magdir/riff
 --- file.orig/magic/Magdir/riff	2008-12-05 17:28:11.000000000 -0500

debian/patches/200-magic-add-par2.patch

@@ -0,0 +1,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 @@
+ >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

debian/patches/201-magic-add-pe5.patch

@@ -0,0 +1,15 @@
+Author: Simon Horman <horms@debian.org>
+Description: New magic for the Ulead Photo Explorer5 image format (Closes: #339397).
+
+diff -Naurp file.org/magic/Magdir/images file/magic/Magdir/images
+--- file.org/magic/Magdir/images	2009-02-02 15:55:49.000000000 +0000
++++ file/magic/Magdir/images	2009-02-18 11:28:44.000000000 +0000
+@@ -605,3 +605,8 @@
+ # JPEG 2000 Code Stream Bitmap
+ # From Petr Splichal <psplicha@redhat.com>
+ 0	string	\xFF\x4F\xFF\x51\x00	JPEG-2000 Code Stream Bitmap data
++
++# Type:	Ulead Photo Explorer5 (.pe5)
++# URL:	http://www.jisyo.com/cgibin/view.cgi?EXT=pe5 (Japanese)
++# From:	Simon Horman <horms@debian.org>
++0	string	IIO2H			Ulead Photo Explorer5

debian/patches/202-magic-add-pmenu.patch

@@ -0,0 +1,15 @@
+Author: Edward Betts <edward@debian.org>
+Description: New magic for pmenu (Closes: #38543).
+
+diff -Naurp file.orig/magic/Magdir/commands file/magic/Magdir/commands
+--- file.orig/magic/Magdir/commands	2007-06-01 19:40:26.000000000 +0000
++++ file/magic/Magdir/commands	2008-01-12 17:34:41.000000000 +0000
+@@ -55,3 +55,8 @@
+ 0	string		Zend\x00		PHP script Zend Optimizer data
+ 
+ 0	string		$!			DCL command file
++
++# Type: Pdmenu
++# URL:  http://packages.debian.org/pdmenu
++# From: Edward Betts <edward@debian.org>
++0	string	#!/usr/bin/pdmenu	Pdmenu configuration file text

debian/patches/202-magic-update-awk.dpatch

@@ -1,18 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 202-magic-update-awk.dpatch by Werner Fink <werner@suse.de>
-##
-## DP: Updates (and re-enables) awk magic.
-
-@DPATCH@
-
-diff -Naurp file-4.24.orig/magic/Magdir/commands file-4.24/magic/Magdir/commands
---- file-4.24.orig/magic/Magdir/commands	2008-05-04 14:12:49.000000000 +0000
-+++ file-4.24/magic/Magdir/commands	2008-05-21 09:36:15.000000000 +0000
-@@ -49,6 +49,7 @@
- # update to distinguish from *.vcf files
- # this is broken because postscript has /EBEGIN{ for example.
- #0	search/Bb	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

debian/patches/203-magic-add-powertab.patch

@@ -0,0 +1,15 @@
+Author: Jelmer Vernooij <jelmer@samba.org>
+Description: New magic for Power-Tab
+
+diff -Naurp file.orig/magic/Magdir/chord file/magic/Magdir/chord
+--- file.orig/magic/Magdir/chord	2008-02-19 17:27:28.000000000 +0000
++++ file/magic/Magdir/chord	2009-02-18 11:42:42.000000000 +0000
+@@ -7,3 +7,8 @@
+ #
+ 0	string		{title		Chord text file
+ 
++# Type:	PowerTab file format
++# URL:	http://www.power-tab.net/
++# From:	Jelmer Vernooij <jelmer@samba.org>
++0	string		ptab\003\000	Power-Tab v3 Tablature File
++0	string		ptab\004\000	Power-Tab v4 Tablature File

debian/patches/203-magic-update-reiserfs.dpatch

@@ -1,18 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 203-magic-update-reiserfs.dpatch by Werner Fink <werner@suse.de>
-##
-## DP: Updating reiserfs magic to detect ReiserFS V3.6.19.
-
-@DPATCH@
-
-diff -Naurp file-4.24.orig/magic/Magdir/filesystems file-4.24/magic/Magdir/filesystems
---- file-4.24.orig/magic/Magdir/filesystems	2008-05-04 14:12:49.000000000 +0000
-+++ file-4.24/magic/Magdir/filesystems	2008-05-21 09:43:04.000000000 +0000
-@@ -1178,6 +1178,7 @@
- # reiserfs - russell@coker.com.au
- 0x10034		string	ReIsErFs	ReiserFS V3.5
- 0x10034		string	ReIsEr2Fs	ReiserFS V3.6
-+0x10034		string	ReIsEr3Fs	ReiserFS V3.6.19
- >0x1002c 	leshort	x		block size %d
- >0x10032	leshort	&2		(mounted or unclean)
- >0x10000	lelong	x		num blocks %d

debian/patches/204-magic-add-scummvm.patch

@@ -0,0 +1,14 @@
+Author: Sven Hartge <debian@ds9.argh.org>
+Description: New magic for ScummVM savegame files (Closes: #263488).
+
+diff -Naurp file.orig/magic/Magdir/console file/magic/Magdir/console
+--- file.orig/magic/Magdir/console	2007-09-26 20:22:31.000000000 +0000
++++ file/magic/Magdir/console	2008-01-12 17:36:55.000000000 +0000
+@@ -252,3 +252,7 @@
+ # .w3m
+ 0	string HM3W				Warcraft III map file
+ 
++# Type: scummVM savegame files
++# From: Sven Hartge <debian@ds9.argh.org>
++0	string	SCVM	ScummVM savegame
++>12	string	>\0	"%s"

debian/patches/204-magic-update-asf.dpatch

@@ -1,18 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 204-magic-update-asf.dpatch by Daniel Baumann <daniel@debian.org>
-##
-## DP: Add mime to asf magic.
-
-@DPATCH@
-
-diff -Naurp file.orig/magic/Magdir/animation file/magic/Magdir/animation
---- file.orig/magic/Magdir/animation	2008-05-26 23:24:27.000000000 +0200
-+++ file/magic/Magdir/animation	2008-05-31 15:03:45.000000000 +0200
-@@ -686,6 +686,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/325-magic-add-sgf.dpatch

@@ -1,9 +1,5 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 323-magic-add-sgf.dpatch by Eduardo Sabbatella <eduardo_sabbatella@yahoo.com.ar>
-##
-## DP: New magic for SGF Smart Game Format
-
-@DPATCH@
+Author: Eduardo Sabbatella <eduardo_sabbatella@yahoo.com.ar>
+Description: New magic for SGF Smart Game Format
 
 diff -Naurp file.orig/magic/Magdir/games file/magic/Magdir/games
 --- file.orig/magic/Magdir/games	2008-04-23 19:00:59.000000000 +0000

debian/patches/326-magic-add-sisu.dpatch

@@ -1,13 +1,9 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 323-magic-add-sisu.dpatch by Ralph Amissah <ralph.amissah@gmail.com>
-##
-## DP: New magic for SiSU Markup Language.
+Author: Ralph Amissah <ralph.amissah@gmail.com>
+Description: New magic for SiSU Markup Language.
 
-@DPATCH@
-
-diff -Naurp file-4.24.orig/magic/Magdir/sisu file-4.24/magic/Magdir/sisu
---- file-4.24.orig/magic/Magdir/sisu	1970-01-01 00:00:00.000000000 +0000
-+++ file-4.24/magic/Magdir/sisu	2008-04-07 08:10:25.000000000 +0000
+diff -Naurp file.orig/magic/Magdir/sisu file/magic/Magdir/sisu
+--- file.orig/magic/Magdir/sisu	1970-01-01 00:00:00.000000000 +0000
++++ file/magic/Magdir/sisu	2008-04-07 08:10:25.000000000 +0000
 @@ -0,0 +1,18 @@
 +# Type: SiSU Markup Language
 +# URL:  http://www.sisudoc.org/
@@ -27,9 +23,9 @@ diff -Naurp file-4.24.orig/magic/Magdir/sisu file-4.24/magic/Magdir/sisu
 +
 +0	regex	\^%*[\ \t]*sisu-[0-9.]+		SiSU text
 +>5	regex	[0-9.]+				%s
-diff -Naurp file-4.24.orig/magic/Makefile.am file-4.24/magic/Makefile.am
---- file-4.24.orig/magic/Makefile.am	2008-03-22 21:41:00.000000000 +0000
-+++ file-4.24/magic/Makefile.am	2008-04-07 08:11:04.000000000 +0000
+diff -Naurp file.orig/magic/Makefile.am file/magic/Makefile.am
+--- file.orig/magic/Makefile.am	2008-03-22 21:41:00.000000000 +0000
++++ file/magic/Makefile.am	2008-04-07 08:11:04.000000000 +0000
 @@ -170,6 +170,7 @@ $(MAGIC_FRAGMENT_DIR)/sgi \
  $(MAGIC_FRAGMENT_DIR)/sgml \
  $(MAGIC_FRAGMENT_DIR)/sharc \
@@ -38,9 +34,9 @@ diff -Naurp file-4.24.orig/magic/Makefile.am file-4.24/magic/Makefile.am
  $(MAGIC_FRAGMENT_DIR)/sketch \
  $(MAGIC_FRAGMENT_DIR)/smalltalk \
  $(MAGIC_FRAGMENT_DIR)/sniffer \
-diff -Naurp file-4.24.orig/magic/Makefile.in file-4.24/magic/Makefile.in
---- file-4.24.orig/magic/Makefile.in	2008-03-22 21:41:06.000000000 +0000
-+++ file-4.24/magic/Makefile.in	2008-04-07 08:11:10.000000000 +0000
+diff -Naurp file.orig/magic/Makefile.in file/magic/Makefile.in
+--- file.orig/magic/Makefile.in	2008-03-22 21:41:06.000000000 +0000
++++ file/magic/Makefile.in	2008-04-07 08:11:10.000000000 +0000
 @@ -330,6 +330,7 @@ $(MAGIC_FRAGMENT_DIR)/sgi \
  $(MAGIC_FRAGMENT_DIR)/sgml \
  $(MAGIC_FRAGMENT_DIR)/sharc \

debian/patches/327-magic-add-snes.dpatch

@@ -1,14 +1,10 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 324-magic-add-snes.dpatch by Josh Triplett <josh@freedesktop.org>
-##
-## DP: New magic for SNES SPC700 sound files (Closes: #410847).
+Author: Josh Triplett <josh@freedesktop.org>
+Description: New magic for SNES SPC700 sound files (Closes: #410847).
 
-@DPATCH@
-
-diff -Naur file-4.21.orig/magic/Magdir/audio file-4.21/magic/Magdir/audio
---- file-4.21.orig/magic/Magdir/audio	2007-12-23 17:32:42.000000000 +0000
-+++ file-4.21/magic/Magdir/audio	2007-12-23 17:33:57.000000000 +0000
-@@ -268,6 +268,15 @@
+diff -Naurp file.orig/magic/Magdir/audio file/magic/Magdir/audio
+--- file.orig/magic/Magdir/audio	2008-11-07 15:44:13.000000000 +0000
++++ file/magic/Magdir/audio	2009-02-18 11:43:50.000000000 +0000
+@@ -306,6 +306,15 @@
  >122	byte&0x1	=1		PAL
  >122	byte&0x1	=0		NTSC
  
@@ -23,4 +19,4 @@ diff -Naur file-4.21.orig/magic/Magdir/audio file-4.21/magic/Magdir/audio
 +
  # Impulse tracker module (audio/x-it)
  0	string		IMPM		Impulse Tracker module sound data -
- >4	string		>\0		"%s"
+ !:mime	audio/x-mod

debian/patches/208-magic-add-ssh.patch

@@ -0,0 +1,37 @@
+Author: Nicolas Collignon <tsointsoin@gmail.com>
+Description: New magic for OpenSSH key files (Closes: #439537).
+
+diff -Naurp file.orig/magic/Magdir/ssh file/magic/Magdir/ssh
+--- file.orig/magic/Magdir/ssh	1970-01-01 00:00:00.000000000 +0000
++++ file/magic/Magdir/ssh	2009-02-18 11:50:34.000000000 +0000
+@@ -0,0 +1,8 @@
++# Type:	OpenSSH key files
++# From:	Nicolas Collignon <tsointsoin@gmail.com>
++
++0	string	SSH\ PRIVATE\ KEY	OpenSSH RSA1 private key,
++>28	string	>\0			version %s
++
++0	string	ssh-dss\		OpenSSH DSA public key
++0	string	ssh-rsa\		OpenSSH RSA public key
+diff -Naurp file.orig/magic/Makefile.am file/magic/Makefile.am
+--- file.orig/magic/Makefile.am	2009-02-18 11:49:05.000000000 +0000
++++ file/magic/Makefile.am	2009-02-18 11:51:14.000000000 +0000
+@@ -183,6 +183,7 @@ $(MAGIC_FRAGMENT_DIR)/softquad \
+ $(MAGIC_FRAGMENT_DIR)/spec \
+ $(MAGIC_FRAGMENT_DIR)/spectrum \
+ $(MAGIC_FRAGMENT_DIR)/sql \
++$(MAGIC_FRAGMENT_DIR)/ssh \
+ $(MAGIC_FRAGMENT_DIR)/sun \
+ $(MAGIC_FRAGMENT_DIR)/sysex \
+ $(MAGIC_FRAGMENT_DIR)/teapot \
+diff -Naurp file.orig/magic/Makefile.in file/magic/Makefile.in
+--- file.orig/magic/Makefile.in	2009-02-18 11:49:05.000000000 +0000
++++ file/magic/Makefile.in	2009-02-18 11:51:20.000000000 +0000
+@@ -345,6 +345,7 @@ $(MAGIC_FRAGMENT_DIR)/softquad \
+ $(MAGIC_FRAGMENT_DIR)/spec \
+ $(MAGIC_FRAGMENT_DIR)/spectrum \
+ $(MAGIC_FRAGMENT_DIR)/sql \
++$(MAGIC_FRAGMENT_DIR)/ssh \
+ $(MAGIC_FRAGMENT_DIR)/sun \
+ $(MAGIC_FRAGMENT_DIR)/sysex \
+ $(MAGIC_FRAGMENT_DIR)/teapot \

debian/patches/209-magic-add-ssl.patch

@@ -0,0 +1,36 @@
+Author: Nicolas Collignon <tsointsoin@gmail.com>
+Description: New magic for OpenSSL certificates/key files (Closes: #439537).
+
+diff -Naurp file.orig/magic/Magdir/ssl file/magic/Magdir/ssl
+--- file.orig/magic/Magdir/ssl	1970-01-01 00:00:00.000000000 +0000
++++ file/magic/Magdir/ssl	2009-02-18 11:53:12.000000000 +0000
+@@ -0,0 +1,7 @@
++# Type: OpenSSL certificates/key files
++# From: Nicolas Collignon <tsointsoin@gmail.com>
++
++0	string	-----BEGIN\ CERTIFICATE-----	PEM certificate
++0	string	-----BEGIN\ CERTIFICATE\ REQ	PEM certificate request
++0	string	-----BEGIN\ RSA\ PRIVATE	PEM RSA private key
++0	string	-----BEGIN\ DSA\ PRIVATE	PEM DSA private key
+diff -Naurp file.orig/magic/Makefile.am file/magic/Makefile.am
+--- file.orig/magic/Makefile.am	2009-02-18 11:52:50.000000000 +0000
++++ file/magic/Makefile.am	2009-02-18 11:53:27.000000000 +0000
+@@ -184,6 +184,7 @@ $(MAGIC_FRAGMENT_DIR)/spec \
+ $(MAGIC_FRAGMENT_DIR)/spectrum \
+ $(MAGIC_FRAGMENT_DIR)/sql \
+ $(MAGIC_FRAGMENT_DIR)/ssh \
++$(MAGIC_FRAGMENT_DIR)/ssl \
+ $(MAGIC_FRAGMENT_DIR)/sun \
+ $(MAGIC_FRAGMENT_DIR)/sysex \
+ $(MAGIC_FRAGMENT_DIR)/teapot \
+diff -Naurp file.orig/magic/Makefile.in file/magic/Makefile.in
+--- file.orig/magic/Makefile.in	2009-02-18 11:52:50.000000000 +0000
++++ file/magic/Makefile.in	2009-02-18 11:53:31.000000000 +0000
+@@ -346,6 +346,7 @@ $(MAGIC_FRAGMENT_DIR)/spec \
+ $(MAGIC_FRAGMENT_DIR)/spectrum \
+ $(MAGIC_FRAGMENT_DIR)/sql \
+ $(MAGIC_FRAGMENT_DIR)/ssh \
++$(MAGIC_FRAGMENT_DIR)/ssl \
+ $(MAGIC_FRAGMENT_DIR)/sun \
+ $(MAGIC_FRAGMENT_DIR)/sysex \
+ $(MAGIC_FRAGMENT_DIR)/teapot \

debian/patches/210-magic-add-subversion.patch

@@ -0,0 +1,15 @@
+Author: Michael Piefel <piefel@debian.org>
+Description: New magic for SVN dumps (closes: #256652).
+
+diff -Naurp file.orig/magic/Magdir/revision file/magic/Magdir/revision
+--- file.orig/magic/Magdir/revision	2008-02-19 17:27:33.000000000 +0000
++++ file/magic/Magdir/revision	2009-02-18 11:54:35.000000000 +0000
+@@ -17,3 +17,8 @@
+ 0	string	HG10		Mercurial bundle,
+ >4	string	UN		uncompressed
+ >4	string	BZ		bzip2 compressed
++
++# Type:	Subversion (SVN) dumps
++# From:	Uwe Zeisberger <zeisberg@informatik.uni-freiburg.de>
++0	string	SVN-fs-dump-format-version:	Subversion dumpfile
++>28	string	>\0				(version: %s)

debian/patches/211-magic-add-supercollider.patch

@@ -0,0 +1,15 @@
+Author: Mario Lang <mlang@debian.org>
+Description: Adds new magic for SuperCollider 3 Synth Definition File Format (Closes: #284803).
+
+diff -Naurp file.orig/magic/Magdir/audio file/magic/Magdir/audio
+--- file.orig/magic/Magdir/audio	2008-01-12 17:39:01.000000000 +0000
++++ file/magic/Magdir/audio	2008-01-12 17:38:49.000000000 +0000
+@@ -576,3 +576,8 @@
+ # URL:  http://filext.com/detaillist.php?extdetail=AMR
+ # From: Russell Coker <russell@coker.com.au>
+ 0	string	#!AMR		Adaptive Multi-Rate Codec (GSM telephony)
++
++# Type: SuperCollider 3 Synth Definition File Format
++# From: Mario Lang <mlang@debian.org>
++0	string	SCgf	SuperCollider3 Synth Definition file,
++>4	belong	x	version %d

debian/patches/212-magic-add-xen.patch

@@ -0,0 +1,16 @@
+Author: Radek Vokal <rvokal@redhat.com>
+Description: xen patch, recognizes Xen saved domain
+
+diff -Naurp file.orig/magic/Magdir/linux file/magic/Magdir/linux
+--- file.orig/magic/Magdir/linux	2008-01-12 17:47:04.000000000 +0000
++++ file/magic/Magdir/linux	2008-01-12 17:46:42.000000000 +0000
+@@ -248,3 +248,9 @@
+ >72	string	x		%s]
+ >168	string	x		UUID: %s
+ 
++# Type: Xen, the virtual machine monitor
++# From: Radek Vokal <rvokal@redhat.com>
++0	string		LinuxGuestRecord	Xen saved domain
++#>2	regex		\(name\ [^)]*\)		%s
++>20	search/256	(name			(name
++>>&1	string		x			%s...)

debian/patches/213-magic-add-xcursor.patch

@@ -0,0 +1,15 @@
+Author: Mathias Brodala <info@noctus.net>
+Description: New magic for X11 cursor files (Closes: #451246).
+
+diff -Naurp file.orig/magic/Magdir/images file/magic/Magdir/images
+--- file.orig/magic/Magdir/images	2009-02-18 11:38:10.000000000 +0000
++++ file/magic/Magdir/images	2009-02-18 11:39:22.000000000 +0000
+@@ -610,3 +610,8 @@
+ # URL:	http://www.jisyo.com/cgibin/view.cgi?EXT=pe5 (Japanese)
+ # From:	Simon Horman <horms@debian.org>
+ 0	string	IIO2H			Ulead Photo Explorer5
++
++# Type:	X11 cursor
++# 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

debian/patches/335-magic-add-freemind.dpatch

@@ -1,9 +1,5 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 335-magic-add-freemind.dpatch by Jamie Thompson <debian-bugs@jamie-thompson.co.uk>
-##
-## DP: New magic for Freemind (Closes: #472385).
-
-@DPATCH@
+Author: Jamie Thompson <debian-bugs@jamie-thompson.co.uk>
+Description: New magic for Freemind (Closes: #472385).
 
 diff -Naurp file.orig/magic/Magdir/wordprocessors file/magic/Magdir/wordprocessors
 --- file.orig/magic/Magdir/wordprocessors	2008-05-04 14:12:49.000000000 +0000

debian/patches/215-magic-add-qdbm.patch

@@ -0,0 +1,15 @@
+Author: Benoit Sibaud <bsibaud@april.org>
+Description: New magic for QDBM Quick Database Manager (Closes: #481717).
+
+diff -Naurp file.orig/magic/Magdir/database file/magic/Magdir/database
+--- file.orig/magic/Magdir/database	2008-05-04 14:12:49.000000000 +0000
++++ file/magic/Magdir/database	2008-05-21 09:07:49.000000000 +0000
+@@ -242,3 +242,8 @@
+ # URL:  http://www.grc.nasa.gov/WWW/cgns/adf/
+ # From: Nicolas Chauvat <nicolas.chauvat@logilab.fr>
+ 0	string	@(#)ADF\ Database	CGNS Advanced Data Format
++
++# Type:	QDBM Quick Database Manager
++# From:	Benoit Sibaud <bsibaud@april.org>
++0	string	\\[depot\\]\n\f		Quick Database Manager, little endian
++0	string	\\[DEPOT\\]\n\f		Quick Database Manager, big endian

debian/patches/216-magic-add-tokyocabinet.patch

@@ -0,0 +1,16 @@
+Author: Benoit Sibaud <bsibaud@april.org>
+Description: New magic for TokyoCabinet database (Closes: #481768).
+
+diff -Naurp file.orig/magic/Magdir/database file/magic/Magdir/database
+--- file.orig/magic/Magdir/database	2008-05-21 09:07:49.000000000 +0000
++++ file/magic/Magdir/database	2008-05-21 09:15:26.000000000 +0000
+@@ -247,3 +247,9 @@
+ # From:	Benoit Sibaud <bsibaud@april.org>
+ 0	string	\\[depot\\]\n\f		Quick Database Manager, little endian
+ 0	string	\\[DEPOT\\]\n\f		Quick Database Manager, big endian
++
++# Type:	TokyoCabinet database
++# URL:	http://tokyocabinet.sourceforge.net/
++# From:	Benoit Sibaud <bsibaud@april.org>
++0	string	ToKyO\ CaBiNeT\n	TokyoCabinet database
++>14	string	x			(version %s)

debian/patches/338-magic-add-cromfs.dpatch

@@ -1,9 +1,5 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 338-magic-add-cromfs.dpatch by Werner Fink <werner@suse.de>
-##
-## DP: Adds new magic for CROM filesystem.
-
-@DPATCH@
+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

debian/patches/218-magic-add-scribus.patch

@@ -0,0 +1,16 @@
+Author: Werner Fink <werner@suse.de>
+Description: Adds new magics for Scribus.
+
+diff -Naurp file.orig/magic/Magdir/wordprocessors file/magic/Magdir/wordprocessors
+--- file.orig/magic/Magdir/wordprocessors	2008-05-21 09:49:43.000000000 +0000
++++ file/magic/Magdir/wordprocessors	2008-05-21 09:50:54.000000000 +0000
+@@ -153,3 +153,9 @@
+ # From: Jamie Thompson <debian-bugs@jamie-thompson.co.uk>
+ 0	string/cB	\<map\ version	Freemind document
+ !:mime	application/x-freemind
++
++# Type:        Scribus
++# From:        Werner Fink <werner@suse.de>
++0	string	\<SCRIBUSUTF8\ Version		Scribus Document
++0	string	\<SCRIBUSUTF8NEW\ Version	Scribus Document
++!:mime	application/x-scribus

debian/patches/340-magic-add-selinux.dpatch

@@ -1,9 +1,5 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 339-magic-add-selinux.dpatch by Russell Coker <russell@coker.com.au>
-##
-## DP: Adds new magics for SE Linux (Closes: #485886).
-
-@DPATCH@
+Author: Russell Coker <russell@coker.com.au>
+Description: Adds new magics for SE Linux (Closes: #485886).
 
 diff -Naurp file.orig/magic/Magdir/selinux file/magic/Magdir/selinux
 --- file.orig/magic/Magdir/selinux	1970-01-01 01:00:00.000000000 +0100

debian/patches/341-magic-add-bzr.dpatch

@@ -1,9 +1,5 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 341-magic-add-bzr.dpatch by Jelmer Vernooij <jelmer@samba.org>
-##
-## DP: Adds new magics for bzr (Closes: #488742).
-
-@DPATCH@
+Author: Jelmer Vernooij <jelmer@samba.org>
+Description: Adds new magics for bzr (Closes: #488742).
 
 diff -Naurp file.orig/magic/Magdir/revision file/magic/Magdir/revision
 --- file.orig/magic/Magdir/revision	2008-07-01 15:42:16.000000000 +0200

debian/patches/320-magic-add-par2.dpatch

@@ -1,17 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 318-magic-add-par2.dpatch by Daniel van Eeden <daniel_e@dds.nl>
-##
-## DP: New magic for PAR2 archive files (Closes: #294070).
-
-@DPATCH@
-
-diff -Naurp file-4.24.orig/magic/Magdir/archive file-4.24/magic/Magdir/archive
---- file-4.24.orig/magic/Magdir/archive	2008-02-28 18:57:34.000000000 +0000
-+++ file-4.24/magic/Magdir/archive	2008-04-07 08:05:47.000000000 +0000
-@@ -803,3 +803,6 @@
- >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

debian/patches/321-magic-add-pe5.dpatch

@@ -1,19 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 319-magic-add-pe5.dpatch by Simon Horman <horms@debian.org>
-##
-## DP: New magic for the Ulead Photo Explorer5 image format (Closes: #339397).
-
-@DPATCH@
-
-diff -Naurp file.orig/magic/Magdir/images file/magic/Magdir/images
---- file.orig/magic/Magdir/images	2008-07-02 15:16:52.000000000 +0000
-+++ file/magic/Magdir/images	2008-07-15 13:39:37.000000000 +0000
-@@ -600,3 +600,8 @@
- # Wavelet Scalar Quantization format used in gray-scale fingerprint images
- # From Tano M Fotang <mfotang@quanteq.com>
- 0	string	\xff\xa0\xff\xa8\x00	Wavelet Scalar Quantization image data
-+
-+# Type:	Ulead Photo Explorer5 (.pe5)
-+# URL:	http://www.jisyo.com/cgibin/view.cgi?EXT=pe5 (Japanese)
-+# From:	Simon Horman <horms@debian.org>
-+0	string	IIO2H	Ulead Photo Explorer5

debian/patches/322-magic-add-pmenu.dpatch

@@ -1,19 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 320-magic-add-pmenu.dpatch by Edward Betts <edward@debian.org>
-##
-## DP: New magic for pmenu (Closes: #38543).
-
-@DPATCH@
-
-diff -Naurp file-4.23.orig/magic/Magdir/commands file-4.23/magic/Magdir/commands
---- file-4.23.orig/magic/Magdir/commands	2007-06-01 19:40:26.000000000 +0000
-+++ file-4.23/magic/Magdir/commands	2008-01-12 17:34:41.000000000 +0000
-@@ -55,3 +55,8 @@
- 0	string		Zend\x00		PHP script Zend Optimizer data
- 
- 0	string		$!			DCL command file
-+
-+# Type: Pdmenu
-+# URL:  http://packages.debian.org/pdmenu
-+# From: Edward Betts <edward@debian.org>
-+0	string	#!/usr/bin/pdmenu	Pdmenu configuration file text

debian/patches/323-magic-add-powertab.dpatch

@@ -1,19 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 321-magic-add-powertab.dpatch by Jelmer Vernooij <jelmer@samba.org>
-##
-## DP: New magic for Power-Tab
-
-@DPATCH@
-
-diff -Naur file-4.20.orig/magic/Magdir/chord file-4.20/magic/Magdir/chord
---- file-4.20.orig/magic/Magdir/chord	2003-03-24 14:48:32.000000000 +0000
-+++ file-4.20/magic/Magdir/chord	2007-05-17 16:33:26.000000000 +0000
-@@ -7,3 +7,8 @@
- #
- 0	string		{title		Chord text file
- 
-+# Type:	PowerTab file format
-+# URL:	http://www.power-tab.net/
-+# From:	Jelmer Vernooij <jelmer@samba.org>
-+0	string		ptab\003\000	Power-Tab v3 Tablature File
-+0	string		ptab\004\000	Power-Tab v4 Tablature File

debian/patches/324-magic-add-scummvm.dpatch

@@ -1,18 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 322-magic-add-scummvm.dpatch by Sven Hartge <debian@ds9.argh.org>
-##
-## DP: New magic for ScummVM savegame files (Closes: #263488).
-
-@DPATCH@
-
-diff -Naurp file-4.23.orig/magic/Magdir/console file-4.23/magic/Magdir/console
---- file-4.23.orig/magic/Magdir/console	2007-09-26 20:22:31.000000000 +0000
-+++ file-4.23/magic/Magdir/console	2008-01-12 17:36:55.000000000 +0000
-@@ -252,3 +252,7 @@
- # .w3m
- 0	string HM3W				Warcraft III map file
- 
-+# Type: scummVM savegame files
-+# From: Sven Hartge <debian@ds9.argh.org>
-+0	string	SCVM	ScummVM savegame
-+>12	string	>\0	"%s"

debian/patches/328-magic-add-ssh.dpatch

@@ -1,19 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 325-magic-add-ssl.dpatch by Nicolas Collignon <tsointsoin@gmail.com>
-##
-## DP: New magic for OpenSSH key files (Closes: #439537).
-
-@DPATCH@
-
-diff -Naur file-4.21.orig/magic/Magdir/ssh file-4.21/magic/Magdir/ssh
---- file-4.21.orig/magic/Magdir/ssh	1970-01-01 00:00:00.000000000 +0000
-+++ file-4.21/magic/Magdir/ssh	2007-08-26 08:25:03.000000000 +0000
-@@ -0,0 +1,8 @@
-+# Type: OpenSSH key files
-+# From: Nicolas Collignon <tsointsoin@gmail.com>
-+
-+0	string	SSH\ PRIVATE\ KEY	OpenSSH RSA1 private key,
-+>28	string	>\0			version %s
-+
-+0	string	ssh-dss\		OpenSSH DSA public key
-+0	string	ssh-rsa\		OpenSSH RSA public key

debian/patches/329-magic-add-ssl.dpatch

@@ -1,18 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 325-magic-add-ssl.dpatch by Nicolas Collignon <tsointsoin@gmail.com>
-##
-## DP: New magic for OpenSSL certificates/key files (Closes: #439537).
-
-@DPATCH@
-
-diff -Naur file-4.21.orig/magic/Magdir/ssl file-4.21/magic/Magdir/ssl
---- file-4.21.orig/magic/Magdir/ssl	1970-01-01 00:00:00.000000000 +0000
-+++ file-4.21/magic/Magdir/ssl	2007-08-26 08:27:04.000000000 +0000
-@@ -0,0 +1,7 @@
-+# Type: OpenSSL certificates/key files
-+# From: Nicolas Collignon <tsointsoin@gmail.com>
-+
-+0	string	-----BEGIN\ CERTIFICATE-----	PEM certificate
-+0	string	-----BEGIN\ CERTIFICATE\ REQ	PEM certificate request
-+0	string	-----BEGIN\ RSA\ PRIVATE	PEM RSA private key
-+0	string	-----BEGIN\ DSA\ PRIVATE	PEM DSA private key

debian/patches/330-magic-add-subversion.dpatch

@@ -1,19 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 325-magic-add-subversion.dpatch by Michael Piefel <piefel@debian.org>
-##
-## DP: New magic for SVN dumps (closes: #256652).
-
-@DPATCH@
-
-diff -Naur file-4.21.orig/magic/Magdir/revision file-4.21/magic/Magdir/revision
---- file-4.21.orig/magic/Magdir/revision	2007-12-23 17:25:39.000000000 +0000
-+++ file-4.21/magic/Magdir/revision	2007-12-23 17:26:34.000000000 +0000
-@@ -17,3 +17,8 @@
- 0	string	HG10		Mercurial bundle,
- >4	string	UN		uncompressed
- >4	string	BZ		bzip2 compressed
-+
-+# Type:	Subversion (SVN) dumps
-+# From:	Uwe Zeisberger <zeisberg@informatik.uni-freiburg.de>
-+0	string	SVN-fs-dump-format-version:	Subversion dumpfile
-+>28	string	>\0				(version: %s)

debian/patches/331-magic-add-supercollider.dpatch

@@ -1,20 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 326-magic-add-supercollider.dpatch by Mario Lang <mlang@debian.org>
-##
-## DP: Adds new magic for SuperCollider 3 Synth Definition File Format
-## DP: (Closes: #284803).
-
-@DPATCH@
-
-diff -Naurp file-4.23.orig/magic/Magdir/audio file-4.23/magic/Magdir/audio
---- file-4.23.orig/magic/Magdir/audio	2008-01-12 17:39:01.000000000 +0000
-+++ file-4.23/magic/Magdir/audio	2008-01-12 17:38:49.000000000 +0000
-@@ -576,3 +576,8 @@
- # URL:  http://filext.com/detaillist.php?extdetail=AMR
- # From: Russell Coker <russell@coker.com.au>
- 0	string	#!AMR		Adaptive Multi-Rate Codec (GSM telephony)
-+
-+# Type: SuperCollider 3 Synth Definition File Format
-+# From: Mario Lang <mlang@debian.org>
-+0	string	SCgf	SuperCollider3 Synth Definition file,
-+>4	belong	x	version %d

debian/patches/333-magic-add-xen.dpatch

@@ -1,20 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 328-magic-add-xen.dpatch by Radek Vokal <rvokal@redhat.com>
-##
-## DP: xen patch, recognizes Xen saved domain
-
-@DPATCH@
-
-diff -Naurp file-4.23.orig/magic/Magdir/linux file-4.23/magic/Magdir/linux
---- file-4.23.orig/magic/Magdir/linux	2008-01-12 17:47:04.000000000 +0000
-+++ file-4.23/magic/Magdir/linux	2008-01-12 17:46:42.000000000 +0000
-@@ -248,3 +248,9 @@
- >72	string	x		%s]
- >168	string	x		UUID: %s
- 
-+# Type: Xen, the virtual machine monitor
-+# From: Radek Vokal <rvokal@redhat.com>
-+0	string		LinuxGuestRecord	Xen saved domain
-+#>2	regex		\(name\ [^)]*\)		%s
-+>20	search/256	(name			(name
-+>>&1	string		x			%s...)

debian/patches/334-magic-add-xcursor.dpatch

@@ -1,19 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 331-magic-add-xcursor.dpatch by Mathias Brodala <info@noctus.net>
-##
-## DP: New magic for X11 cursor files (Closes: #451246).
-
-@DPATCH@
-
-diff -Naur file-4.21.orig/magic/Magdir/images file-4.21/magic/Magdir/images
---- file-4.21.orig/magic/Magdir/images	2007-12-23 17:40:53.000000000 +0000
-+++ file-4.21/magic/Magdir/images	2007-12-23 17:40:46.000000000 +0000
-@@ -534,3 +534,8 @@
- # URL:  http://www.jisyo.com/cgibin/view.cgi?EXT=pe5 (Japanese)
- # From: Simon Horman <horms@debian.org>
- 0	string	IIO2H	Ulead Photo Explorer5
-+
-+# Type:	X11 cursor
-+# 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

debian/patches/336-magic-add-qdbm.dpatch

@@ -1,19 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 336-magic-add-qdmb.dpatch by Benoit Sibaud <bsibaud@april.org>
-##
-## DP: New magic for QDBM Quick Database Manager (Closes: #481717).
-
-@DPATCH@
-
-diff -Naurp file-4.24.orig/magic/Magdir/database file-4.24/magic/Magdir/database
---- file-4.24.orig/magic/Magdir/database	2008-05-04 14:12:49.000000000 +0000
-+++ file-4.24/magic/Magdir/database	2008-05-21 09:07:49.000000000 +0000
-@@ -242,3 +242,8 @@
- # URL:  http://www.grc.nasa.gov/WWW/cgns/adf/
- # From: Nicolas Chauvat <nicolas.chauvat@logilab.fr>
- 0	string	@(#)ADF\ Database	CGNS Advanced Data Format
-+
-+# Type:	QDBM Quick Database Manager
-+# From:	Benoit Sibaud <bsibaud@april.org>
-+0	string	\\[depot\\]\n\f		Quick Database Manager, little endian
-+0	string	\\[DEPOT\\]\n\f		Quick Database Manager, big endian

debian/patches/337-magic-add-tokyocabinet.dpatch

@@ -1,20 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 337-magic-add-tokyocabinet.dpatch by Benoit Sibaud <bsibaud@april.org>
-##
-## DP: New magic for TokyoCabinet database (Closes: #481768).
-
-@DPATCH@
-
-diff -Naurp file-4.24.orig/magic/Magdir/database file-4.24/magic/Magdir/database
---- file-4.24.orig/magic/Magdir/database	2008-05-21 09:07:49.000000000 +0000
-+++ file-4.24/magic/Magdir/database	2008-05-21 09:15:26.000000000 +0000
-@@ -247,3 +247,9 @@
- # From:	Benoit Sibaud <bsibaud@april.org>
- 0	string	\\[depot\\]\n\f		Quick Database Manager, little endian
- 0	string	\\[DEPOT\\]\n\f		Quick Database Manager, big endian
-+
-+# Type:	TokyoCabinet database
-+# URL:	http://tokyocabinet.sourceforge.net/
-+# From:	Benoit Sibaud <bsibaud@april.org>
-+0	string	ToKyO\ CaBiNeT\n	TokyoCabinet database
-+>14	string	x			(version %s)

debian/patches/339-magic-add-scribus.dpatch

@@ -1,20 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 339-magic-add-scribus.dpatch by Werner Fink <werner@suse.de>
-##
-## DP: Adds new magics for Scribus.
-
-@DPATCH@
-
-diff -Naurp file-4.24.orig/magic/Magdir/wordprocessors file-4.24/magic/Magdir/wordprocessors
---- file-4.24.orig/magic/Magdir/wordprocessors	2008-05-21 09:49:43.000000000 +0000
-+++ file-4.24/magic/Magdir/wordprocessors	2008-05-21 09:50:54.000000000 +0000
-@@ -153,3 +153,9 @@
- # From: Jamie Thompson <debian-bugs@jamie-thompson.co.uk>
- 0	string/cB	\<map\ version	Freemind document
- !:mime	application/x-freemind
-+
-+# Type:        Scribus
-+# From:        Werner Fink <werner@suse.de>
-+0	string	\<SCRIBUSUTF8\ Version		Scribus Document
-+0	string	\<SCRIBUSUTF8NEW\ Version	Scribus Document
-+!:mime	application/x-scribus

debian/patches/901-file-mgc.dpatch

@@ -1,10 +1,5 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 901-file-mgc.dpatch by Daniel Baumann <daniel@debian.org>
-##
-## DP: Reverting upstream change of stopping to build plain magic file
-## DP: (Closes: #481247).
-
-@DPATCH@
+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	2008-06-17 17:49:11.000000000 +0000

debian/patches/903-file-localmagic.dpatch

@@ -1,10 +1,5 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 903-magic-local.dpatch by Michael Piefel <piefel@debian.org>
-##
-## DP: No longer includes Localstuff in /usr/share/misc/magic. Local definitions
-## DP: should go to /etc/magic.
-
-@DPATCH@
+Author: Michael Piefel <piefel@debian.org>
+Description: No longer includes Localstuff in /usr/share/misc/magic. Local definitions should go to /etc/magic.
 
 diff -Naurp file.orig/magic/Header file/magic/Header
 --- file.orig/magic/Header	2000-08-05 17:36:46.000000000 +0000

debian/patches/902-file-make.patch

@@ -0,0 +1,15 @@
+Author: Michael Piefel <piefel@debian.org>
+Description: n/a
+
+diff -Naurp file.orig/src/Makefile.in file/src/Makefile.in
+--- file.orig/src/Makefile.in	2008-01-12 17:55:24.000000000 +0000
++++ file/src/Makefile.in	2008-01-12 17:56:46.000000000 +0000
+@@ -300,7 +300,7 @@ clean-binPROGRAMS:
+ 	done
+ file$(EXEEXT): $(file_OBJECTS) $(file_DEPENDENCIES) 
+ 	@rm -f file$(EXEEXT)
+-	$(LINK) $(file_OBJECTS) $(file_LDADD) $(LIBS)
++	$(LINK) $(file_OBJECTS) $(file_LDADD)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)

debian/patches/903-file-hurd.patch

@@ -0,0 +1,18 @@
+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/998-doc-manpages.dpatch

@@ -1,14 +1,10 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 998-doc-manpages.dpatch by Michael Piefel <piefel@debian.org>
-##
-## DP: FIXME, and #417511.
+Author: Michael Piefel <piefel@debian.org>
+Description: FIXME, and #417511.
 
-@DPATCH@
-
-diff -Naurp file-4.24.orig/doc/file.man file-4.24/doc/file.man
---- file-4.24.orig/doc/file.man	2008-03-07 15:00:07.000000000 +0000
-+++ file-4.24/doc/file.man	2008-04-07 08:26:06.000000000 +0000
-@@ -51,7 +51,7 @@ meaning anything else (data is usually 
+diff -Naurp file.orig/doc/file.man file/doc/file.man
+--- file.orig/doc/file.man	2008-11-06 23:18:35.000000000 +0000
++++ file/doc/file.man	2009-02-18 12:28:42.000000000 +0000
+@@ -51,7 +51,7 @@ meaning anything else (data is usually
  or non-printable).
  Exceptions are well-known file formats (core files, tar archives)
  that are known to contain binary data.
@@ -16,7 +12,7 @@ diff -Naurp file-4.24.orig/doc/file.man file-4.24/doc/file.man
 +When adding local definitions to /etc/magic, make sure to
  .Em "preserve these keywords" .
  Users depend on knowing that all the readable files in a directory
- have the word 
+ have the word
 @@ -95,7 +95,8 @@ The concept of a
  has been applied by extension to data files.
  Any file with some invariant identifier at a small fixed
@@ -27,9 +23,9 @@ diff -Naurp file-4.24.orig/doc/file.man file-4.24/doc/file.man
  magic file
  .Pa __MAGIC__.mgc ,
  or the files in the directory
-@@ -326,6 +327,11 @@ will not attempt to open
+@@ -325,6 +326,11 @@ will not attempt to open
  adds
- .Dq .mgc
+ .Sq .mgc
  to the value of this variable as appropriate.
 +However,
 +.Pa file
@@ -39,7 +35,7 @@ diff -Naurp file-4.24.orig/doc/file.man file-4.24/doc/file.man
  The environment variable
  .Dv POSIXLY_CORRECT
  controls (on systems that support symbolic links), whether
-@@ -401,12 +407,6 @@ will be distributed periodically.
+@@ -400,12 +406,6 @@ will be distributed periodically.
  The order of entries in the magic file is significant.
  Depending on what system you are using, the order that
  they are put together may be incorrect.
@@ -47,17 +43,17 @@ diff -Naurp file-4.24.orig/doc/file.man file-4.24/doc/file.man
 -.Nm
 -command uses a magic file,
 -keep the old magic file around for comparison purposes
--(rename it to 
+-(rename it to
 -.Pa __MAGIC__.orig ).
  .Sh EXAMPLES
- .Bd -literal -offset indent 
+ .Bd -literal -offset indent
  $ file file.c file /dev/{wd0a,hda}
-@@ -548,3 +548,8 @@ on
+@@ -547,3 +547,8 @@ on
  .Dv ftp.astron.com
  in the directory
  .Dv /pub/file/file-X.YZ.tar.gz
 +.Pp
-+This Debian version adds a number of new magix entries. It can be
++This Debian version adds a number of new magic entries. It can be
 +obtained from every site carrying a Debian distribution (that is
 +.Dv ftp.debian.org
 +and mirrors).

debian/patches/904-file-make.dpatch

@@ -1,19 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 904-file-make.dpatch by Michael Piefel <piefel@debian.org>
-##
-## DP: FIXME
-
-@DPATCH@
-
-diff -Naurp file-4.23.orig/src/Makefile.in file-4.23/src/Makefile.in
---- file-4.23.orig/src/Makefile.in	2008-01-12 17:55:24.000000000 +0000
-+++ file-4.23/src/Makefile.in	2008-01-12 17:56:46.000000000 +0000
-@@ -300,7 +300,7 @@ clean-binPROGRAMS:
- 	done
- file$(EXEEXT): $(file_OBJECTS) $(file_DEPENDENCIES) 
- 	@rm -f file$(EXEEXT)
--	$(LINK) $(file_OBJECTS) $(file_LDADD) $(LIBS)
-+	$(LINK) $(file_OBJECTS) $(file_LDADD)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)

debian/patches/906-file-hurd.dpatch

@@ -1,22 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 906-file-hurd.dpatch by Michael Casadevall <sonicmctails@gmail.com>
-##
-## DP: Fixes a FTBFS on hurd (Closes: #433716).
-
-@DPATCH@
-
-diff -Naur file-4.21.orig/src/magic.c file-4.21/src/magic.c
---- file-4.21.orig/src/magic.c	2007-03-26 17:59:50.000000000 +0000
-+++ file-4.21/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/999-conglomeration.dpatch

@@ -1,20 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 999-conglomeration.dpatch by Michael Piefel <piefel@debian.org>
-##
-## DP: Needs to be broken out (FIXME).
-
-@DPATCH@
-
-diff -Naurp file-4.24.orig/src/fsmagic.c file-4.24/src/fsmagic.c
---- file-4.24.orig/src/fsmagic.c	2008-02-14 20:14:52.000000000 +0000
-+++ file-4.24/src/fsmagic.c	2008-04-07 08:32:13.000000000 +0000
-@@ -110,7 +110,8 @@ file_fsmagic(struct magic_set *ms, const
- 		if (file_printf(ms, "cannot open `%s' (%s)",
- 		    fn, strerror(errno)) == -1)
- 			return -1;
--		return 1;
-+		ms->haderr++;
-+		return -1;
- 	}
- 
- 	if (mime) {

debian/patches/999-conglomeration.patch

@@ -0,0 +1,16 @@
+Author: Michael Piefel <piefel@debian.org>
+Description: Needs to be broken out (FIXME).
+
+diff -Naurp file.orig/src/fsmagic.c file/src/fsmagic.c
+--- file.orig/src/fsmagic.c	2008-02-14 20:14:52.000000000 +0000
++++ file/src/fsmagic.c	2008-04-07 08:32:13.000000000 +0000
+@@ -110,7 +110,8 @@ file_fsmagic(struct magic_set *ms, const
+ 		if (file_printf(ms, "cannot open `%s' (%s)",
+ 		    fn, strerror(errno)) == -1)
+ 			return -1;
+-		return 1;
++		ms->event_flags |= EVENT_HAD_ERR;
++		return -1;
+ 	}
+ 
+ 	if (mime) {

debian/patches/series

@@ -0,0 +1,45 @@
+100-magic-update-asf.patch
+101-magic-update-awk.patch
+102-magic-update-bash.patch
+103-magic-update-reiserfs.patch
+104-magic-update-tcsh.patch
+105-magic-update-zip.patch
+106-magic-update-real.patch
+107-magic-update-os2.patch
+108-magic-update-digifax.patch
+109-magic-update-mono.patch
+110-magic-update-pfm.patch
+111-magic-update-ocaml.patch
+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
+200-magic-add-par2.patch
+201-magic-add-pe5.patch
+202-magic-add-pmenu.patch
+203-magic-add-powertab.patch
+204-magic-add-scummvm.patch
+205-magic-add-sgf.patch
+206-magic-add-sisu.patch
+207-magic-add-snes.patch
+208-magic-add-ssh.patch
+209-magic-add-ssl.patch
+210-magic-add-subversion.patch
+211-magic-add-supercollider.patch
+212-magic-add-xen.patch
+213-magic-add-xcursor.patch
+214-magic-add-freemind.patch
+215-magic-add-qdbm.patch
+216-magic-add-tokyocabinet.patch
+217-magic-add-cromfs.patch
+218-magic-add-scribus.patch
+219-magic-add-selinux.patch
+220-magic-add-bzr.patch
+900-file-mgc.patch
+901-file-localmagic.patch
+902-file-make.patch
+903-file-hurd.patch
+904-doc-manpages.patch
+999-conglomeration.patch

debian/rules

@@ -1,59 +1,50 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/quilt/quilt.make
 
-include /usr/share/dpatch/dpatch.make
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
-	CROSS= --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \
-		CC=$(DEB_HOST_GNU_TYPE)-gcc LD=$(DEB_HOST_GNU_TYPE)-ld
+	CROSS= --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) CC=$(DEB_HOST_GNU_TYPE)-gcc LD=$(DEB_HOST_GNU_TYPE)-ld
 else
 	CROSS= --build=$(DEB_BUILD_GNU_TYPE)
 endif
 
 # HOWMANY is the number of bytes looked at by file
-CFLAGS = -DHOWMANY=0x18000
+CFLAGS += -DHOWMANY=0x18000
 
-CFLAGS += -Wall -g
+PYTHON_VERSIONS=$(shell pyversions -r debian/control)
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+	rm -f config.guess config.sub
 
-PYTHON_VERSIONS=$(shell pyversions -r debian/control)
+	[ ! -f Makefile ] || $(MAKE) clean
+	[ ! -f Makefile ] || $(MAKE) distclean
+	rm -rf python/build
 
-config.status: configure patch-stamp
+	dh_clean
+
+config.status: configure patch
 	dh_testdir
 
-	rm -f ltmain.sh
-	libtoolize --automake
-	aclocal
-	automake
-	autoconf
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+	cp -f /usr/share/misc/config.guess config.guess
+endif
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+	cp -f /usr/share/misc/config.sub config.sub
+endif
 
-	# Configuring package
-	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
-	CFLAGS="$(CFLAGS)" ./configure $(CROSS) --prefix=/usr --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
+	./configure $(CROSS) --prefix=/usr --datadir=\$${prefix}/share --mandir=\$${prefix}/share/man --enable-fsect-man5 CFLAGS="$(CFLAGS)"
 
 build: build-stamp
 build-stamp: config.status
 	dh_testdir
 
-	# Building package
-	mv libtool libtool.upstream && ln -s /usr/bin/libtool libtool
 	$(MAKE)
-	rm libtool && mv libtool.upstream libtool
 
 	set -e; \
 	for python in $(PYTHON_VERSIONS); \
@@ -68,17 +59,6 @@ build-stamp: config.status
 
 	touch build-stamp
 
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-
-	# Cleaning package
-	[ ! -f Makefile ] || $(MAKE) clean
-	[ ! -f Makefile ] || $(MAKE) distclean
-	rm -rf python/build
-
-	dh_clean
 
 install: build
 	dh_testdir
@@ -87,9 +67,7 @@ install: build
 	dh_installdirs
 
 	# Installing package
-	mv libtool libtool.upstream && ln -s /usr/bin/libtool libtool
 	$(MAKE) prefix=$(CURDIR)/debian/tmp/usr install
-	rm libtool && mv libtool.upstream libtool
 
 	install -D -m 0644 magic/magic.local debian/tmp/etc/magic
 	install -D -m 0644 magic/magic.local debian/tmp/etc/magic.mime
@@ -122,9 +100,9 @@ install: build
 	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
 
-binary-indep: build install
+binary: binary-arch
 
-binary-arch: build install
+binary-arch: install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs ChangeLog
@@ -132,8 +110,8 @@ binary-arch: build install
 	dh_installexamples
 	dh_install --sourcedir=debian/tmp
 	dh_lintian
-	dh_python
 	dh_link
+	dh_python
 ifeq (,$(findstring -i, $(DH_OPTIONS)))
 	dh_strip -Npython-magic -Npython-magic-dbg
 	DH_OPTIONS= dh_strip -ppython-magic --dbg-package=python-magic-dbg
@@ -151,5 +129,6 @@ endif
 	dh_md5sums
 	dh_builddeb
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+binary-indep:
+
+.PHONY: clean build install binary binary-arch binary-indep