Patch queue: Remove patches that went upstream

debian/patches/0007-c64-tap.patch

@@ -1,18 +0,0 @@
-Subject: Adding new magics for Commodore raw tape files
-Author: Esa Hyytiä <esa@netlab.tkk.fi>
-Bug-Debian: https://bugs.debian.org/699777
-Forwarded: http://mx.gw.com/pipermail/file/2015/001755.html
-Last-Update: 2015-08-23
-
---- a/magic/Magdir/c64
-+++ b/magic/Magdir/c64
-@@ -41,3 +41,9 @@
- >32	leshort		x		Version:0x%x
- >36	leshort		!0		Entries:%i
- >40	string		x		Name:%.24s
-+
-+# Raw tape file format (.tap files)
-+# Esa Hyytiä <esa@netlab.tkk.fi>
-+0	string		C64-TAPE-RAW	C64 Raw Tape File (.tap),
-+>0x0c	byte		x		Version:%u,
-+>0x10   lelong		x		Length:%u cycles

debian/patches/0008-aol-art.patch

@@ -1,15 +0,0 @@
-Subject: Adding updated magics for AOL ART images
-Author: Bastien Roucaries <roucaries.bastien@gmail.com>
-Bug-Debian: https://bugs.debian.org/681304
-Forwarded: http://mx.gw.com/pipermail/file/2015/001755.html
-Last-Update: 2015-08-23
-
---- a/magic/Magdir/netscape
-+++ b/magic/Magdir/netscape
-@@ -22,4 +22,5 @@
- 
- #
- #This is files ending in .art, FIXME add more rules
--0       string          JG\004\016\0\0\0\0      ART
-+0	string	JG\004\016\0\0\0\0	AOL ART image
-+0	string	JG\003\016\0\0\0\0	AOL ART image

debian/patches/0009-ms-html-help.patch

@@ -1,17 +0,0 @@
-Subject: Updating MS Windows HtmlHelp Data magics
-Author: Paul Wise <pabs@debian.org>
-Bug-Debian: https://bugs.debian.org/653911
-Forwarded: http://mx.gw.com/pipermail/file/2015/001755.html
-Last-Update: 2015-08-23
-
---- a/magic/Magdir/msdos
-+++ b/magic/Magdir/msdos
-@@ -772,7 +772,7 @@
- 0	ulequad	0x3a000000024e4c	MS Advisor help file
- 
- # HtmlHelp files (.chm)
--0	string/b	ITSF\003\000\000\000\x60\000\000\000\001\000\000\000	MS Windows HtmlHelp Data
-+0	string/b	ITSF\003\000\000\000\x60\000\000\000	MS Windows HtmlHelp Data
- 
- # GFA-BASIC (Wolfram Kleff)
- 2	string/b	GFA-BASIC3	GFA-BASIC 3 data

debian/patches/0010-mdadm.patch

@@ -1,37 +0,0 @@
-Subject: Adding new magics for Linux Software RAID
-Author: Russell Coker <russell@coker.com.au>
-Bug-Debian: https://bugs.debian.org/663454
-Forwarded: http://mx.gw.com/pipermail/file/2015/001755.html
-Last-Update: 2015-08-23
-
---- a/magic/Magdir/linux
-+++ b/magic/Magdir/linux
-@@ -417,6 +417,28 @@
- 0		lelong		0xde020109	locale archive
- >24		lelong		x		%d strings
- 
-+# Linux Software RAID (mdadm)
-+# Russell Coker <russell@coker.com.au>
-+4096	lelong	0xa92b4efc	Linux Software RAID
-+>4100	lelong	x		version 1.2 (%d)
-+>4112	belong	x		UUID=%8x:
-+>4116	belong	x		\b%8x:
-+>4120	belong	x		\b%8x:
-+>4124	belong	x		\b%8x
-+>4128	string	x		name=%s
-+>4168	lelong	x		level=%d
-+>4188	lelong	x		disks=%d
-+
-+0	lelong	0xa92b4efc	Linux Software RAID
-+>4	lelong	x		version 1.1 (%d)
-+>16	belong	x		UUID=%8x:
-+>20	belong	x		\b%8x:
-+>24	belong	x		\b%8x:
-+>28	belong	x		\b%8x
-+>32	string	x		name=%s
-+>72	lelong	x		level=%d
-+>92	lelong	x		disks=%d
-+
- # Summary:     Database file for mlocate
- # Description: A database file as used by mlocate, a fast implementation
- #              of locate/updatedb. It uses merging to reuse the existing

debian/patches/0011-btrfs.patch

