Merge ~athos-ribeiro/ubuntu/+source/cyrus-sasl2:merge-2.1.27+dfsg-2.1ubuntu1-impish into ubuntu/+source/cyrus-sasl2:debian/sid

[Athos Ribeiro]

Hello,

This is the merge for cyrus-sasl2 2.1.27+dfsg-2.1 from Debian unstable.

The only Debian change introduced in this new release is a fix for the sphinx errors, which was the only item being addressed in the Ubuntu delta. Therefore, this merge can be a sync instead. I am opening this MP for verification/review purpose only.

A PPA with a build for this MP is available at https://launchpad.net/~athos-ribeiro/+archive/ubuntu/merge-2.1.27+dfsg-2.1ubuntu1-impish/+packages

[Sergio Durigan Junior (sergiodj)]

I'm taking this one.

[Sergio Durigan Junior (sergiodj)]

Thanks for the MP, Athos.

I analysed it and indeed to makes sense to sync the package. I also built it on impish and verified that the FTBFS is fixed. There's no dep8 test.

I've requested the sync:

$ syncpackage --force cyrus-sasl2
Loading KWallet
Loading SecretService
Loading Windows
Loading chainer
Loading macOS
Source cyrus-sasl2 -> impish/Proposed: current version 2.1.27+dfsg-2ubuntu1, new version 2.1.27+dfsg-2.1
New changes:
cyrus-sasl2 (2.1.27+dfsg-2.1) unstable; urgency=medium

  * Non-maintainer upload.
  * Fix Sphinx errors (Closes: #955095)

 -- Jochen Sprickerhof <email address hidden> Sun, 07 Feb 2021 10:43:14 +0100
Sync this package [y|N]? y
Request succeeded; you should get an e-mail once it is processed.

review: Approve

[Christian Ehrhardt  (paelzer)]

This is synced
 cyrus-sasl2 | 2.1.27+dfsg-2.1 | impish | source
Setting the MR to merged

diff --git a/debian/changelog b/debian/changelog
index ddfb38b..4143839 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+cyrus-sasl2 (2.1.27+dfsg-2.1ubuntu1) impish; urgency=medium
+
+  * Merge with Debian unstable.
+  * Drop changes:
+    - Disable sphinx doc build, as the extension bundled in this source is
+      not compatible with current sphinx release (LP: #1894907):
+      + d/control: remove python3-sphinx build-depends
+      + d/rules: disable sphinx doc build, copy pre-built manpages to build dirs
+      [Fixed in 2.1.27+dfsg-2.1]
+
+ -- Athos Ribeiro <[e-mail]>  Tue, 11 May 2021 21:28:35 -0300
+
 cyrus-sasl2 (2.1.27+dfsg-2.1) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -5,6 +17,15 @@ cyrus-sasl2 (2.1.27+dfsg-2.1) unstable; urgency=medium
 
  -- Jochen Sprickerhof <[e-mail]>  Sun, 07 Feb 2021 10:43:14 +0100
 
+cyrus-sasl2 (2.1.27+dfsg-2ubuntu1) groovy; urgency=medium
+
+  * Disable sphinx doc build, as the extension bundled in this source is
+    not compatible with current sphinx release (LP: #1894907):
+    - d/control: remove python3-sphinx build-depends
+    - d/rules: disable sphinx doc build, copy pre-built manpages to build dirs
+
+ -- Andreas Hasenack <[e-mail]>  Tue, 29 Sep 2020 19:25:19 +0000
+
 cyrus-sasl2 (2.1.27+dfsg-2) unstable; urgency=medium
 
   [ Salvatore Bonaccorso ]
diff --git a/debian/control b/debian/control
index 285347e..0c73735 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: cyrus-sasl2
 Section: libs
 Priority: standard
-Maintainer: Debian Cyrus Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Cyrus Team <[e-mail]>
 Uploaders: Fabian Fagerholm <[e-mail]>,
            Roberto C. Sanchez <[e-mail]>,
            Ondřej Surý <[e-mail]>,