Remove patches cherry-picked in previous version

debian/patches/cherry-pick.FILE5_18-11-ge14d88d.fix-python-regression.patch

@@ -1,21 +0,0 @@
-Upstream-Author: Christos Zoulas <christos@zoulas.com>
-Date: Thu Apr 3 20:47:24 2014 +0000
-Upstream-Commit: e14d88d8df2aafb74ba0c0b3d0116fc84b68cbd8
-Description:
-    Fix regression: If a file was already bytes, don't try to convert it.
-    From: Arfrever Frehtes Taifersar Arahesis
-
---- a/python/magic.py
-+++ b/python/magic.py
-@@ -116,7 +116,10 @@
-         is set.  A call to errno() will return the numeric error code.
-         """
-         try: # attempt python3 approach first
--            bi = bytes(filename, 'utf-8')
-+            if isinstance(filename, bytes):
-+                bi = filename
-+            else:
-+                bi = bytes(filename, 'utf-8')
-             return str(_file(self._magic_t, bi), 'utf-8')
-         except:
-             return _file(self._magic_t, filename.encode('utf-8'))

debian/patches/cherry-pick.FILE5_18-2-g1ecdd15.fix-targa-detection.patch

@@ -1,26 +0,0 @@
-Upstream-Author: Christos Zoulas <christos@zoulas.com>
-Date: Fri Mar 28 19:06:09 2014 +0000
-Upstream-Commit: 1ecdd15c966ae6bee3ba558a53edf1dd4155d204
-Description:
-    reduce strength of windows cursors so that they don't win over Targa files
-    (Christoph Biedl)
-
---- a/magic/Magdir/msdos
-+++ b/magic/Magdir/msdos
-@@ -590,7 +590,7 @@
- >4  ubyte   !0  \b, %d colors
- 
- 0   belong  0x00000100
--
-+!:strength - 2
- >9  byte    0
- >>0 byte    x           MS Windows icon resource
- !:mime	image/x-icon
-@@ -614,6 +614,7 @@
- 
- 0   belong  0x00000200
- >9  byte    0
-+!:strength - 2
- >>0 byte    x           MS Windows cursor resource
- !:mime image/x-cur
- >>4 use     cur-dir

debian/patches/cherry-pick.FILE5_18-4-g966ca13.improve-palm-library-detection.patch

@@ -1,22 +0,0 @@
-Upstream-Author: Christos Zoulas <christos@zoulas.com>
-Date: Fri Mar 28 19:11:40 2014 +0000
-Upstream-Commit: 966ca13cd9ad80c163643bdf9e7497976f36aafd
-Description:
-    Improve library detection, (Christoph Biedl)
-
---- a/magic/Magdir/palm
-+++ b/magic/Magdir/palm
-@@ -141,7 +141,12 @@
- >>(0x4E.L+1)	byte		x		%02d)
- 
- # Palm OS .prc file types
--60		string		libr		Palm OS dynamic library data
-+60		string		libr
-+# flags, only bit 0 or bit 6
-+# http://en.wikipedia.org/wiki/PRC_%28Palm_OS%29
-+# http://web.mit.edu/tytso/www/pilot/prc-format.html
-+>0x20		beshort&0xffbe	0
-+>>0		string		>\0		Palm OS dynamic library data "%s"
- >0		string		>\0		"%s"
- 60		string		ptch		Palm OS operating system patch data
- >0		string		>\0		"%s"

debian/patches/cherry-pick.FILE5_18-6-g0b62876.remove-extra-line.patch

@@ -1,24 +0,0 @@
-Upstream-Author: Christos Zoulas <christos@zoulas.com>
-Date: Sun Mar 30 21:40:08 2014 +0000
-Commit: 0b628762b05e1ba024166067aad704b8e66753cb
-Description:
-    remove extra line (Christoph Biedl)
-
---- a/magic/Magdir/palm
-+++ b/magic/Magdir/palm
-@@ -1,6 +1,6 @@
- 
- #------------------------------------------------------------------------------
--# $File: palm,v 1.11 2013/12/31 19:18:02 christos Exp $
-+# $File: palm,v 1.12 2014/03/28 19:11:40 christos Exp $
- # palm:	 file(1) magic for PalmOS {.prc,.pdb}: applications, docfiles, and hacks
- #
- # Brian Lalor <blalor@hcirisc.cs.binghamton.edu>
-@@ -147,7 +147,6 @@
- # http://web.mit.edu/tytso/www/pilot/prc-format.html
- >0x20		beshort&0xffbe	0
- >>0		string		>\0		Palm OS dynamic library data "%s"
-->0		string		>\0		"%s"
- 60		string		ptch		Palm OS operating system patch data
- >0		string		>\0		"%s"
- 

debian/patches/cherry-pick.FILE5_18-7-g2c947ac.raise-the-strength-of-the-targa.patch

@@ -1,45 +0,0 @@
-Upstream-Author: Christos Zoulas <christos@zoulas.com>
-Date: Sun Mar 30 21:41:45 2014 +0000
-Commit: 2c947accbc7066cf1c78a9268a1d5b27ab798945
-Description:
-    raise the strength of the targa magic, instead of dropping the cursor magic
-    so that they does not get recognized as lotus 123 files. From Christoph Biedl
-
---- a/magic/Magdir/images
-+++ b/magic/Magdir/images
-@@ -18,14 +18,17 @@
- # `xv' recognizes only a subset of the following (RGB with pixelsize = 24)
- # `tgatoppm' recognizes a superset (Index may be anything)
- 1	belong&0xfff7ffff	0x01010000	Targa image data - Map
-+!:strength + 2
- >2	byte&8			8		- RLE
- >12	leshort			>0		%hd x
- >14	leshort			>0		%hd
- 1	belong&0xfff7ffff	0x00020000	Targa image data - RGB
-+!:strength + 2
- >2	byte&8			8		- RLE
- >12	leshort			>0		%hd x
- >14	leshort			>0		%hd
- 1	belong&0xfff7ffff	0x00030000	Targa image data - Mono
-+!:strength + 2
- >2	byte&8			8		- RLE
- >12	leshort			>0		%hd x
- >14	leshort			>0		%hd
---- a/magic/Magdir/msdos
-+++ b/magic/Magdir/msdos
-@@ -590,7 +590,6 @@
- >4  ubyte   !0  \b, %d colors
- 
- 0   belong  0x00000100
--!:strength - 2
- >9  byte    0
- >>0 byte    x           MS Windows icon resource
- !:mime	image/x-icon
-@@ -614,7 +613,6 @@
- 
- 0   belong  0x00000200
- >9  byte    0
--!:strength - 2
- >>0 byte    x           MS Windows cursor resource
- !:mime image/x-cur
- >>4 use     cur-dir

debian/patches/series

@@ -11,8 +11,3 @@
 0012-lxt.patch
 extra.fix-8bit-in-cdf.patch
 revert.beb312b.add-fmtcheck.patch
-cherry-pick.FILE5_18-2-g1ecdd15.fix-targa-detection.patch
-cherry-pick.FILE5_18-7-g2c947ac.raise-the-strength-of-the-targa.patch
-cherry-pick.FILE5_18-4-g966ca13.improve-palm-library-detection.patch
-cherry-pick.FILE5_18-6-g0b62876.remove-extra-line.patch
-cherry-pick.FILE5_18-11-ge14d88d.fix-python-regression.patch