Refresh patch queue, and remove patches cherry-picked previously

debian/patches/cherry-pick.FILE5_28-10-g73e043d.avoid-double-encoding-with-python3.patch

@@ -1,36 +0,0 @@
-Subject: PR/562: Reiner Herrmann: Avoid double encoding with python3
-Origin: FILE5_28-10-g73e043d
-Upstream-Author: Christos Zoulas <christos@zoulas.com>
-Date: Tue Jun 28 17:10:22 2016 +0000
-Bug: http://bugs.gw.com/view.php?id=562
-Bug-Debian: https://bugs.debian.org/828833
-
---- a/python/magic.py
-+++ b/python/magic.py
-@@ -134,7 +134,7 @@
-         if isinstance(r, str):
-             return r
-         else:
--            return str(r).encode('utf-8')
-+            return str(r, 'utf-8')
- 
-     def descriptor(self, fd):
-         """
-@@ -152,7 +152,7 @@
-         if isinstance(r, str):
-             return r
-         else:
--            return str(r).encode('utf-8')
-+            return str(r, 'utf-8')
- 
-     def error(self):
-         """
-@@ -163,7 +163,7 @@
-         if isinstance(e, str):
-             return e
-         else:
--            return str(e).encode('utf-8')
-+            return str(e, 'utf-8')
- 
-     def setflags(self, flags):
-         """

debian/patches/cherry-pick.FILE5_28-6-g0971151.reduce-the-number-of-x-s-to-appease-linitian.patch

@@ -1,16 +0,0 @@
-Subject: Reduce the number of X's to appease linitian (Christoph Biedl)
-Origin: FILE5_28-6-g0971151
-Upstream-Author: Christos Zoulas <christos@zoulas.com>
-Date: Mon Jun 27 19:07:20 2016 +0000
-
---- a/doc/file.man
-+++ b/doc/file.man
-@@ -312,7 +312,7 @@
- never read them.
- .It Fl P , Fl Fl parameter Ar name=value
- Set various parameter limits.
--.Bl -column "elf_phnum" "Default" "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" -offset indent
-+.Bl -column "elf_phnum" "Default" "XXXXXXXXXXXXXXXXXXXXXXXXXXX" -offset indent
- .It Sy "Name" Ta Sy "Default" Ta Sy "Explanation"
- .It Li indir Ta 15 Ta recursion limit for indirect magic
- .It Li name Ta 30 Ta use count limit for name/use magic

debian/patches/cherry-pick.FILE5_28-9-g1222ebc.dont-copy-null-igor-gnatenko.patch

@@ -1,16 +0,0 @@
-Subject: Don't copy NULL (Igor Gnatenko)
-Origin: FILE5_28-9-g1222ebc
-Upstream-Author: Christos Zoulas <christos@zoulas.com>
-Date: Tue Jun 28 16:38:26 2016 +0000
-
---- a/src/compress.c
-+++ b/src/compress.c
-@@ -517,7 +517,7 @@
- 
- 	return OKDATA;
- err:
--	strlcpy((char *)*newch, z.msg, bytes_max);
-+	strlcpy((char *)*newch, z.msg ? z.msg : zError(rc), bytes_max);
- 	*n = strlen((char *)*newch);
- 	return ERRDATA;
- }

debian/patches/local.support-local-definitions-in-etc-magic.patch

@@ -25,9 +25,9 @@ Last-Update: 2016-06-27
 +
 --- a/src/apprentice.c
 +++ b/src/apprentice.c
-@@ -452,7 +452,7 @@
- #ifndef COMPILE_ONLY
- 	map = apprentice_map(ms, fn);
+@@ -454,7 +454,7 @@
+ 	if (map == (struct magic_map *)-1)
+ 		return -1;
  	if (map == NULL) {
 -		if (ms->flags & MAGIC_CHECK)
 +		if (ms->flags & MAGIC_CHECK && strcmp("/etc/magic", fn) != 0)
@@ -55,7 +55,7 @@ Last-Update: 2016-06-27
  magic file
  .Pa __MAGIC__.mgc ,
  or the files in the directory
-@@ -469,12 +470,6 @@
+@@ -472,12 +473,6 @@
  The order of entries in the magic file is significant.
  Depending on what system you are using, the order that
  they are put together may be incorrect.

debian/patches/series

@@ -1,7 +1,4 @@
 # cherry-picked commits. Keep in chronlogical order
-cherry-pick.FILE5_28-6-g0971151.reduce-the-number-of-x-s-to-appease-linitian.patch
-cherry-pick.FILE5_28-9-g1222ebc.dont-copy-null-igor-gnatenko.patch
-cherry-pick.FILE5_28-10-g73e043d.avoid-double-encoding-with-python3.patch
 
 # local modifications
 local.support-local-definitions-in-etc-magic.patch