Import Debian version 4.21-3

debian/patches/00list

@@ -14,40 +14,46 @@
 206-magic-update-elf-b.dpatch
 207-magic-update-elf-c.dpatch
 208-magic-update-hp.dpatch
-209-magic-update-m4v.dpatch
-210-magic-update-macintosh.dpatch
-211-magic-update-os2rexx.dpatch
-212-magic-update-pcp.dpatch
-213-magic-update-perl.dpatch
-214-magic-update-sh.dpatch
-215-magic-update-spectrum.dpatch
+209-magic-update-jpeg.dpatch
+210-magic-update-m4v.dpatch
+211-magic-update-macintosh.dpatch
+212-magic-update-os2rexx.dpatch
+213-magic-update-pcp.dpatch
+214-magic-update-perl.dpatch
+215-magic-update-sh.dpatch
+216-magic-update-spectrum.dpatch
 301-magic-add-adf.dpatch
-303-magic-add-apple2.dpatch
-304-magic-add-arm.dpatch
-305-magic-add-avg.dpatch
-306-magic-add-clarion.dpatch
-307-magic-add-dds.dpatch
-308-magic-add-erlang.dpatch
-309-magic-add-gedcom.dpatch
-310-magic-add-inform.dpatch
-311-magic-add-llvm.dpatch
-312-magic-add-lua.dpatch
-313-magic-add-luks.dpatch
-314-magic-add-lzma.dpatch
-315-magic-add-mathcad.dpatch
-316-magic-add-nlm.dpatch
-317-magic-add-ocfs.dpatch
-318-magic-add-par2.dpatch
-319-magic-add-pe5.dpatch
-320-magic-add-pmenu.dpatch
-321-magic-add-powertab.dpatch
-322-magic-add-scummvm.dpatch
+302-magic-add-apple2.dpatch
+303-magic-add-arm.dpatch
+304-magic-add-avg.dpatch
+305-magic-add-clarion.dpatch
+306-magic-add-dds.dpatch
+307-magic-add-erlang.dpatch
+308-magic-add-gedcom.dpatch
+309-magic-add-git.dpatch
+309-magic-add-inform.dpatch
+310-magic-add-llvm.dpatch
+311-magic-add-lua.dpatch
+312-magic-add-luks.dpatch
+313-magic-add-lzma.dpatch
+314-magic-add-mathcad.dpatch
+315-magic-add-mdi.dpatch
+315-magic-add-nlm.dpatch
+316-magic-add-ocfs.dpatch
+317-magic-add-par2.dpatch
+318-magic-add-pe5.dpatch
+319-magic-add-pmenu.dpatch
+320-magic-add-powertab.dpatch
+321-magic-add-scummvm.dpatch
+322-magic-add-sgf.dpatch
 323-magic-add-sisu.dpatch
 324-magic-add-snes.dpatch
-325-magic-add-subversion.dpatch
-326-magic-add-supercollider.dpatch
-327-magic-add-svg.dpatch
-328-magic-add-xen.dpatch
+325-magic-add-ssh.dpatch
+326-magic-add-ssl.dpatch
+327-magic-add-subversion.dpatch
+328-magic-add-supercollider.dpatch
+329-magic-add-svg.dpatch
+330-magic-add-xen.dpatch
 901-file-elf.dpatch
 902-file-kfreebsd.dpatch
 903-file-localmagic.dpatch

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

@@ -0,0 +1,19 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 209-magic-update-jpeg.dpatch by Mathieu Malaterre <mathieu.malaterre@gmail.com>
+##
+## DP: Extends JPEG 2000 magic (Closes: #439005).
+
+@DPATCH@
+
+diff -Naur file-4.21.orig/magic/Magdir/jpeg file-4.21/magic/Magdir/jpeg
+--- file-4.21.orig/magic/Magdir/jpeg	2004-07-24 20:38:55.000000000 +0000
++++ file-4.21/magic/Magdir/jpeg	2007-08-26 08:12:23.000000000 +0000
+@@ -153,3 +153,8 @@
+ 
+ # From: David Santinoli <david@santinoli.com>
+ 0	string		\x00\x00\x00\x0C\x6A\x50\x20\x20\x0D\x0A\x87\x0A	JPEG 2000 image data
++
++# Type: JPEG 2000 codesream
++# From: Mathieu Malaterre <mathieu.malaterre@gmail.com>
++0	belong		0xff4fff51						JPEG 2000 codestream
++45	beshort		0xff52

debian/patches/309-magic-add-git.dpatch

