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

Proposed by Mitchell Dzurick
Status: Merged
Approved by: Andreas Hasenack
Approved revision: 1123b2d1ffff25d704ff038006850313ea1d33b6
Merge reported by: Andreas Hasenack
Merged at revision: 1123b2d1ffff25d704ff038006850313ea1d33b6
Proposed branch: ~mitchdz/ubuntu/+source/spamassassin:merge-lp2040424-noble
Merge into: ubuntu/+source/spamassassin:debian/sid
Diff against target: 58 lines (+20/-3)
2 files modified
debian/changelog (+16/-0)
debian/control (+4/-3)
Reviewer Review Type Date Requested Status
Andreas Hasenack Approve
Canonical Server Reporter Pending
git-ubuntu import Pending
Review via email: mp+457853@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Mitchell Dzurick (mitchdz) wrote :
Revision history for this message
Mitchell Dzurick (mitchdz) wrote :

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.

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

I'll take a look at this.

Revision history for this message
Andreas Hasenack (ahasenack) :
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

- 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
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

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.

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

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
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

This migrating, marking MP as merged.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index 2643c4b..ce45636 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
1spamassassin (4.0.0-8ubuntu1) noble; urgency=medium
2
3 * Merge with Debian unstable (LP: #2040424). Remaining changes:
4 - d/control: Demote libmail-dmarc-perl from Recommends to Suggests to
5 resolve a component mismatch while a MIR is in process. (see LP #2023971)
6
7 -- Mitchell Dzurick <mitchell.dzurick@canonical.com> Tue, 02 Jan 2024 11:40:00 -0700
8
1spamassassin (4.0.0-8) unstable; urgency=medium9spamassassin (4.0.0-8) unstable; urgency=medium
210
3 * Drop reference to obsolete syslog.target in spamd.service11 * Drop reference to obsolete syslog.target in spamd.service
@@ -6,6 +14,14 @@ spamassassin (4.0.0-8) unstable; urgency=medium
614
7 -- Noah Meyerhans <noahm@debian.org> Sun, 19 Nov 2023 12:08:09 -080015 -- Noah Meyerhans <noahm@debian.org> Sun, 19 Nov 2023 12:08:09 -0800
816
17spamassassin (4.0.0-7ubuntu1) mantic; urgency=medium
18
19 * d/control: Demote libmail-dmarc-perl from Recommends to Suggests
20 to resolve a component mismatch while a MIR is in process.
21 (see LP #2023971)
22
23 -- Bryce Harrington <bryce@canonical.com> Tue, 22 Aug 2023 10:08:58 -0700
24
9spamassassin (4.0.0-7) unstable; urgency=medium25spamassassin (4.0.0-7) unstable; urgency=medium
1026
11 * Import upstream fix for DnsResolver.pm method deprecation warnings27 * 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 @@
1Source: spamassassin1Source: spamassassin
2Section: mail2Section: mail
3Priority: optional3Priority: optional
4Maintainer: Noah Meyerhans <noahm@debian.org>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5XSBC-Original-Maintainer: Noah Meyerhans <noahm@debian.org>
5Build-Depends: perl, libssl-dev, libhtml-parser-perl,6Build-Depends: perl, libssl-dev, libhtml-parser-perl,
6 libnet-dns-perl, libnetaddr-ip-perl, debhelper-compat (= 13),7 libnet-dns-perl, libnetaddr-ip-perl, debhelper-compat (= 13),
7 libberkeleydb-perl, netbase, libdbi-perl,8 libberkeleydb-perl, netbase, libdbi-perl,
@@ -21,10 +22,10 @@ Depends: perl, libhtml-parser-perl, libsocket6-perl, adduser,
21 libnetaddr-ip-perl, libhttp-date-perl, libmail-dkim-perl,22 libnetaddr-ip-perl, libhttp-date-perl, libmail-dkim-perl,
22 libio-string-perl, libwww-perl | curl | w3m, ${misc:Depends}23 libio-string-perl, libwww-perl | curl | w3m, ${misc:Depends}
23Recommends: spamc, sa-compile (= ${source:Version}), libmail-spf-perl,24Recommends: spamc, sa-compile (= ${source:Version}), libmail-spf-perl,
24 libsys-syslog-perl, gnupg, libbsd-resource-perl, libmail-dmarc-perl25 libsys-syslog-perl, gnupg, libbsd-resource-perl
25Suggests: razor, libio-socket-ssl-perl, libdbi-perl, pyzor,26Suggests: razor, libio-socket-ssl-perl, libdbi-perl, pyzor,
26 libcompress-zlib-perl, libencode-detect-perl,27 libcompress-zlib-perl, libencode-detect-perl,
27 libgeoip2-perl, libnet-patricia-perl28 libgeoip2-perl, libnet-patricia-perl, libmail-dmarc-perl
28Provides: libmail-spamassassin-perl29Provides: libmail-spamassassin-perl
29Description: Perl-based spam filter using text analysis30Description: Perl-based spam filter using text analysis
30 SpamAssassin is a very powerful and fully configurable spam filter31 SpamAssassin is a very powerful and fully configurable spam filter

Subscribers

People subscribed via source and target branches