Merge ~lvoytek/ubuntu/+source/hyperkitty:add-django4-support-mantic into ubuntu/+source/hyperkitty:ubuntu/devel

[Lena Voytek]

Allow builds against Django 4.2 for hyperkitty

PPA: https://launchpad.net/~lvoytek/+archive/ubuntu/django-4-mantic

[Bryce Harrington (bryce)]

Verified the PPA built ok, and packaging is all correct.
LGTM, +1.

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: bryce, lvoytek
Uploaders: bryce
MP auto-approved

review: Approve

[Lena Voytek (lvoytek)]

Thanks Bryce! Would you be willing to sponsor this one too?

[Bryce Harrington (bryce)]

Upload sponsored:

 fixup_buildinfo hyperkitty_1.3.7-1ubuntu1.dsc hyperkitty_1.3.7-1ubuntu1_source.buildinfo
 signfile buildinfo hyperkitty_1.3.7-1ubuntu1_source.buildinfo A661100B3DAC1D4F2CAD8A54E603B2578FB8F0FB

 fixup_changes dsc hyperkitty_1.3.7-1ubuntu1.dsc hyperkitty_1.3.7-1ubuntu1_source.changes
 fixup_changes buildinfo hyperkitty_1.3.7-1ubuntu1_source.buildinfo hyperkitty_1.3.7-1ubuntu1_source.changes
 signfile changes hyperkitty_1.3.7-1ubuntu1_source.changes A661100B3DAC1D4F2CAD8A54E603B2578FB8F0FB

Successfully signed dsc, buildinfo, changes files
triage-mantic+23.10: ~/pkg/Hyperkitty/review-lp2022089/hyperkitty-gu$ grep ^Vcs ../hyperkitty_1.3.7-1ubuntu1_source.changes
Vcs-Git: https://git.launchpad.net/~bryce/ubuntu/+source/hyperkitty
Vcs-Git-Commit: 6deeab9585d4ba522229aa4978cc4393d59b5591
Vcs-Git-Ref: refs/heads/add-django4-support-mantic
triage-mantic+23.10: ~/pkg/Hyperkitty/review-lp2022089/hyperkitty-gu$ dput ubuntu ../hyperkitty_1.3.7-1ubuntu1_source.changes
D: Setting host argument.
Checking signature on .changes
gpg: ../hyperkitty_1.3.7-1ubuntu1_source.changes: Valid signature from E603B2578FB8F0FB
Checking signature on .dsc
gpg: ../hyperkitty_1.3.7-1ubuntu1.dsc: Valid signature from E603B2578FB8F0FB
Package includes an .orig.tar.gz file although the debian revision suggests
that it might not be required. Multiple uploads of the .orig.tar.gz may be
rejected by the upload queue management software.
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading hyperkitty_1.3.7-1ubuntu1.dsc: done.
  Uploading hyperkitty_1.3.7.orig.tar.gz: done.
  Uploading hyperkitty_1.3.7-1ubuntu1.debian.tar.xz: done.
  Uploading hyperkitty_1.3.7-1ubuntu1_source.buildinfo: done.
  Uploading hyperkitty_1.3.7-1ubuntu1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index f9c4d02..fbb2d40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+hyperkitty (1.3.7-1ubuntu1) mantic; urgency=medium
+
+  * Add Django 4.2 compatibility (LP: #2022089)
+    - d/p/django4-compatibility.patch: Add Django 4.2 as a possible dependency
+      in setup.py
+    - d/control: Allow Django 4.2 as a dependency
+
+ -- Lena Voytek <[e-mail]>  Mon, 14 Aug 2023 09:44:57 -0700
+
 hyperkitty (1.3.7-1) unstable; urgency=medium
 
   * New upstream release 1.3.7
diff --git a/debian/control b/debian/control
index cb21195..11e44dc 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: hyperkitty
 Section: python
 Priority: optional
-Maintainer: Debian Mailman Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Mailman Team <[e-mail]>
 Uploaders: Pierre-Elliott Bécue <[e-mail]>,
            Jonas Meurer <[e-mail]>
 Build-Depends: debhelper-compat (= 13),
@@ -9,7 +10,7 @@ Build-Depends: debhelper-compat (= 13),
                python3-all,
                python3-bs4,
                python3-django (>= 2:3.2),
-               python3-django (<< 3:4.2),
+               python3-django (<< 3:4.3),
                python3-django-compressor,
                python3-django-extensions,
                python3-django-gravatar2,
diff --git a/debian/patches/django4-compatibility.patch b/debian/patches/django4-compatibility.patch
new file mode 100644
index 0000000..124f661
--- /dev/null
+++ b/debian/patches/django4-compatibility.patch
@@ -0,0 +1,18 @@
+Description: Mark Django versions 3.2 to 4.2 as compatible
+Author: Mark Sapiro <[e-mail]>
+Origin: backport, https://gitlab.com/mailman/hyperkitty/-/commit/03e912622a56b8178d00ed872aa6218715d67f6e
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/hyperkitty/+bug/2022089
+Last-Update: 2023-08-14
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/setup.py
++++ b/setup.py
+@@ -37,7 +37,7 @@
+ 
+ # Requirements
+ REQUIRES = [
+-    "django>=3.2,<4.2",
++    "django>=3.2,<4.3",
+     "django_mailman3>=1.3.8",
+     "django-gravatar2>=1.0.6",
+     "djangorestframework>=3.0.0",
diff --git a/debian/patches/series b/debian/patches/series
index 41393d8..d8b65db 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001_README_remove_embedded_images.patch
 0002_Use_python3_by_default.patch
 0003-run-sassc-at-build-time.patch
+django4-compatibility.patch