Merge ~michal-maloszewski99/ubuntu/+source/mako:fix-pkg-resources-mako into ubuntu/+source/mako:ubuntu/devel

[Michał Małoszewski]

[Robie Basak (racb)]

Minor comments inline. I didn't notice these when we were cleaning up your branch for submission together. Sorry!

review: Needs Fixing

[Robie Basak (racb)]

+1, but can I also get a look from another team member please, to confirm that the approach I suggested to Michał here seems reasonable to you?

review: Approve

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

Approvers: racb, michal-maloszewski99
Uploaders: racb
MP auto-approved

review: Approve

[Andreas Hasenack (ahasenack)]

> +1, but can I also get a look from another team member please, to confirm that
> the approach I suggested to Michał here seems reasonable to you?

I think this is fine, simple, and works.

review: Approve

[Athos Ribeiro (athos-ribeiro)]

LGTM.

From the dh-python code, I see that if we wanted to get the dependency through setup.py, adding "setuptools" to the install requires would do the trick.

This looks good enough though, given mako 1.2.0 will no longer need that dependency.

It would be worth to add a note regarding the dependency being dropped in mako 1.2.0 to aid the next person touching the package in a future potential sync (this could go in the commit message).

While forwarding this to Debian may not make much sense in case the maintainer is planing on packaging the new 1.2.0 version of mako soon, it would be nice to mention the fix in https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1010237 after it lands in kinetic.

[Robie Basak (racb)]

Uploaded.

diff --git a/debian/changelog b/debian/changelog
index 49aad96..b4267ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mako (1.1.3+ds1-3ubuntu1) kinetic; urgency=medium
+
+  * Add dependency on python3-pkg-resources (LP: #1970153).
+
+ -- Michał Małoszewski <[e-mail]>  Wed, 22 Jun 2022 14:22:19 +0000
+
 mako (1.1.3+ds1-3) unstable; urgency=medium
 
   [ Sandro Tosi ]
diff --git a/debian/control b/debian/control
index ba0de08..c28d200 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: mako
 Section: python
 Priority: optional
-Maintainer: Piotr Ożarowski <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Piotr Ożarowski <[e-mail]>
 Uploaders: Debian Python Team <[e-mail]>
 Testsuite: autopkgtest-pkg-python
 Rules-Requires-Root: no
@@ -18,7 +19,7 @@ Vcs-Browser: https://salsa.debian.org/python-team/packages/mako
 
 Package: python3-mako
 Architecture: all
-Depends: ${python3:Depends}, ${misc:Depends}
+Depends: ${python3:Depends}, ${misc:Depends}, python3-pkg-resources
 Breaks: python-mako (<< 1.1.0+ds1-1)
 Replaces: python-mako (<< 1.1.0+ds1-1)
 Suggests: ${python3:Suggests}, python3-beaker, python-mako-doc <!nodoc>