Merge ~pushkarnk/ubuntu/+source/dnspython:merge-2029461-mantic into ubuntu/+source/dnspython:debian/sid

[Pushkar Kulkarni]

Merge dnspython 2.4.1-1

b6626db... by Pushkar Kulkarni on 2023-08-04

Remove python3-sniffio from Suggests

a5017b0... by Pushkar Kulkarni on 2023-08-04

Update changelog: remove LP bug id from the merge message

[Pushkar Kulkarni (pushkarnk)]

PPA build: https://launchpad.net/~pushkarnk/+archive/ubuntu/dnspython/+builds?build_state=built

[Graham Inggs (ginggs)]

Uploaded, thanks

review: Approve

Unmerged commits

a5017b0... by Pushkar Kulkarni on 2023-08-04

Update changelog: remove LP bug id from the merge message

b6626db... by Pushkar Kulkarni on 2023-08-04

Remove python3-sniffio from Suggests

d645173... by Pushkar Kulkarni on 2023-08-03

Update changelog

526e534... by Pushkar Kulkarni on 2023-08-03

update-maintainer

0cef8a4... by Pushkar Kulkarni on 2023-08-03

reconstruct-changelog

c85d74a... by Pushkar Kulkarni on 2023-08-03

merge-changelogs

55aaf9a... by Lukas Märdian on 2023-01-31

Drop python-h2 & httpx (DNS Over HTTPS, DOH) to Suggests (LP: 2004272)

This is to avoid a big tree of additional transitive dependencies (for now).
Foundations might agree to maintain all of those in the future and drop this
delta.

diff --git a/debian/changelog b/debian/changelog
index 5232220..4b1e792 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dnspython (2.4.1-1ubuntu1) mantic; urgency=medium
+
+  * Merge from Debian unstable (LP: #2029461). Remaining changes:
+    - Drop python-h2 & httpx (DNS Over HTTPS, DOH) to Suggests
+
+ -- Pushkar Kulkarni <[e-mail]>  Thu, 03 Aug 2023 19:26:28 +0530
+
 dnspython (2.4.1-1) unstable; urgency=medium
 
   * New upstream release
@@ -30,6 +37,12 @@ dnspython (2.4.0~rc1-1) experimental; urgency=medium
 
  -- Scott Kitterman <[e-mail]>  Thu, 06 Jul 2023 22:09:07 -0400
 
+dnspython (2.3.0-1ubuntu1) lunar; urgency=medium
+
+  * Drop python-h2 & httpx (DNS Over HTTPS, DOH) to Suggests (LP: 2004272)
+
+ -- Lukas Märdian <[e-mail]>  Tue, 31 Jan 2023 14:37:06 +0100
+
 dnspython (2.3.0-1) unstable; urgency=medium
 
   * Upload to unstable
diff --git a/debian/control b/debian/control
index 5c739ac..e249b5e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: dnspython
 Section: python
 Priority: optional
-Maintainer: Debian Python Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Python Team <[e-mail]>
 Uploaders: Robert S. Edmonds <[e-mail]>,
            Scott Kitterman <[e-mail]>,
            Matthew Grant <[e-mail]>
@@ -30,13 +31,11 @@ Architecture: all
 Depends: netbase, ${misc:Depends}, ${python3:Depends}
 Recommends: ca-certificates,
             python3-cryptography,
-            python3-h2,
             python3-httpcore (>=0.17.3),
-            python3-httpx,
             python3-idna,
             python3-requests,
             python3-requests-toolbelt
-Suggests: python3-trio, python3-aioquic
+Suggests: python3-trio, python3-aioquic, python3-h2, python3-httpx
 Description: DNS toolkit for Python 3
  dnspython is a DNS toolkit for Python. It supports almost all record types. It
  can be used for queries, zone transfers, and dynamic updates. It supports TSIG
diff --git a/debian/tests/control b/debian/tests/control
index b102c2d..497c969 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -3,9 +3,7 @@ Depends: ca-certificates,
          python3-aioquic,
          python3-all,
          python3-cryptography,
-         python3-h2,
          python3-httpcore,
-         python3-httpx,
          python3-idna,
          python3-pytest,
          python3-requests,