diff -Nru claws-mail-4.1.0/debian/changelog claws-mail-4.1.0/debian/changelog
--- claws-mail-4.1.0/debian/changelog	2022-04-14 21:00:48.000000000 +0000
+++ claws-mail-4.1.0/debian/changelog	2022-05-14 14:51:11.000000000 +0000
@@ -1,3 +1,18 @@
+claws-mail (4.1.0-2) unstable; urgency=high
+
+  [ Andreas Rönnquist ]
+  * Fix typo mial/mail for claws-mail-keyword-warner (Closes: #1010232)
+
+  [ Debian Janitor ]
+  * Remove constraints unnecessary since buster
+
+  [ Ricardo Mones ]
+  * Fix override again
+  * Add lintian overrides for source package
+  * Raise urgency because of RC bug
+
+ -- Ricardo Mones <mones@debian.org>  Sat, 14 May 2022 16:51:11 +0200
+
 claws-mail (4.1.0-1) unstable; urgency=medium
 
   * New upstream version 4.1.0
diff -Nru claws-mail-4.1.0/debian/claws-mail.lintian-overrides claws-mail-4.1.0/debian/claws-mail.lintian-overrides
--- claws-mail-4.1.0/debian/claws-mail.lintian-overrides	2022-04-14 21:00:48.000000000 +0000
+++ claws-mail-4.1.0/debian/claws-mail.lintian-overrides	2022-05-14 14:51:11.000000000 +0000
@@ -1 +1 @@
-claws-mail binary: spelling-error-in-binary usr/bin/claws-mail*
+claws-mail binary: spelling-error-in-binary nam name usr/bin/claws-mail
diff -Nru claws-mail-4.1.0/debian/control claws-mail-4.1.0/debian/control
--- claws-mail-4.1.0/debian/control	2022-04-14 21:00:48.000000000 +0000
+++ claws-mail-4.1.0/debian/control	2022-05-14 14:51:11.000000000 +0000
@@ -3,20 +3,20 @@
 Priority: optional
 Maintainer: Ricardo Mones <mones@debian.org>
 Build-Depends: debhelper-compat (= 13), libcompfaceg1-dev, libsm-dev,
- libgtk-3-dev (>= 3.20), nettle-dev,
+ libgtk-3-dev, nettle-dev,
  libgnutls28-dev, libldap2-dev,
  libnm-dev [linux-any], libdbus-glib-1-dev,
  flex, bison, gettext, libltdl-dev, libtool,
  libenchant-2-dev, libreadline6-dev,
- libetpan-dev (>= 1.5),
- librsvg2-dev (>= 2.40.5),
+ libetpan-dev,
+ librsvg2-dev,
  xsltproc, docbook-xsl, docbook-xml, libsaxon-java, docbook-utils,
  libarchive-dev,
- libgdata-dev (>= 0.17.2),
+ libgdata-dev,
  libnotify-dev, libcanberra-gtk3-dev,
- libpoppler-glib-dev (>= 0.4.2),
- libperl-dev (>= 5.8.0), perl (>= 5.8.0),
- libgpgme-dev (>= 1.1.1),
+ libpoppler-glib-dev,
+ libperl-dev, perl,
+ libgpgme-dev,
  libpython3-dev, python-gi-dev,
  libcurl4-gnutls-dev, libexpat-dev, libkrb5-dev,
  libical-dev,
@@ -33,8 +33,6 @@
 Architecture: any
 Multi-Arch: foreign
 Depends: ${shlibs:Depends}, ${misc:Depends}, xdg-utils
-Breaks: claws-mail-extra-plugins (<< 3.9.1-1)
-Replaces: claws-mail-extra-plugins (<< 3.9.1-1)
 Recommends: claws-mail-i18n, xfonts-100dpi | xfonts-75dpi |
  xfonts-100dpi-transcoded | xfonts-75dpi-transcoded,
  aspell-en | aspell-dictionary
@@ -189,7 +187,7 @@
  claws-mail-feeds-reader,
  claws-mail-fetchinfo-plugin,
  claws-mail-gdata-plugin,
- claws-mial-keyword-warner,
+ claws-mail-keyword-warner,
  claws-mail-libravatar,
  claws-mail-litehtml-viewer,
  claws-mail-mailmbox-plugin,
@@ -202,7 +200,6 @@
  claws-mail-spam-report,
  claws-mail-tnef-parser,
  claws-mail-vcalendar-plugin
-Replaces: claws-mail-extra-plugins (<< 3.9.1-1)
 Enhances: claws-mail
 Description: Extra plugins collection for Claws Mail
  This is a metapackage for installing all extra plugins packages
@@ -218,7 +215,6 @@
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends},
  claws-mail (= ${binary:Version})
-Replaces: claws-mail-acpi-notifier (<< 3.9.1-1)
 Description: Laptop's Mail LED control for Claws Mail
  This plugin for the Claws Mail mailer enables notification
  of new mail using the mail LED available on some portable computer
@@ -229,7 +225,6 @@
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends},
  claws-mail (= ${binary:Version})
-Replaces: claws-mail-address-keeper (<< 3.9.1-1)
 Description: Address keeper plugin for Claws Mail
  This plugin allows saving outgoing addresses to a designated folder
  in the address book. Addresses are saved only if not found in the
@@ -243,7 +238,6 @@
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends},
  claws-mail (= ${binary:Version})
-Replaces: claws-mail-archiver-plugin (<< 3.9.1-1)
 Enhances: claws-mail-vcalendar-plugin
 Description: Archiver plugin for Claws Mail
  This plugin for Claws Mail allows archiving of account's folders (IMAP,
@@ -257,7 +251,6 @@
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends},
  claws-mail (= ${binary:Version})