@@ -0,0 +1,18 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 309-magic-add-git.dpatch by Josh Triplett <josh@freedesktop.org>
+##
+## DP: New magic for Git bundles (Closes: #430070).
+
+@DPATCH@
+
+diff -Naur file-4.21.orig/magic/Magdir/revision file-4.21/magic/Magdir/revision
+--- file-4.21.orig/magic/Magdir/revision	2007-04-09 16:33:07.000000000 +0000
++++ file-4.21/magic/Magdir/revision	2007-08-26 08:05:22.000000000 +0000
+@@ -7,3 +7,7 @@
+ # Conary changesets
+ # From: Jonathan Smith <smithj@rpath.com>
+ 0	belong	0xea3f81bb	Conary changeset data
++
++# Type: Git bundles (git-bundle)
++# From: Josh Triplett <josh@freedesktop.org>
++0	string	#\ v2\ git\ bundle\n	Git bundle

debian/patches/315-magic-add-mdi.dpatch

@@ -0,0 +1,19 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 315-magic-add-mdi.dpatch by Daniele Sempione <scrows@oziosi.org>
+##
+## DP: New magic for Microsoft Document Imaging Format (.mdi) (Closes: #430548).
+
+@DPATCH@
+
+diff -Naur file-4.21.orig/magic/Magdir/msdos file-4.21/magic/Magdir/msdos
+--- file-4.21.orig/magic/Magdir/msdos	2007-08-26 08:16:22.000000000 +0000
++++ file-4.21/magic/Magdir/msdos	2007-08-26 08:18:07.000000000 +0000
+@@ -636,3 +636,8 @@
+ >16	lelong	>0			%hd x
+ >12	lelong	>0			%hd,
+ >84	string	x			%.4s
++
++# Type: Microsoft Document Imaging Format (.mdi)
++# URL:  http://en.wikipedia.org/wiki/Microsoft_Document_Imaging_Format
++# From: Daniele Sempione <scrows@oziosi.org>
++0	short	0x5045			Microsoft Document Imaging Format

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

@@ -0,0 +1,27 @@
+#!/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@
+
+diff -Naur file-4.21.orig/magic/Magdir/games file-4.21/magic/Magdir/games
+--- file-4.21.orig/magic/Magdir/games	2004-03-22 20:24:48.000000000 +0000
++++ file-4.21/magic/Magdir/games	2007-08-26 07:59:12.000000000 +0000
+@@ -155,3 +155,16 @@
+ 
+ 0	string	MComprHD	MAME CHD compressed hard disk image,
+ >12	belong	x		version %lu
++
++# Type: SGF Smart Game Format
++# URL:  http://www.red-bean.com/sgf/
++# From: Eduardo Sabbatella <eduardo_sabbatella@yahoo.com.ar>
++
++2	regex/c	\\(;.*GM\\[[0-9]{1,2}\\]	Smart Game Format
++>2	regex/c	GM\\[1\\]			- Go Game
++>2	regex/c	GM\\[6\\]			- BackGammon Game
++>2	regex/c	GM\\[11\\]			- Hex Game
++>2	regex/c	GM\\[18\\]			- Amazons Game
++>2	regex/c	GM\\[19\\]			- Octi Game
++>2	regex/c	GM\\[20\\]			- Gess Game
++>2	regex/c	GM\\[21\\]			- twix Game

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

@@ -0,0 +1,19 @@
+#!/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/326-magic-add-ssl.dpatch

@@ -0,0 +1,18 @@
+#!/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/325-magic-add-subversion.dpatch

@@ -6,12 +6,12 @@
 @DPATCH@
 
 diff -Naur file-4.21.orig/magic/Magdir/revision file-4.21/magic/Magdir/revision
---- file-4.21.orig/magic/Magdir/revision	2007-04-09 16:33:07.000000000 +0000
-+++ file-4.21/magic/Magdir/revision	2007-06-01 18:52:52.000000000 +0000
-@@ -7,3 +7,8 @@
- # Conary changesets
- # From: Jonathan Smith <smithj@rpath.com>
- 0	belong	0xea3f81bb	Conary changeset data
+--- file-4.21.orig/magic/Magdir/revision	2007-08-26 08:06:34.000000000 +0000
++++ file-4.21/magic/Magdir/revision	2007-08-26 08:06:05.000000000 +0000
+@@ -11,3 +11,8 @@
+ # Type: Git bundles (git-bundle)
+ # From: Josh Triplett <josh@freedesktop.org>
+ 0	string	#\ v2\ git\ bundle\n	Git bundle
 +
 +# Type: Subversion (SVN) dumps
 +# From: Uwe Zeisberger <zeisberg@informatik.uni-freiburg.de>

debian/rules

@@ -61,8 +61,8 @@ clean: unpatch
 	rm -f build-stamp
 
 	# Cleaning package
-	-$(MAKE) clean
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) clean
+	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -rf python/build
 
 	dh_clean
@@ -96,6 +96,10 @@ install: build
 	find debian/python-*-dbg ! -type d ! -name '*.so' | xargs rm -f
 	find debian/python-*-dbg -depth -empty -exec rmdir {} \;
 
+	# Installing additional headers
+	mkdir -p debian/libmagic-dev/usr/include/file
+	cp src/file.h src/patchlevel.h debian/libmagic-dev/usr/include/file
+
 	# 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