@@ -1,36 +0,0 @@
-Subject: Adding updated magics for BTRFS
-Author: Russell Coker <russell@coker.com.au>
-Bug-Debian: https://bugs.debian.org/663454
-Forwarded: http://mx.gw.com/pipermail/file/2015/001755.html
-Last-Update: 2015-08-23
-
---- a/magic/Magdir/filesystems
-+++ b/magic/Magdir/filesystems
-@@ -2210,12 +2210,21 @@
- >>0x10060        string          >\0             lockproto %s)
- 
- # BTRFS
--0x10040         string          _BHRfS_M        BTRFS Filesystem
-->0x1012b        string          >\0             (label "%s",
-->0x10090        lelong          x               sectorsize %d,
-->0x10094        lelong          x               nodesize %d,
-->0x10098        lelong          x               leafsize %d)
--
-+# Russell Coker <russell@coker.com.au>
-+0x10040	string	_BHRfS_M	BTRFS Filesystem
-+>0x1012b	string	>\0		label "%s",
-+>0x10090	lelong	x		sectorsize %d,
-+>0x10094	lelong	x		nodesize %d,
-+>0x10098	lelong	x		leafsize %d,
-+>0x10020	belong	x		UUID=%8x-
-+>0x10024	beshort	x		\b%4x-
-+>0x10026	beshort	x		\b%4x-
-+>0x10028	beshort	x		\b%4x-
-+>0x1002a	beshort	x		\b%4x
-+>0x1002c	belong	x		\b%8x,
-+>0x10078	lequad	x		%lld/
-+>0x10070	lequad	x		\b%lld bytes used,
-+>0x10088	lequad	x		%lld devices
- 
- # dvdisaster's .ecc
- # From: "Nelson A. de Oliveira" <naoliv@gmail.com>

debian/patches/0012-lxt.patch

@@ -1,15 +0,0 @@
-Subject: Adding new magics for LXT
-Author: chrysn <chrysn@fsfe.org>
-Bug-Debian: https://bugs.debian.org/647412
-
---- a/magic/Magdir/scientific
-+++ b/magic/Magdir/scientific
-@@ -104,3 +104,8 @@
- >>5	byte	x		version %d.0
- >4	byte	>0x00		version %d
- >>5	byte	x		\b.%d
-+
-+# Type: LXT (interLaced eXtensible Trace)
-+# chrysn <chrysn@fsfe.org>
-+0	beshort	0x0138	interLaced eXtensible Trace (LXT) file
-+>2	beshort	>0	(Version %u)

debian/patches/cherry-pick.FILE5_24-22-g27b4e34.parameter-1.patch

@@ -1,16 +0,0 @@
-Subject: --parameter takes a parameter
-Origin: FILE5_24-22-g27b4e34
-Upstream-Author: Christos Zoulas <christos@zoulas.com>
-Date: Tue Sep 8 13:46:01 2015 +0000
-
---- a/src/file_opts.h
-+++ b/src/file_opts.h
-@@ -45,7 +45,7 @@
- #if defined(HAVE_UTIME) || defined(HAVE_UTIMES)
- OPT('p', "preserve-date", 0, "        preserve access times on files\n")
- #endif
--OPT('P', "parameter", 0, "            set file engine parameter limits\n"
-+OPT('P', "parameter", 1, "            set file engine parameter limits\n"
-     "                               indir        15 recursion limit for indirection\n"
-     "                               name         30 use limit for name/use magic\n"
-     "                               elf_notes   256 max ELF notes processed\n"

debian/patches/cherry-pick.FILE5_24-23-g4ddb783.parameter-2.patch

@@ -1,15 +0,0 @@
-Subject: apply parameters before unwrapping() the list of files
-Origin: FILE5_24-23-g4ddb783
-Upstream-Author: Christos Zoulas <christos@zoulas.com>
-Date: Tue Sep 8 13:46:49 2015 +0000
-
---- a/src/file.c
-+++ b/src/file.c
-@@ -237,6 +237,7 @@
- 			if (magic == NULL)
- 				if ((magic = load(magicfile, flags)) == NULL)
- 					return 1;
-+			applyparam(magic);
- 			e |= unwrap(magic, optarg);
- 			++didsomefiles;
- 			break;

debian/patches/cherry-pick.FILE5_24-26-ge92eb5c.python-mime.patch

@@ -1,25 +0,0 @@
-Subject: bump the strength so that we beat the generic script magic
-Origin: FILE5_24-26-ge92eb5c
-Upstream-Author: Christos Zoulas <christos@zoulas.com>
-Date: Tue Sep 8 13:59:44 2015 +0000
-
---- a/magic/Magdir/python
-+++ b/magic/Magdir/python
-@@ -26,12 +26,16 @@
- 0	belong		0xee0c0d0a	python 3.4 byte-compiled
- 
- 0	search/1/w	#!\ /usr/bin/python	Python script text executable
-+!:strength + 10
- !:mime text/x-python
- 0	search/1/w	#!\ /usr/local/bin/python	Python script text executable
-+!:strength + 10
- !:mime text/x-python
- 0	search/1	#!/usr/bin/env\ python	Python script text executable
-+!:strength + 10
- !:mime text/x-python
--0	search/1	#!\ /usr/bin/env\ python	Python script text executable
-+0	search/10	#!\ /usr/bin/env\ python	Python script text executable
-+!:strength + 10
- !:mime text/x-python
- 
- 

debian/patches/series

@@ -3,13 +3,4 @@
 0003-file-usage.patch
 0004-doc-manpages.patch
 0006-gzip.patch
-0007-c64-tap.patch
-0008-aol-art.patch
-0009-ms-html-help.patch
-0010-mdadm.patch
-0011-btrfs.patch
-0012-lxt.patch
-cherry-pick.FILE5_24-22-g27b4e34.parameter-1.patch
-cherry-pick.FILE5_24-23-g4ddb783.parameter-2.patch
-cherry-pick.FILE5_24-26-ge92eb5c.python-mime.patch
 amend.FILE5_24-26-ge92eb5c.python-mime.patch