-Replaces: claws-mail-attach-remover (<< 3.9.1-1)
 Description: Mail attachment remover for Claws Mail
  This plugin for the Claws Mail mailer provides ways to remove unwanted
  attachments from received mails.
@@ -272,7 +265,6 @@
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends},
  claws-mail (= ${binary:Version})
-Replaces: claws-mail-attach-warner (<< 3.9.1-1)
 Description: Missing attachment warnings for Claws Mail
  This plugin for Claws Mail warns the user with a popup window if some
  reference to an attachment is found in the composed mail text but no
@@ -283,7 +275,6 @@
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends},
  claws-mail (= ${binary:Version}) , bsfilter
-Replaces: claws-mail-bsfilter-plugin (<< 3.9.1-1)
 Description: Spam filtering using bsfilter for Claws Mail
  This plugin for Claws Mail allows filtering of spam messages using the
  Bayesian filtering program bsfilter.
@@ -296,7 +287,6 @@
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends},
  claws-mail (= ${binary:Version})
-Replaces: claws-mail-clamd-plugin (<< 3.9.1-1)
 Recommends: clamav
 Description: ClamAV socket-based plugin for Claws Mail
  This plugin uses Clam AntiVirus to scan all messages that are
@@ -314,7 +304,7 @@
 Architecture: any
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends},
- claws-mail (= ${binary:Version}), dillo (>= 3)
+ claws-mail (= ${binary:Version}), dillo
 Description: HTML viewer plugin for Claws Mail using Dillo
  This is an HTML viewer plugin that uses the Dillo browser to render the
  HTML message parts in the Claws Mail message view window.
@@ -344,7 +334,6 @@
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends},
  claws-mail (= ${binary:Version})
-Replaces: claws-mail-feeds-reader (<< 3.9.1-1)
 Description: Feeds (RSS/Atom/RDF) reader plugin for Claws Mail
  The RSSyl plugin provides feeds reading capability for Claws Mail mailer.
  .
@@ -361,7 +350,6 @@
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends},
  claws-mail (= ${binary:Version})
-Replaces: claws-mail-fetchinfo-plugin (<< 3.9.1-1)
 Description: Add X-FETCH headers plugin for Claws Mail
  This plugin for the Claws Mail mailer enables adding useful extra headers
  to the received mails with information like the receiving account or the
@@ -373,7 +361,6 @@
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends},
  claws-mail (= ${binary:Version})
-Replaces: claws-mail-gdata-plugin (<< 3.9.1-1)
 Description: Access to GData (Google services) for Claws Mail
  This plugin provides access to the Google services using the
  GData library.
@@ -426,7 +413,6 @@
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends},
  claws-mail (= ${binary:Version})
-Replaces: claws-mail-newmail-plugin (<< 3.9.1-1)
 Description: New mail logger plugin for Claws Mail
  This plugin for the Claws Mail mailer writes a summary of new messages'
  headers to a log file.
@@ -438,7 +424,6 @@
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends},
  claws-mail (= ${binary:Version})
-Replaces: claws-mail-mailmbox-plugin (<< 3.9.1-1)
 Description: mbox format mailboxes handler for Claws Mail
  The mailMBOX plugin for Claws Mail provides the ability of handling
  existing mbox format files using the libetpan library.
@@ -464,7 +449,6 @@
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends},
  claws-mail (= ${binary:Version})
-Replaces: claws-mail-multi-notifier (<< 3.9.1-1)
 Recommends: notification-daemon
 Suggests: libnotify-bin, xosd-bin, lcdproc
 Description: Various new mail notifiers for Claws Mail
@@ -484,7 +468,6 @@
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends},
  claws-mail (= ${binary:Version})
-Replaces: claws-mail-tnef-parser (<< 3.9.1-1)
 Description: TNEF attachment handler for Claws Mail
  This plugin for Claws Mail allows reading of application/ms-tnef
  attachments. These attachments usually come from Microsoft mailers
@@ -495,7 +478,6 @@
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends},
  claws-mail (= ${binary:Version})
-Replaces: claws-mail-perl-filter (<< 3.9.1-1)
 Description: Message filtering plugin using perl for Claws Mail
  This plugin enables filtering of Claws Mail messages using perl
  regular expressions and, in fact, giving all the perl features and
@@ -509,7 +491,6 @@
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends},
  claws-mail (= ${binary:Version})
-Replaces: claws-mail-pdf-viewer (<< 3.9.1-1)
 Recommends: ghostscript
 Description: PDF and PostScript attachment viewer for Claws Mail
  This plugin allows Claws Mail to view PDF and PostScript files
@@ -536,7 +517,6 @@
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends},
  claws-mail (= ${binary:Version})
-Replaces: claws-mail-spam-report (<< 3.9.1-1)
 Description: Spam reporting plugin for Claws Mail
  This plugin for Claws Mail allows sending reports about spam
  messages received to spam harvesting sites online.
@@ -549,7 +529,6 @@
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends},
  claws-mail (= ${binary:Version})
-Replaces: claws-mail-vcalendar-plugin (<< 3.9.1-1)
 Description: vCalendar message handling plugin for Claws Mail
  The vCalendar plugin for Claws Mail provides vCalendar message
  handling (the meeting subset of the vCalendar format), displaying
diff -Nru claws-mail-4.1.0/debian/source.lintian-overrides claws-mail-4.1.0/debian/source.lintian-overrides
--- claws-mail-4.1.0/debian/source.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ claws-mail-4.1.0/debian/source.lintian-overrides	2022-05-14 14:51:11.000000000 +0000
@@ -0,0 +1,3 @@
+claws-mail source: very-long-line-length-in-source-file
+# These examples are installed by claws-mail-python-plugin package
+claws-mail source: package-does-not-install-examples src/plugins/python/examples/