Import Debian version 4.21-4

debian/control

@@ -3,7 +3,8 @@ Section: utils
 Priority: standard
 Maintainer: Daniel Baumann <daniel@debian.org>
 Build-Depends: debhelper (>= 5.0.37.2), dpatch, autotools-dev, libtool, python, python-all-dev, python-all-dbg, zlib1g-dev
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
+Homepage: http://www.darwinsys.com/file/
 XS-Python-Version: all
 
 Package: file
@@ -19,8 +20,6 @@ Description: Determines file type using "magic" numbers
  .
  Starting with version 4, the file command is not much more than a wrapper
  around the "magic" library.
- .
-  Homepage: <http://www.darwinsys.com/file/>
 
 Package: libmagic1
 Section: libs
@@ -31,8 +30,6 @@ Suggests: file
 Description: File type determination library using "magic" numbers
  This library can be used to classify files according to magic number tests. It
  implements the core functionality of the file command.
- .
-  Homepage: <http://www.darwinsys.com/file/>
 
 Package: libmagic-dev
 Section: libdevel
@@ -44,8 +41,6 @@ Description: File type determination library using "magic" numbers (development)
  This library can be used to classify files according to magic number tests. It
  implements the core functionality of the file command.
  .
-  Homepage: <http://www.darwinsys.com/file/>
- .
  This package contains the development files.
 
 Package: python-magic
