Refresh patch queue

debian/patches/cherry-pick.0.4.11-32-g9d127ce.update-filetype-reported-by-libmagic-5-23-for-keep-going-true.patch

@@ -1,16 +0,0 @@
-Subject: Update filetype reported by libmagic >=5.23 for keep_going=true
-Origin: 0.4.11-32-g9d127ce
-Upstream-Author: Adam Hupp <adam@hupp.org>
-Date: Sun Oct 1 20:52:48 2017 -0700
-
---- a/test/test.py
-+++ b/test/test.py
-@@ -94,7 +94,7 @@
-         self.assertEqual(m.from_file(filename), 'image/jpeg')
-         
-         m = magic.Magic(mime=True, keep_going=True)
--        self.assertEqual(m.from_file(filename), 'image/jpeg')
-+        self.assertEqual(m.from_file(filename), 'image/jpeg\\012- application/octet-stream')
- 
- 
-     def test_rethrow(self):

debian/patches/cherry-pick.0.4.15-31-g063a667.fixing-warning-on-python-3-8.patch

@@ -1,17 +0,0 @@
-Subject: Fixing warning on python 3.8
-Origin: 0.4.15-31-g063a667 <https://github.com/ahupp/python-magic/commit/063a667>
-Upstream-Author: Gabriel Diego Teixeira <gabrieldiegoteixeira@gmail.com>
-Date: Wed Feb 27 19:33:40 2019 -0800
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-magic/+bug/1857148
-
---- a/magic/__init__.py
-+++ b/magic/__init__.py
-@@ -201,7 +201,7 @@
-         return result
- 
- def errorcheck_negative_one(result, func, args):
--    if result is -1:
-+    if result == -1:
-         err = magic_error(args[0])
-         raise MagicException(err)
-     else:

debian/patches/disable-gzip-test.patch

@@ -1,18 +0,0 @@
-Subject: Disable gzip test, it cannot cope with a recent change in libmagic
-Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de> 
-Date: 2018-07-21
-Bug-Debian: https://bugs.debian.org/897471
-Bug-Upstream: https://github.com/ahupp/python-magic/issues/173
-
---- a/test/test.py
-+++ b/test/test.py
-@@ -67,9 +67,6 @@
-             self.assert_values(m, {
-                 'magic._pyc_': 'python 2.4 byte-compiled',
-                 'test.pdf': 'PDF document, version 1.2',
--                'test.gz':
--                ('gzip compressed data, was "test", from Unix, last modified: Sun Jun 29 01:32:52 2008',
--                 'gzip compressed data, was "test", last modified: Sun Jun 29 01:32:52 2008, from Unix'),
-                 'text.txt': 'ASCII text',
-             })
-         finally:

debian/patches/series

@@ -1,10 +1,5 @@
 # cherry-picked from upstream. Keep in chronological order
-cherry-pick.0.4.11-32-g9d127ce.update-filetype-reported-by-libmagic-5-23-for-keep-going-true.patch
-libmagic-compat.patch
-cherry-pick.0.4.15-31-g063a667.fixing-warning-on-python-3-8.patch
 
 # patches that should go upstream
-upstream.fix-mime-test.patch
 
 # modifications for Debian
-disable-gzip-test.patch

debian/patches/upstream.fix-mime-test.patch

@@ -1,32 +0,0 @@
-Subject: Adjust test suite for changes in file 5.39
-Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de> 
-Date: 2020-11-26
-Bug-Debian: https://bugs.debian.org/975784
-Forwarded: no
-
-    MIME-type for python was added/changed in FILE5_38-36-geb373e43
-    Detection of trunucated files was added in FILE5_38-106-g0c7cd78b
-
---- a/test/test.py
-+++ b/test/test.py
-@@ -34,9 +34,9 @@
-     def test_from_buffer_str_and_bytes(self):
-         m = magic.Magic(mime=True)
-         s = '#!/usr/bin/env python\nprint("foo")'
--        self.assertEqual("text/x-python", m.from_buffer(s))
-+        self.assertEqual("text/x-script.python", m.from_buffer(s))
-         b = b'#!/usr/bin/env python\nprint("foo")'
--        self.assertEqual("text/x-python", m.from_buffer(b))
-+        self.assertEqual("text/x-script.python", m.from_buffer(b))
- 
- 
-     def test_open_file(self):
-@@ -50,7 +50,7 @@
-         try:
-             m = magic.Magic(mime=True)
-             self.assert_values(m, {
--                'magic._pyc_': 'application/octet-stream',
-+                'magic._pyc_': 'text/x-bytecode.python',
-                 'test.pdf': 'application/pdf',
-                 'test.gz': 'application/gzip',
-                 'text.txt': 'text/plain',