diff -pruN 4.0-1/debian/changelog 4.0-1ubuntu1/debian/changelog
--- 4.0-1/debian/changelog	2022-06-28 10:00:21.000000000 +0000
+++ 4.0-1ubuntu1/debian/changelog	2022-07-13 21:20:38.000000000 +0000
@@ -1,3 +1,12 @@
+python-django-compressor (4.0-1ubuntu1) kinetic; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - d/control: Drop runtime dependency on python-calmjs to a Suggests
+      as it is an optional dependency and rjsmin already provides the
+      default JS minifier implementation.
+
+ -- Lena Voytek <lena.voytek@canonical.com>  Wed, 13 Jul 2022 14:20:38 -0700
+
 python-django-compressor (4.0-1) unstable; urgency=medium
 
   * New upstream release.
@@ -13,6 +22,15 @@ python-django-compressor (2.4.1-3) unsta
 
  -- Thomas Goirand <zigo@debian.org>  Mon, 27 Jun 2022 13:27:13 +0200
 
+python-django-compressor (2.4.1-2ubuntu1) kinetic; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - d/control: Drop runtime dependency on python-calmjs to a Suggests
+      as it is an optional dependency and rjsmin already provides the
+      default JS minifier implementation.
+
+ -- James Page <james.page@ubuntu.com>  Mon, 30 May 2022 10:51:31 +0100
+
 python-django-compressor (2.4.1-2) unstable; urgency=medium
 
   * Uploading to unstable.
@@ -25,6 +43,14 @@ python-django-compressor (2.4.1-1) exper
 
  -- Thomas Goirand <zigo@debian.org>  Mon, 28 Feb 2022 14:18:07 +0100
 
+python-django-compressor (2.4-2ubuntu1) hirsute; urgency=medium
+
+  * d/control: Drop runtime dependency on python-calmjs to a Suggests
+    as it is an optional dependency and rjsmin already provides the
+    default JS minifier implementation.
+
+ -- James Page <james.page@ubuntu.com>  Thu, 07 Jan 2021 10:13:16 +0000
+
 python-django-compressor (2.4-2) unstable; urgency=medium
 
   * Uploading to unstable.
@@ -225,3 +251,4 @@ python-django-compressor (1.2-1) experim
   * Initial release.
 
  -- Thomas Goirand <zigo@debian.org>  Sun, 14 Oct 2012 10:51:47 +0000
+
diff -pruN 4.0-1/debian/control 4.0-1ubuntu1/debian/control
--- 4.0-1/debian/control	2022-06-28 10:00:21.000000000 +0000
+++ 4.0-1ubuntu1/debian/control	2022-07-13 21:20:38.000000000 +0000
@@ -1,7 +1,8 @@
 Source: python-django-compressor
 Section: python
 Priority: optional
-Maintainer: Debian OpenStack <team+openstack@tracker.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian OpenStack <team+openstack@tracker.debian.org>
 Uploaders:
  Thomas Goirand <zigo@debian.org>,
 Build-Depends:
@@ -39,7 +40,6 @@ Package: python3-django-compressor
 Architecture: all
 Depends:
  python3-csscompressor (>= 0.9.5),
- python3-calmjs,
  python3-django,
  python3-django-appconf (>= 1.0.3),
  python3-rcssmin (>= 1:1.1.0),
@@ -47,6 +47,8 @@ Depends:
  python3-six,
  ${misc:Depends},
  ${python3:Depends},
+Suggests:
+ python3-calmjs,
 Description: Compresses linked, inline JS or CSS into single cached files - Python 3.x
  Django Compressor combines and compresses linked and inline Javascript or CSS
  in a Django templates into cacheable static files by using the compress