Remove patches cherry-picked in previous version

debian/patches/cherry-pick.70c65d2.fix-off-by-one.patch

@@ -1,17 +0,0 @@
-Upstream-Author: Christos Zoulas <christos@zoulas.com>
-Date: Tue Mar 4 17:42:19 2014 +0000
-Upstream-Commit: 70c65d2e1841491f59168db1f905e8b14083fb1c
-Description:
-    off by one in out of bounds calculations (Jan Kaluza)
-
---- a/src/softmagic.c
-+++ b/src/softmagic.c
-@@ -71,7 +71,7 @@
- private void cvt_32(union VALUETYPE *, const struct magic *);
- private void cvt_64(union VALUETYPE *, const struct magic *);
- 
--#define OFFSET_OOB(n, o, i)	((n) < (o) || (i) >= ((n) - (o)))
-+#define OFFSET_OOB(n, o, i)	((n) < (o) || (i) > ((n) - (o)))
- /*
-  * softmagic - lookup one file in parsed, in-memory copy of database
-  * Passed the name and FILE * of one file to be typed.

debian/patches/cherry-pick.c0c0032.fix-memory-leak.patch

@@ -1,28 +0,0 @@
-Upstream-Author: Christos Zoulas <christos@zoulas.com>
-Date: Fri Feb 21 14:32:48 2014 +0000
-Upstream-Commit: c0c0032b9e9eb57b91fefef905a3b018bab492d9
-Description:
- Fix memory leak (Anatol Belski)
-
---- a/src/softmagic.c
-+++ b/src/softmagic.c
-@@ -1755,12 +1755,16 @@
- 		ms->offset = soffset;
- 		if (rv == 1) {
- 			if ((ms->flags & (MAGIC_MIME|MAGIC_APPLE)) == 0 &&
--			    file_printf(ms, F(m->desc, "%u"), offset) == -1)
-+			    file_printf(ms, F(m->desc, "%u"), offset) == -1) {
-+				free(rbuf);
- 				return -1;
--			if (file_printf(ms, "%s", rbuf) == -1)
-+			}
-+			if (file_printf(ms, "%s", rbuf) == -1) {
-+				free(rbuf);
- 				return -1;
--			free(rbuf);
-+			}
- 		}
-+		free(rbuf);
- 		return rv;
- 
- 	case FILE_USE:

debian/patches/cherry-pick.eced9db.python-over-detection.patch

@@ -1,28 +0,0 @@
-Upstream-Author: Christos Zoulas <christos@zoulas.com>
-Date: Sat Feb 15 01:30:52 2014 +0000
-Upstream-Commit: eced9dbd4aa438de22ff453c723136beac41a558
-Description:
- comment out python comment magic cause other things like mediawiki use it.
-
---- a/magic/Magdir/python
-+++ b/magic/Magdir/python
-@@ -44,13 +44,13 @@
- !:mime text/x-python
- 
- # comments
--0	search/4096	'''
-->&0	regex	.*'''$	Python script text executable
--!:mime text/x-python
-+#0	search/4096	'''
-+#>&0	regex	.*'''$	Python script text executable
-+#!:mime text/x-python
- 
--0	search/4096	"""
-->&0	regex	.*"""$	Python script text executable
--!:mime text/x-python
-+#0	search/4096	"""
-+#>&0	regex	.*"""$	Python script text executable
-+#!:mime text/x-python
- 
- # try:
- # except: or finally:

debian/patches/cherry-pick.f9d8564.fix-python-8bit-filenames.patch

@@ -1,17 +0,0 @@
-Upstream-Author: Christos Zoulas <christos@zoulas.com>
-Date: Sun Mar 2 14:52:23 2014 +0000
-Upstream-Commit: f9d8564c11f13cb6606c5cba26ec3276cfbcba08
-Description:
- encode filename (Debian#435397)
-
---- a/python/magic.py
-+++ b/python/magic.py
-@@ -119,7 +119,7 @@
-             bi = bytes(filename, 'utf-8')
-             return str(_file(self._magic_t, bi), 'utf-8')
-         except:
--            return _file(self._magic_t, filename)
-+            return _file(self._magic_t, filename.encode('utf-8'))
- 
-     def descriptor(self, fd):
-         """

debian/patches/series

@@ -9,8 +9,4 @@
 0010-mdadm.patch
 0011-btrfs.patch
 0012-lxt.patch
-cherry-pick.eced9db.python-over-detection.patch
-cherry-pick.c0c0032.fix-memory-leak.patch
-cherry-pick.f9d8564.fix-python-8bit-filenames.patch
 extra.fix-8bit-in-cdf.patch
-cherry-pick.70c65d2.fix-off-by-one.patch