Import Debian version 5.04-5

debian/control

@@ -2,10 +2,11 @@ Source: file
 Section: utils
 Priority: standard
 Maintainer: Daniel Baumann <daniel@lists.debian-maintainers.org>
-Uploaders: Daniel Baumann <daniel@debian.org>
+Uploaders:
+ Daniel Baumann <daniel@debian.org>, Judit Foglszinger <fgrfgr@freenet.de>
 Build-Depends:
  debhelper (>= 7.4.3~), autotools-dev, python, python-all-dev, python-all-dbg,
- quilt (>= 0.46-7), zlib1g-dev
+ python-support, quilt (>= 0.46-7), zlib1g-dev
 Standards-Version: 3.9.0
 Homepage: http://www.darwinsys.com/file/
 Vcs-Browser: http://git.debian-maintainers.org/?p=daniel/file.git

debian/patches/132-magic-update-bio-rad.patch

@@ -0,0 +1,28 @@
+Author: Adam Buchbinder <adam.buchbinder@gmail.com>
+Description: Fix false positives in Bio-Rad PIC detection (Closes: #589056).
+
+diff -Naurp file.orig/magic/Magdir/images file/magic/Magdir/images
+--- file.orig/magic/Magdir/images	2010-07-14 10:21:47.000000000 -0400
++++ file/magic/Magdir/images	2010-07-14 10:29:50.000000000 -0400
+@@ -551,11 +551,16 @@
+ # Bio-Rad .PIC is an image format used by microscope control systems
+ # and related image processing software used by biologists.
+ # From: Vebjorn Ljosa <vebjorn@ljosa.com>
+-54	leshort 12345		Bio-Rad .PIC Image File
+->0	leshort >0		%hd x
+->2	leshort >0		%hd,
+->4	leshort =1		1 image in file
+->4	leshort >1		%hd images in file
++# BOOL values are two-byte integers; use them to rule out false positives.
++# http://web.archive.org/web/20050317223257/www.cs.ubc.ca/spider/ladic/text/biorad.txt
++# Samples: http://www.loci.wisc.edu/software/sample-data
++14	leshort <2
++>62	leshort <2
++>>54	leshort 12345		Bio-Rad .PIC Image File
++>>>0	leshort >0		%hd x
++>>>2	leshort >0		%hd,
++>>>4	leshort =1		1 image in file
++>>>4	leshort >1		%hd images in file
+ 
+ # From Jan "Yenya" Kasprzak <kas@fi.muni.cz>
+ # The description of *.mrw format can be found at

debian/patches/244-magic-add-jfs.patch

@@ -0,0 +1,26 @@
+Author: Adam Buchbinder <adam.buchbinder@gmail.com>
+Description: Adding new magic for JFS filesystem images (Closes: #589067).
+
+diff -Naurp file.orig//magic/Magdir/filesystems file/magic/Magdir/filesystems
+--- file.orig//magic/Magdir/filesystems	2010-07-14 19:53:22.762672355 +0200
++++ file/magic/Magdir/filesystems	2010-07-14 19:54:33.318672139 +0200
+@@ -1523,3 +1523,19 @@
+ # From:	Daniel Novotny <dnovotny@redhat.com>
+ 0	string	DISO	Delta ISO data,
+ >4	belong	x	version %d
++
++# JFS2 (Journaling File System) image. (Old JFS1 has superblock at 0x1000.)
++# See linux/fs/jfs/jfs_superblock.h for layout; see jfs_filsys.h for flags.
++# From: Adam Buchbinder <adam.buchbinder@gmail.com>
++0x8000	string	JFS1
++# Because it's text-only magic, check a binary value (version) to be sure.
++# Should always be 2, but mkfs.jfs writes it as 1. Needs to be 2 or 1 to be
++# mountable.
++>&0	lelong	<3	JFS2 filesystem image
++# Label is followed by a UUID; we have to limit string length to avoid
++# appending the UUID in the case of a 16-byte label.
++>>&144	regex	[\x20-\x7E]{1,16}	(label "%s")
++>>&0	lequad	x	\b, %lld blocks
++>>&8	lelong	x	\b, blocksize %d
++>>&32	lelong&0x00000006	>0	(dirty)
++>>&36	lelong	>0	(compressed)

debian/patches/245-magic-add-erlang.patch

@@ -0,0 +1,12 @@
+Author: Nahuel Greco <ngreco@gmail.com>
+Description: Adding new magics for Erlang DETS files (Closes: #589723).
+
+diff -Naurp file.orig/magic/Magdir/erlang file/magic/Magdir/erlang
+--- file.orig/magic/Magdir/erlang	2010-07-11 00:17:48.680930074 +0200
++++ file/magic/Magdir/erlang	2010-07-22 00:00:57.484882096 +0200
+@@ -17,3 +17,5 @@
+ 79	string	Tue\ Jan\ 22\ 14:32:44\ MET\ 1991	Erlang JAM file - version 4.2
+ 
+ 4	string	1.0\ Fri\ Feb\ 3\ 09:55:56\ MET\ 1995	Erlang JAM file - version 4.3
++
++0	bequad	0x0000000000ABCDEF	Erlang DETS file

debian/patches/series

@@ -26,6 +26,7 @@
 129-magic-update-qemu.patch
 130-magic-update-psf2.patch
 131-magic-update-dyatic.patch
+132-magic-update-bio-rad.patch
 200-magic-add-par2.patch
 201-magic-add-pe5.patch
 202-magic-add-pmenu.patch
@@ -69,6 +70,8 @@
 241-magic-add-canon.patch
 242-magic-add-gdsii.patch
 243-magic-add-git-index.patch
+244-magic-add-jfs.patch
+245-magic-add-erlang.patch
 901-file-localmagic.patch
 902-file-make.patch
 904-doc-manpages.patch

debian/rules

@@ -105,7 +105,7 @@ binary-arch: install
 	dh_install --sourcedir=debian/tmp
 	dh_lintian
 	dh_link
-	dh_python
+	dh_pysupport
 ifeq (,$(findstring -i, $(DH_OPTIONS)))
 	dh_strip -Npython-magic -Npython-magic-dbg
 	DH_OPTIONS= dh_strip -ppython-magic --dbg-package=python-magic-dbg