diff -Nru python-magic-0.4.15/debian/changelog python-magic-0.4.15/debian/changelog
--- python-magic-0.4.15/debian/changelog	2019-12-17 12:43:16.000000000 +0000
+++ python-magic-0.4.15/debian/changelog	2019-12-27 13:20:39.000000000 +0000
@@ -1,8 +1,9 @@
-python-magic (2:0.4.15-2build1) focal; urgency=medium
+python-magic (2:0.4.15-3) unstable; urgency=low
 
-  * No-change rebuild to generate dependencies on python2.
+  * Cherry-pick upstream commit to fix warning on Python 3.8.
+    (Ubuntu 1857148)
 
- -- Matthias Klose <doko@ubuntu.com>  Tue, 17 Dec 2019 12:43:16 +0000
+ -- Christoph Biedl <debian.axhn@manchmal.in-ulm.de>  Fri, 27 Dec 2019 14:20:39 +0100
 
 python-magic (2:0.4.15-2) unstable; urgency=high
 
diff -Nru python-magic-0.4.15/debian/compat python-magic-0.4.15/debian/compat
--- python-magic-0.4.15/debian/compat	2018-01-08 07:20:53.000000000 +0000
+++ python-magic-0.4.15/debian/compat	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-11
diff -Nru python-magic-0.4.15/debian/control python-magic-0.4.15/debian/control
--- python-magic-0.4.15/debian/control	2018-07-21 22:09:26.000000000 +0000
+++ python-magic-0.4.15/debian/control	2019-12-27 13:20:39.000000000 +0000
@@ -1,17 +1,18 @@
 Source: python-magic
 Maintainer: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
 Homepage: https://github.com/ahupp/python-magic/
-Standards-Version: 4.1.5
+Standards-Version: 4.4.1
 Vcs-Browser: https://git.in-ulm.de/cbiedl/python-magic
 Vcs-Git: https://git.in-ulm.de/cbiedl/python-magic.git
 Testsuite: autopkgtest-pkg-python
-Build-Depends: debhelper (>= 11~),
+Build-Depends: debhelper-compat (= 12),
     dh-python,
     python-all,
     python-setuptools,
     python3-all,
     python3-setuptools,
 Priority: extra
+Rules-Requires-Root: no
 Section: libs
 
 Package: python-magic
diff -Nru python-magic-0.4.15/debian/patches/cherry-pick.0.4.15-31-g063a667.fixing-warning-on-python-3-8.patch python-magic-0.4.15/debian/patches/cherry-pick.0.4.15-31-g063a667.fixing-warning-on-python-3-8.patch
--- python-magic-0.4.15/debian/patches/cherry-pick.0.4.15-31-g063a667.fixing-warning-on-python-3-8.patch	1970-01-01 00:00:00.000000000 +0000
+++ python-magic-0.4.15/debian/patches/cherry-pick.0.4.15-31-g063a667.fixing-warning-on-python-3-8.patch	2019-12-27 13:20:39.000000000 +0000
@@ -0,0 +1,17 @@
+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:
diff -Nru python-magic-0.4.15/debian/patches/series python-magic-0.4.15/debian/patches/series
--- python-magic-0.4.15/debian/patches/series	2018-07-21 22:09:26.000000000 +0000
+++ python-magic-0.4.15/debian/patches/series	2019-12-27 13:20:39.000000000 +0000
@@ -1,3 +1,9 @@
+# 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
+
+# modifications for Debian
 disable-gzip-test.patch