Merge ~mitchdz/ubuntu/+source/spamassassin:merge-lp2040424-noble into ubuntu/+source/spamassassin:debian/sid

[Mitchell Dzurick]

PPA - https://launchpad.net/~mitchdz/+archive/ubuntu/merge-lp2040424-noble/+packages

[Mitchell Dzurick (mitchdz)]

  - spamassassin/4.0.0-8ubuntu1~noble1
    + ✅ spamassassin on noble for amd64 @ 05.01.24 00:24:41
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-noble-mitchdz-merge-lp2040424-noble/noble/amd64/s/spamassassin/20240105_002441_0fef2@/log.gz
    + ✅ spamassassin on noble for arm64 @ 05.01.24 00:18:47
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-noble-mitchdz-merge-lp2040424-noble/noble/arm64/s/spamassassin/20240105_001847_cbf22@/log.gz
    + ✅ spamassassin on noble for armhf @ 05.01.24 00:23:55
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-noble-mitchdz-merge-lp2040424-noble/noble/armhf/s/spamassassin/20240105_002355_c0ba3@/log.gz
    + ✅ spamassassin on noble for i386 @ 05.01.24 00:28:40
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-noble-mitchdz-merge-lp2040424-noble/noble/i386/s/spamassassin/20240105_002840_a43c8@/log.gz
    + ✅ spamassassin on noble for ppc64el @ 05.01.24 00:16:31
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-noble-mitchdz-merge-lp2040424-noble/noble/ppc64el/s/spamassassin/20240105_001631_c1d3d@/log.gz
    + ✅ spamassassin on noble for s390x @ 05.01.24 00:18:55
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-noble-mitchdz-merge-lp2040424-noble/noble/s390x/s/spamassassin/20240105_001855_0a87c@/log.gz

[Mitchell Dzurick (mitchdz)]

Christian mentioned another package might need to be updated along with spamassassin. If you know more about that, let me know, otherwise I'll look to see if I can find more information about that.

[Andreas Hasenack (ahasenack)]

I'll take a look at this.

[Andreas Hasenack (ahasenack)]

- tags match expectations
- range-diff clean:
git range-diff mitchdz/old/debian..mitchdz/logical/4.0.0-7ubuntu1 mitchdz/new/debian..merge-lp2040424-noble
- small delta carried over, while the MIR is in progress
- debian changes in 4.0.0-8 ok (I'm surprised that syslog.target is "obsolete": citation needed :)

looks good, just that d/changelog nit

review: Needs Fixing

[Andreas Hasenack (ahasenack)]

I listed the rdeps of all packages produced by spamassassin, and didn't find a versioned dependency that we would have to update or rebuild.

[Andreas Hasenack (ahasenack)]

Sponsored:

Uploading spamassassin_4.0.0-8ubuntu1.dsc
Uploading spamassassin_4.0.0-8ubuntu1.debian.tar.xz
Uploading spamassassin_4.0.0-8ubuntu1_source.buildinfo
Uploading spamassassin_4.0.0-8ubuntu1_source.changes

review: Approve

[Andreas Hasenack (ahasenack)]

This migrating, marking MP as merged.

diff --git a/debian/changelog b/debian/changelog
index 2643c4b..ce45636 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+spamassassin (4.0.0-8ubuntu1) noble; urgency=medium
+
+  * Merge with Debian unstable (LP: #2040424). Remaining changes:
+    - d/control: Demote libmail-dmarc-perl from Recommends to Suggests to
+      resolve a component mismatch while a MIR is in process. (see LP #2023971)
+
+ -- Mitchell Dzurick <[e-mail]>  Tue, 02 Jan 2024 11:40:00 -0700
+
 spamassassin (4.0.0-8) unstable; urgency=medium
 
   * Drop reference to obsolete syslog.target in spamd.service
@@ -6,6 +14,14 @@ spamassassin (4.0.0-8) unstable; urgency=medium
 
  -- Noah Meyerhans <[e-mail]>  Sun, 19 Nov 2023 12:08:09 -0800
 
+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