Import Debian version 4.20-5

debian/copyright

@@ -38,5 +38,41 @@ License:
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 	THE POSSIBILITY OF SUCH DAMAGE.
 
+License (magic/Magdir/os9):
+
+	Copyright (C) 1996 Ignatios Souvatzis
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are
+	met:
+
+	1. Redistributions of source code must retain the above copyright
+	notice, this list of conditions and the following disclaimer.
+
+	2. Redistributions in binary form must reproduce the above copyright
+	notice, this list of conditions and the following disclaimer in the
+	documentation and/or other materials provided with the distribution.
+
+	3. All advertising materials mentioning features or use of this software
+	must display the following acknowledgement:
+	This product includes software developed by Ignatios Souvatzis for the
+	NetBSD project.
+
+	4. The name of the author may not be used to endorse or promote products
+	derived from this software without specific prior written permission.
+
+	THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+	IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+	WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+	DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+	INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+	SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+	HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+	STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+	ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+
 The Debian packaging is (C) 2007, Daniel Baumann <daniel@debian.org> and
 is licensed under the GPL, see `/usr/share/common-licenses/GPL'.

debian/patches/00list

@@ -1,10 +1,11 @@
 101-magic-remove-awk.dpatch
-102-magic-remove-bzip.dpatch
-103-magic-remove-cgm.dpatch
-104-magic-remove-com.dpatch
-105-magic-remove-emf.dpatch
-106-magic-remove-msi.dpatch
-107-magic-remove-quicktime.dpatch
+102-magic-remove-bennet.dpatch
+103-magic-remove-bzip.dpatch
+104-magic-remove-cgm.dpatch
+105-magic-remove-com.dpatch
+106-magic-remove-emf.dpatch
+107-magic-remove-msi.dpatch
+108-magic-remove-quicktime.dpatch
 201-magic-update-avi.dpatch
 202-magic-update-blender.dpatch
 203-magic-update-cow.dpatch

debian/patches/102-magic-remove-bennet.dpatch

@@ -0,0 +1,19 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 102-magic-remove-bennet.dpatch by Josh Triplett <josh@freedesktop.org>
+##
+## DP: Remove Bennets face format, its match is too generic (Closes: #420855).
+
+@DPATCH@
+
+diff -Naur file-4.20.orig/magic/Magdir/images file-4.20/magic/Magdir/images
+--- file-4.20.orig/magic/Magdir/images	2007-01-19 19:31:46.000000000 +0000
++++ file-4.20/magic/Magdir/images	2007-04-26 06:24:31.000000000 +0000
+@@ -260,7 +260,7 @@
+ 
+ # other images
+ 0	string	This\ is\ a\ BitMap\ file	Lisp Machine bit-array-file
+-0	string		=!!		Bennet Yee's "face" format
++#0	string		=!!		Bennet Yee's "face" format
+ 
+ # From SunOS 5.5.1 "/etc/magic" - appeared right before Sun raster image
+ # stuff.

debian/patches/102-magic-remove-bzip.dpatch

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 102-magic-remove-bzip.dpatch by Michael Piefel <piefel@debian.org>
+## 103-magic-remove-bzip.dpatch by Michael Piefel <piefel@debian.org>
 ##
 ## DP: Disabled bzip detection (closes: #277648).
 

debian/patches/103-magic-remove-cgm.dpatch

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 103-magic-remove-cgm.dpatch by Michael Piefel <piefel@debian.org>
+## 104-magic-remove-cgm.dpatch by Michael Piefel <piefel@debian.org>
 ##
 ## DP: FIXME
 

debian/patches/104-magic-remove-com.dpatch

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 104-magic-remove-com.dpatch by Michael Piefel <piefel@debian.org>
+## 105-magic-remove-com.dpatch by Michael Piefel <piefel@debian.org>
 ##
 ## DP: Disable one-byte magic for COM (closes: #393775, #339618).
 

debian/patches/105-magic-remove-emf.dpatch

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 105-magic-remove-emf.dpatch by Michael Piefel <piefel@debian.org>
+## 106-magic-remove-emf.dpatch by Michael Piefel <piefel@debian.org>
 ##
 ## DP: Disabled EMF detection as it not only caused false positives, which might
 ## DP: have been acceptible, but a segmentation fault (closes: #333502).

debian/patches/106-magic-remove-msi.dpatch

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 106-magic-remove-msi.dpatch by Michael Piefel <piefel@debian.org>
+## 107-magic-remove-msi.dpatch by Michael Piefel <piefel@debian.org>
 ##
 ## DP: Disable second MS Installer entry (closes: #409895).
 

debian/patches/107-magic-remove-quicktime.dpatch

@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 107-magic-remove-quicktime.dpatch by Michael Piefel <piefel@debian.org>
+## 108-magic-remove-quicktime.dpatch by Michael Piefel <piefel@debian.org>
 ##
 ## DP: Disabled some QuickTime entries (ASCII words, closes: #366986, #308394).
 

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

@@ -7,8 +7,8 @@
 
 diff -Naur file-4.20.orig/magic/Magdir/sisu file-4.20/magic/Magdir/sisu
 --- file-4.20.orig/magic/Magdir/sisu	1970-01-01 00:00:00.000000000 +0000
-+++ file-4.20/magic/Magdir/sisu	2007-04-03 13:36:58.000000000 +0000
-@@ -0,0 +1,15 @@
++++ file-4.20/magic/Magdir/sisu	2007-04-26 06:12:12.000000000 +0000
+@@ -0,0 +1,18 @@
 +# Type: SiSU Markup Language
 +# URL:  http://www.sisudoc.org/
 +# From: Ralph Amissah <ralph.amissah@gmail.com>
@@ -16,18 +16,21 @@ diff -Naur file-4.20.orig/magic/Magdir/sisu file-4.20/magic/Magdir/sisu
 +0	regex	\^%?[\ \t]*SiSU[\ \t]+insert	SiSU text insert
 +>5	regex	[0-9.]+				%s
 +
-+0	regex	\^%?[\ \t]*SiSU[\ \t]+master	SiSU text master
++0	regex	\^%[\ \t]+SiSU[\ \t]+master	SiSU text master
 +>5	regex	[0-9.]+				%s
 +
-+0	regex	\^%?[\ \t]*SiSU([\ \t]+text)?	SiSU text
++0	regex	\^%?[\ \t]*SiSU[\ \t]+text	SiSU text
++>5	regex	[0-9.]+				%s
++
++0	regex	\^%?[\ \t]*SiSU[\ \t][0-9.]+	SiSU text
 +>5	regex	[0-9.]+				%s
 +
 +0	regex	\^%*[\ \t]*sisu-[0-9.]+		SiSU text
 +>5	regex	[0-9.]+				%s
 diff -Naur file-4.20.orig/magic/Makefile.am file-4.20/magic/Makefile.am
---- file-4.20.orig/magic/Makefile.am	2006-11-25 18:36:10.000000000 +0000
-+++ file-4.20/magic/Makefile.am	2007-04-03 13:37:12.000000000 +0000
-@@ -176,6 +176,7 @@
+--- file-4.20.orig/magic/Makefile.am	2007-04-26 06:10:03.000000000 +0000
++++ file-4.20/magic/Makefile.am	2007-04-26 06:10:24.000000000 +0000
+@@ -182,6 +182,7 @@
  Magdir/sgml \
  Magdir/sharc \
  Magdir/sinclair \
@@ -36,9 +39,9 @@ diff -Naur file-4.20.orig/magic/Makefile.am file-4.20/magic/Makefile.am
  Magdir/smalltalk \
  Magdir/sniffer \
 diff -Naur file-4.20.orig/magic/Makefile.in file-4.20/magic/Makefile.in
---- file-4.20.orig/magic/Makefile.in	2007-03-01 23:21:09.000000000 +0000
-+++ file-4.20/magic/Makefile.in	2007-04-03 13:37:29.000000000 +0000
-@@ -316,6 +316,7 @@
+--- file-4.20.orig/magic/Makefile.in	2007-04-26 06:10:03.000000000 +0000
++++ file-4.20/magic/Makefile.in	2007-04-26 06:10:24.000000000 +0000
+@@ -322,6 +322,7 @@
  Magdir/sgml \
  Magdir/sharc \
  Magdir/sinclair \