Merge ~bryce/ubuntu/+source/spamassassin:fix-lp2023971-mantic-demote-to-suggests into ubuntu/+source/spamassassin:ubuntu/devel

[Bryce Harrington]

Demotes libmail-dmarc-perl to suggests for SpamAssassin (as discussed in today's standup), in order to resolve component mismatch.

PPA: https://launchpad.net/~bryce/+archive/ubuntu/fix-lp2023971-demote-to-suggests

[Andreas Hasenack (ahasenack)]

+1

review: Approve

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

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

review: Approve

[Bryce Harrington (bryce)]

Thanks, uploaded:

Now signing changes and any dsc files...
 signfile dsc spamassassin_4.0.0-7ubuntu1.dsc A661100B3DAC1D4F2CAD8A54E603B2578FB8F0FB

 fixup_buildinfo spamassassin_4.0.0-7ubuntu1.dsc spamassassin_4.0.0-7ubuntu1_source.buildinfo
 signfile buildinfo spamassassin_4.0.0-7ubuntu1_source.buildinfo A661100B3DAC1D4F2CAD8A54E603B2578FB8F0FB

 fixup_changes dsc spamassassin_4.0.0-7ubuntu1.dsc spamassassin_4.0.0-7ubuntu1_source.changes
 fixup_changes buildinfo spamassassin_4.0.0-7ubuntu1_source.buildinfo spamassassin_4.0.0-7ubuntu1_source.changes
 signfile changes spamassassin_4.0.0-7ubuntu1_source.changes A661100B3DAC1D4F2CAD8A54E603B2578FB8F0FB

Successfully signed dsc, buildinfo, changes files

$ dput ubuntu ../spamassassin_4.0.0-7ubuntu1_source.changes
D: Setting host argument.
Checking signature on .changes
gpg: ../spamassassin_4.0.0-7ubuntu1_source.changes: Valid signature from E603B2578FB8F0FB
Checking signature on .dsc
gpg: ../spamassassin_4.0.0-7ubuntu1.dsc: Valid signature from E603B2578FB8F0FB
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading spamassassin_4.0.0-7ubuntu1.dsc: done.
  Uploading spamassassin_4.0.0-7ubuntu1.debian.tar.xz: done.
  Uploading spamassassin_4.0.0-7ubuntu1_source.buildinfo: done.
  Uploading spamassassin_4.0.0-7ubuntu1_source.changes: done.
Successfully uploaded packages.

[Bryce Harrington (bryce)]

spamassassin | 4.0.0-7 | mantic
spamassassin | 4.0.0-7ubuntu1 | mantic-proposed

Looks like s390x tests are still running.

diff --git a/debian/changelog b/debian/changelog
index d663183..c71b2d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+spamassassin (4.0.0-7ubuntu1) mantic; urgency=medium
+
+  * d/control: Demote libmail-dmarc-perl from Recommends to Suggests
+    to resolve a component mismatch while a MIR is in process.
+    (see LP #2023971)
+
+ -- Bryce Harrington <[e-mail]>  Tue, 22 Aug 2023 10:08:58 -0700
+
 spamassassin (4.0.0-7) unstable; urgency=medium
 
   * Import upstream fix for DnsResolver.pm method deprecation warnings
diff --git a/debian/control b/debian/control
index 824fd78..33ca7a6 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: spamassassin
 Section: mail
 Priority: optional
-Maintainer: Noah Meyerhans <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Noah Meyerhans <[e-mail]>
 Build-Depends: perl, libssl-dev, libhtml-parser-perl,
  libnet-dns-perl, libnetaddr-ip-perl, debhelper-compat (= 13),
  libberkeleydb-perl, netbase, libdbi-perl,
@@ -21,10 +22,10 @@ Depends: perl, libhtml-parser-perl, libsocket6-perl, adduser,
  libnetaddr-ip-perl, libhttp-date-perl, libmail-dkim-perl,
  libio-string-perl, libwww-perl | curl | w3m, ${misc:Depends}
 Recommends: spamc, sa-compile (= ${source:Version}), libmail-spf-perl,
- libsys-syslog-perl, gnupg, libbsd-resource-perl, libmail-dmarc-perl
+ libsys-syslog-perl, gnupg, libbsd-resource-perl
 Suggests: razor, libio-socket-ssl-perl, libdbi-perl, pyzor,
  libcompress-zlib-perl, libencode-detect-perl,
- libgeoip2-perl, libnet-patricia-perl
+ libgeoip2-perl, libnet-patricia-perl, libmail-dmarc-perl
 Provides: libmail-spamassassin-perl
 Description: Perl-based spam filter using text analysis
  SpamAssassin is a very powerful and fully configurable spam filter