@@ -60,8 +55,6 @@ Description: File type determination library using "magic" numbers (python bindi
  This library can be used to classify files according to magic number tests. It
  implements the core functionality of the file command.
  .
-  Homepage: <http://www.darwinsys.com/file/>
- .
  This package contains the python bindings to query /etc/magic information for a
  given file in Python.
 
@@ -69,12 +62,10 @@ Package: python-magic-dbg
 Section: python
 Architecture: any
 Priority: extra
-Depends: python-magic (= ${Source-Version}), python-dbg, ${shlibs:Depends}
+Depends: python-magic (= ${binary:Version}), python-dbg, ${shlibs:Depends}
 Description: File type determination library using "magic" numbers (python bindings/debug)
  This library can be used to classify files according to magic number tests. It
  implements the core functionality of the file command.
  .
-  Homepage: <http://www.darwinsys.com/file/>
- .
  This package contains the python bindings to query /etc/magic information for a
  given file in Python, built for the python debug interpreter.

debian/copyright

@@ -1,9 +1,13 @@
 This package was debianized by Daniel Baumann <daniel@debian.org> on
 Tue, 27 Mar 2007 13:28:00 +0100.
 
-It was downloaded from <ftp://ftp.astron.com/pub/file/>.
+It was downloaded from:
 
-Upstream Author: Christos Zoulas <christos@zoulas.com>
+	<ftp://ftp.astron.com/pub/file/>
+
+Upstream Author:
+
+	Christos Zoulas <christos@zoulas.com>
 
 License:
 
@@ -75,4 +79,4 @@ License (magic/Magdir/os9):
 	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'.
+is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.

debian/patches/00list

@@ -38,22 +38,25 @@
 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-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
+316-magic-add-mercurial.dpatch
+317-magic-add-mozilla.dpatch
+318-magic-add-nlm.dpatch
+319-magic-add-ocfs.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
+332-magic-add-svg.dpatch
+333-magic-add-xen.dpatch
+334-magic-add-xcursor.dpatch
 901-file-elf.dpatch
 902-file-kfreebsd.dpatch
 903-file-localmagic.dpatch

debian/patches/316-magic-add-mercurial.dpatch

@@ -0,0 +1,20 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 315-magic-add-mercurial.dpatch by Seo Sanghyeon <tinuviel@sparcs.kaist.ac.kr>
+##
+## DP: New magic for Mercurial bundles (Closes: #451067).
+
+@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:09.000000000 +0000
++++ file-4.21/magic/Magdir/revision	2007-12-23 17:24:59.000000000 +0000
+@@ -11,3 +11,9 @@
+ # Type: Git bundles (git-bundle)
+ # From: Josh Triplett <josh@freedesktop.org>
+ 0	string	#\ v2\ git\ bundle\n	Git bundle
++
++# Type:	Mercurial bundles
++# From:	Seo Sanghyeon <tinuviel@sparcs.kaist.ac.kr>
++0	string	HG10		Mercurial bundle,
++>4	string	UN		uncompressed
++>4	string	BZ		bzip2 compressed

debian/patches/317-magic-add-mozilla.dpatch

@@ -0,0 +1,18 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 315-magic-add-mozilla.dpatch by Josh Triplett <josh@freedesktop.org>
+##
+## DP: New magic for Mozilla XUL fastload files,
+## DP: commonly found in a Mozilla profile as XUL.mfasl and XPC.mfasl
+## DP: (Closes: #452354).
+
+@DPATCH@
+
+diff -Naur file-4.21.orig/magic/Magdir/mozilla file-4.21/magic/Magdir/mozilla
+--- file-4.21.orig/magic/Magdir/mozilla	1970-01-01 00:00:00.000000000 +0000
++++ file-4.21/magic/Magdir/mozilla	2007-12-23 17:13:40.000000000 +0000
+@@ -0,0 +1,5 @@
++# Type:	Mozilla XUL fastload files (XUL.mfasl and XPC.mfasl)
++# URL:	http://www.mozilla.org/
++# From:	Josh Triplett <josh@freedesktop.org>
++
++0	string	XPCOM\nMozFASL\r\n\x1A		Mozilla XUL fastload data

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

@@ -1,25 +0,0 @@
-#!/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).
-
-@DPATCH@
-
-diff -Naur file-4.20.orig/magic/Magdir/audio file-4.20/magic/Magdir/audio
---- file-4.20.orig/magic/Magdir/audio	2007-01-19 19:26:35.000000000 +0000
-+++ file-4.20/magic/Magdir/audio	2007-04-03 13:26:08.000000000 +0000
-@@ -268,6 +268,14 @@
- >122	byte&0x1	=1		PAL
- >122	byte&0x1	=0		NTSC
- 
-+# Type: SNES SPC700 sound files
-+# From: Josh Triplett <josh@freedesktop.org>
-+>&0	string	0.30	\b, version %s
-+>>0x23	byte	0x1B	\b, without ID666 tag
-+>>0x23	byte	0x1A	\b, with ID666 tag
-+>>>0x2E	string	>\0	\b, song "%.32s"
-+>>>0x4E	string	>\0	\b, game "%.32s"
-+
- # Impulse tracker module (audio/x-it)
- 0	string		IMPM		Impulse Tracker module sound data -
- >4	string		>\0		"%s"

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

@@ -0,0 +1,26 @@
+#!/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).
+
+@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 @@
+ >122	byte&0x1	=1		PAL
+ >122	byte&0x1	=0		NTSC
+ 
++# Type: SNES SPC700 sound files
++# From: Josh Triplett <josh@freedesktop.org>
++0	string	SNES-SPC700\ Sound\ File\ Data\ v	SNES SPC700 sound file
++>&0	string	0.30					\b, version %s
++>>0x23	byte	0x1B					\b, without ID666 tag
++>>0x23	byte	0x1A					\b, with ID666 tag
++>>>0x2E	string	>\0					\b, song "%.32s"
++>>>0x4E	string	>\0					\b, game "%.32s"
++
+ # Impulse tracker module (audio/x-it)
+ 0	string		IMPM		Impulse Tracker module sound data -
+ >4	string		>\0		"%s"

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

@@ -6,14 +6,14 @@
 @DPATCH@
 
 diff -Naur file-4.21.orig/magic/Magdir/revision file-4.21/magic/Magdir/revision
---- 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
+--- 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>
++# 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/334-magic-add-xcursor.dpatch

@@ -0,0 +1,19 @@
+#!/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/rules

@@ -107,9 +107,9 @@ install: build
 	install -D -m 0644 debian/bug/control debian/libmagic-dev/usr/share/bug/libmagic-dev/control
 
 	# Installing lintian overrides
-	for LINTIAN in debian/lintian/*; \
+	set -e; for LINTIAN in debian/lintian/*; \
 	do \
-		install -D -m 0644 $$LINTIAN debian/`basename $$LINTIAN`/usr/share/lintian/overrides/`basename $$LINTIAN` || exit 1; \
+		install -D -m 0644 $$LINTIAN debian/`basename $$LINTIAN`/usr/share/lintian/overrides/`basename $$LINTIAN`; \
 	done
 
 binary-indep: build install