Merge ~lvoytek/ubuntu/+source/factory-boy:django4-compatibility into ubuntu/+source/factory-boy:ubuntu/devel

[Lena Voytek]

Fix autopkgtest by patching example project to be compatible with Django 4

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

local autopkgtest results:
autopkgtest [15:57:00]: @@@@@@@@@@@@@@@@@@@@ summary
unit-tests-p3 PASS
django-example PASS
qemu-system-x86_64: terminating on signal 15 from pid 109598 (/usr/bin/python3)

[Sergio Durigan Junior (sergiodj)]

Thanks, Lena.

Uploaded:

$ dput factory-boy_2.11.1-5ubuntu1_source.changes
Trying to upload package to ubuntu
Checking signature on .changes
gpg: /home/sergio/work/factory-boy/factory-boy_2.11.1-5ubuntu1_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/factory-boy/factory-boy_2.11.1-5ubuntu1.dsc: Valid signature from 106DA1C8C3CBBF14
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading factory-boy_2.11.1-5ubuntu1.dsc: done.
  Uploading factory-boy_2.11.1-5ubuntu1.debian.tar.xz: done.
  Uploading factory-boy_2.11.1-5ubuntu1_source.buildinfo: done.
  Uploading factory-boy_2.11.1-5ubuntu1_source.changes: done.
Successfully uploaded packages.

review: Approve

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

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

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 142c795..ad203d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+factory-boy (2.11.1-5ubuntu1) mantic; urgency=medium
+
+  * d/p/demo-django4-compatibility.patch: Fix Django 4 compatibility in the
+    example application used in the django-example autopkgtest (LP: #2022089)
+
+ -- Lena Voytek <[e-mail]>  Thu, 24 Aug 2023 13:57:01 -0700
+
 factory-boy (2.11.1-5) unstable; urgency=medium
 
   * Set field Upstream-Contact in debian/copyright.
diff --git a/debian/control b/debian/control
index 39894ac..4096c02 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: factory-boy
 Section: python
 Priority: optional
-Maintainer: Debian Python Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Python Team <[e-mail]>
 Uploaders: Brian May <[e-mail]>
 Build-Depends: debhelper-compat (= 13),
                dh-python,
diff --git a/debian/patches/demo-django4-compatibility.patch b/debian/patches/demo-django4-compatibility.patch
new file mode 100644
index 0000000..423b8c4
--- /dev/null
+++ b/debian/patches/demo-django4-compatibility.patch
@@ -0,0 +1,25 @@
+Description: Fix django_demo example compatibility with Django 4
+ The django_demo example project is used in the django-example autopkgtest, so
+ it must be compatible with Django 4 to succeed. This is done by using the path
+ function instead of the removed url function in urls.py. This was fixed in an
+ upstream commit.
+Author: François Freitag <[e-mail]>
+Origin: backport, https://github.com/FactoryBoy/factory_boy/commit/27e55cc20800b9f3c9205fc63833e90d115eea25
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/mantic/+source/factory-boy/+bug/2022089
+Last-Update: 2023-08-24
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/examples/django_demo/django_demo/urls.py
++++ b/examples/django_demo/django_demo/urls.py
+@@ -13,9 +13,9 @@
+     1. Import the include() function: from django.conf.urls import url, include
+     2. Add a URL to urlpatterns:  url(r'^blog/', include('blog.urls'))
+ """
+-from django.conf.urls import url
+ from django.contrib import admin
++from django.urls import path
+ 
+ urlpatterns = [
+-    url(r'^admin/', admin.site.urls),
++    path('admin/', admin.site.urls),
+ ]
diff --git a/debian/patches/series b/debian/patches/series
index dcdc432..21f04a9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ removed-privacy-breach.patch
 0003-Add-ipaddress-to-depends.patch
 compatibility_python37.patch
 0005-Fix-test-for-Django-2.2.patch
+demo-django4-compatibility.patch