diff -Nru python-django-pyscss-2.0.2/debian/changelog python-django-pyscss-2.0.2/debian/changelog
--- python-django-pyscss-2.0.2/debian/changelog	2019-07-09 14:52:25.000000000 +0000
+++ python-django-pyscss-2.0.2/debian/changelog	2021-10-26 08:56:48.000000000 +0000
@@ -1,3 +1,16 @@
+python-django-pyscss (2.0.2-10) unstable; urgency=medium
+
+  [ Ondřej Nový ]
+  * Use debhelper-compat instead of debian/compat.
+  * Bump Standards-Version to 4.4.1.
+
+  [ Thomas Goirand ]
+  * Add patches (Closes: #997344):
+    - do-not-use-six-from-django.patch
+    - rename-staticfiles-into-static.patch
+
+ -- Thomas Goirand <zigo@debian.org>  Tue, 26 Oct 2021 10:56:48 +0200
+
 python-django-pyscss (2.0.2-9) unstable; urgency=medium
 
   [ Ondřej Nový ]
diff -Nru python-django-pyscss-2.0.2/debian/compat python-django-pyscss-2.0.2/debian/compat
--- python-django-pyscss-2.0.2/debian/compat	2019-07-09 14:52:25.000000000 +0000
+++ python-django-pyscss-2.0.2/debian/compat	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-11
diff -Nru python-django-pyscss-2.0.2/debian/control python-django-pyscss-2.0.2/debian/control
--- python-django-pyscss-2.0.2/debian/control	2019-07-09 14:52:25.000000000 +0000
+++ python-django-pyscss-2.0.2/debian/control	2021-10-26 08:56:48.000000000 +0000
@@ -6,7 +6,7 @@
  Thomas Goirand <zigo@debian.org>,
  Ivan Udovichenko <iudovichenko@mirantis.com>,
 Build-Depends:
- debhelper (>= 11),
+ debhelper-compat (= 11),
  dh-python,
  libjs-jquery,
  openstack-pkg-tools (>= 99~),
@@ -22,7 +22,7 @@
  python3-pyscss,
  python3-simplejson,
  python3-six,
-Standards-Version: 4.4.0
+Standards-Version: 4.4.1
 Vcs-Browser: https://salsa.debian.org/openstack-team/python/python-django-pyscss
 Vcs-Git: https://salsa.debian.org/openstack-team/python/python-django-pyscss.git
 Homepage: https://github.com/fusionbox/django-pyscss
@@ -34,6 +34,7 @@
  python3-django,
  python3-django-compressor,
  python3-pyscss,
+ python3-six,
  ${misc:Depends},
  ${python3:Depends},
 Description: makes it easier to use PySCSS in Django - Python 3.x
diff -Nru python-django-pyscss-2.0.2/debian/patches/do-not-use-six-from-django.patch python-django-pyscss-2.0.2/debian/patches/do-not-use-six-from-django.patch
--- python-django-pyscss-2.0.2/debian/patches/do-not-use-six-from-django.patch	1970-01-01 00:00:00.000000000 +0000
+++ python-django-pyscss-2.0.2/debian/patches/do-not-use-six-from-django.patch	2021-10-26 08:56:48.000000000 +0000
@@ -0,0 +1,16 @@
+Description: Do not use six from Django
+Author: Thomas Goirand <zigo@debian.org>
+Bug-Debian: https://bugs.debian.org/997344
+Last-Update: 2021-10-26
+
+--- python-django-pyscss-2.0.2.orig/django_pyscss/compiler.py
++++ python-django-pyscss-2.0.2/django_pyscss/compiler.py
+@@ -3,7 +3,7 @@ from __future__ import absolute_import
+ import os
+ from pathlib import PurePath
+ 
+-from django.utils.six.moves import StringIO
++from six.moves import StringIO
+ 
+ from django.conf import settings
+ from django.contrib.staticfiles.storage import staticfiles_storage
diff -Nru python-django-pyscss-2.0.2/debian/patches/rename-staticfiles-into-static.patch python-django-pyscss-2.0.2/debian/patches/rename-staticfiles-into-static.patch
--- python-django-pyscss-2.0.2/debian/patches/rename-staticfiles-into-static.patch	1970-01-01 00:00:00.000000000 +0000
+++ python-django-pyscss-2.0.2/debian/patches/rename-staticfiles-into-static.patch	2021-10-26 08:56:48.000000000 +0000
@@ -0,0 +1,25 @@
+Description: Rename staticfiles into static
+Author: Thomas Goirand <zigo@debian.org>
+Bug-Debian: https://bugs.debian.org/997344
+Forwarded: no
+Last-Update: 2021-10-26
+
+--- python-django-pyscss-2.0.2.orig/tests/test_compressor.py
++++ python-django-pyscss-2.0.2/tests/test_compressor.py
+@@ -4,14 +4,14 @@ from tests.utils import CollectStaticTes
+ 
+ 
+ APP2_LINK_TAG = """
+-{% load staticfiles compress %}
++{% load static compress %}
+ {% compress css %}
+ <link rel="stylesheet" type="text/x-scss" href="{% static 'css/app2.scss' %}">
+ {% endcompress %}
+ """
+ 
+ IMPORT_APP2_STYLE_TAG = """
+-{% load staticfiles compress %}
++{% load static compress %}
+ {% compress css %}
+ <style type="text/x-scss">
+ @import "css/app2.scss";
diff -Nru python-django-pyscss-2.0.2/debian/patches/series python-django-pyscss-2.0.2/debian/patches/series
--- python-django-pyscss-2.0.2/debian/patches/series	2019-07-09 14:52:25.000000000 +0000
+++ python-django-pyscss-2.0.2/debian/patches/series	2021-10-26 08:56:48.000000000 +0000
@@ -6,3 +6,5 @@
 solve_django.core.exceptions.ImproperlyConfigured.patch
 Fix_MIDDLEWARE_and_INSTALLED_APPS_definitions.patch
 remove-broken-test-in-django-2.0.patch
+do-not-use-six-from-django.patch
+rename-staticfiles-into-static.patch