Merging debian version 3.8.6-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

8 files changed, 174 insertions, 322 deletions

diff --git a/debian/changelog b/debian/changelog
index 87c2bd4..c9922b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+postfix (3.8.6-1) unstable; urgency=medium
+
+  [Scott Kitterman]
+
+  * Remove lib/systemd/system-generators from d/postfix.dirs.  Closes: #1059760
+  * Update with wrap-and-sort
+  * Refactor d/p/Sort-list-of-AUXLIBS-for-reproducible-builds.patch based on
+    upstream feedback
+  * Mark d/p/Sort-list-of-AUXLIBS-for-reproducible-builds.patch as forwarded
+  * Add libnsl-dev to build-depends, split from libc6-dev.  Closes: #1065158
+  * Build-depend on pkgconf instead of obsolete pkg-config
+
+  [localization folks]
+
+  * l10n: Updated Swedish debconf translations. (Martin Bagge, Anders
+    Jonsson).  Closes: #1061564
+
+  [Wietse Venema]
+
+  * 3.8.6
+
+ -- Scott Kitterman <scott@kitterman.com>  Tue, 05 Mar 2024 10:24:36 -0500
+
 postfix (3.8.5-1~progress7.99u1) graograman-backports; urgency=medium
 
   * Initial reupload to graograman-backports.
diff --git a/debian/control b/debian/control
index cacb9a8..450f54e 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,28 @@ Bugs: mailto:maintainers@lists.progress-linux.org
 Standards-Version: 4.6.2
 Rules-Requires-Root: no
 Homepage: https://www.postfix.org
-Build-Depends: debhelper-compat (= 13), po-debconf (>= 0.5.0), groff-base, patch, pkg-config, lsb-release, libdb-dev (>=4.6.19), libldap-dev, liblmdb-dev, libpcre2-dev, default-libmysqlclient-dev, libssl-dev (>=1.0.2), libsasl2-dev, libpq-dev, libcdb-dev, dpkg-dev (>= 1.16.1~), libsqlite3-dev, html2text, txt2man, libicu-dev, systemd-dev
+Build-Depends: debhelper-compat (= 13),
+               default-libmysqlclient-dev,
+               dpkg-dev (>= 1.16.1~),
+               groff-base,
+               html2text,
+               libcdb-dev,
+               libdb-dev (>=4.6.19),
+               libicu-dev,
+               libldap-dev,
+               liblmdb-dev,
+               libnsl-dev | libc6-dev (<<2.37-15.1),
+               libpcre2-dev,
+               libpq-dev,
+               libsasl2-dev,
+               libsqlite3-dev,
+               libssl-dev (>=1.0.2),
+               lsb-release,
+               patch,
+               pkgconf,
+               po-debconf (>= 0.5.0),
+               systemd-dev,
+               txt2man
 Vcs-Browser: https://git.progress-linux.org/packages/graograman-backports/postfix
 Vcs-Git: https://git.progress-linux.org/packages/graograman-backports/postfix
 XSBC-Original-Vcs-Browser: https://salsa.debian.org/postfix-team/postfix-dev
@@ -18,10 +39,31 @@ XSBC-Original-Vcs-Git: https://salsa.debian.org/postfix-team/postfix-dev.git
 Package: postfix
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}, netbase, adduser (>=3.48), dpkg (>= 1.8.3), ssl-cert, cpio, e2fsprogs
+Depends: adduser (>=3.48),
+         cpio,
+         dpkg (>= 1.8.3),
+         e2fsprogs,
+         netbase,
+         ssl-cert,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Replaces: mail-transport-agent
-Recommends: python3, ca-certificates
-Suggests: procmail, postfix-mysql, postfix-pgsql, postfix-ldap, postfix-pcre, postfix-lmdb, postfix-sqlite, sasl2-bin | dovecot-common, libsasl2-modules | dovecot-common, resolvconf, postfix-cdb, mail-reader, postfix-mta-sts-resolver, ufw, postfix-doc
+Recommends: ca-certificates, python3
+Suggests: libsasl2-modules | dovecot-common,
+          mail-reader,
+          postfix-cdb,
+          postfix-doc,
+          postfix-ldap,
+          postfix-lmdb,
+          postfix-mta-sts-resolver,
+          postfix-mysql,
+          postfix-pcre,
+          postfix-pgsql,
+          postfix-sqlite,
+          procmail,
+          resolvconf,
+          sasl2-bin | dovecot-common,
+          ufw
 Conflicts: mail-transport-agent, smail
 Provides: mail-transport-agent, ${postfix:Provides}
 Description: High-performance mail transport agent
@@ -29,7 +71,7 @@ Description: High-performance mail transport agent
 
 Package: postfix-ldap
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, postfix (= ${binary:Version})
+Depends: postfix (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: LDAP map support for Postfix
  ${Description}
  .
@@ -38,7 +80,10 @@ Description: LDAP map support for Postfix
 
 Package: postfix-lmdb
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, liblmdb0 (>=0.9.14), postfix (= ${binary:Version})
+Depends: liblmdb0 (>=0.9.14),
+         postfix (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: LMDB map support for Postfix
  ${Description}
  .
@@ -47,7 +92,7 @@ Description: LMDB map support for Postfix
 
 Package: postfix-cdb
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, postfix (= ${binary:Version})
+Depends: postfix (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: CDB map support for Postfix
  ${Description}
  .
@@ -56,7 +101,7 @@ Description: CDB map support for Postfix
 
 Package: postfix-pcre
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, postfix (= ${binary:Version})
+Depends: postfix (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: PCRE map support for Postfix
  ${Description}
  .
@@ -65,7 +110,7 @@ Description: PCRE map support for Postfix
 
 Package: postfix-mysql
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, postfix (= ${binary:Version})
+Depends: postfix (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: MySQL map support for Postfix
  ${Description}
  .
@@ -74,7 +119,7 @@ Description: MySQL map support for Postfix
 
 Package: postfix-pgsql
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, postfix (= ${binary:Version})
+Depends: postfix (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: PostgreSQL map support for Postfix
  ${Description}
  .
@@ -83,7 +128,7 @@ Description: PostgreSQL map support for Postfix
 
 Package: postfix-sqlite
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, postfix (= ${binary:Version})
+Depends: postfix (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: SQLite map support for Postfix
  ${Description}
  .
diff --git a/debian/copyright b/debian/copyright
index b2cb0fe..ce64cc0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -284,8 +284,8 @@ No third-party beneficiary rights are created under this Agreement.
 
 Exhibit A - Form of Secondary Licenses Notice
 
-"This Source Code may also be made available under the following 
-Secondary Licenses when the conditions for such availability set forth 
+"This Source Code may also be made available under the following
+Secondary Licenses when the conditions for such availability set forth
 in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
 version(s), and exceptions or additional permissions here}."
 
@@ -307,20 +307,20 @@ PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
 
 1.  DEFINITIONS
 
-"Contribution" means:  
-    a) in the case of International Business Machines Corporation ("IBM"), 
-       the Original Program, and 
-    b) in the case of each Contributor, 
+"Contribution" means:
+    a) in the case of International Business Machines Corporation ("IBM"),
+       the Original Program, and
+    b) in the case of each Contributor,
        i)  changes to the Program, and
        ii) additions to the Program;
            where such changes and/or additions to the Program originate
-           from and are distributed by that particular Contributor.  
-           A Contribution 'originates' from a Contributor if it was added 
-           to the Program by such Contributor itself or anyone acting on 
-           such Contributor's behalf.  
+           from and are distributed by that particular Contributor.
+           A Contribution 'originates' from a Contributor if it was added
+           to the Program by such Contributor itself or anyone acting on
+           such Contributor's behalf.
     Contributions do not include additions to the Program which:
-       (i)  are separate modules of software distributed in conjunction 
-            with the Program under their own license agreement, and 
+       (i)  are separate modules of software distributed in conjunction
+            with the Program under their own license agreement, and
        (ii) are not derivative works of the Program.
 
 "Contributor" means IBM and any other entity that distributes the Program.
@@ -335,7 +335,7 @@ and documentation, if any.
 
 "Program" means the Original Program and Contributions.
 
-"Recipient" means anyone who receives the Program under this Agreement, 
+"Recipient" means anyone who receives the Program under this Agreement,
 including all Contributors.
 
 2.  GRANT OF RIGHTS
@@ -379,7 +379,7 @@ including all Contributors.
 
 3.  REQUIREMENTS
 
-A Contributor may choose to distribute the Program in object code form 
+A Contributor may choose to distribute the Program in object code form
 under its own license agreement, provided that:
     a) it complies with the terms and conditions of this Agreement; and
     b) its license agreement:
@@ -388,31 +388,31 @@ under its own license agreement, provided that:
             warranties or conditions of title and non-infringement, and
             implied warranties or conditions of merchantability and fitness
             for a particular purpose;
-       ii)  effectively excludes on behalf of all Contributors all 
-            liability for damages, including direct, indirect, special, 
-            incidental and consequential damages, such as lost profits; 
-       iii) states that any provisions which differ from this Agreement 
-            are offered by that Contributor alone and not by any other 
+       ii)  effectively excludes on behalf of all Contributors all
+            liability for damages, including direct, indirect, special,
+            incidental and consequential damages, such as lost profits;
+       iii) states that any provisions which differ from this Agreement
+            are offered by that Contributor alone and not by any other
             party; and
-       iv)  states that source code for the Program is available from 
-            such Contributor, and informs licensees how to obtain it in a 
-            reasonable manner on or through a medium customarily used for 
-            software exchange. 
+       iv)  states that source code for the Program is available from
+            such Contributor, and informs licensees how to obtain it in a
+            reasonable manner on or through a medium customarily used for
+            software exchange.
 
 When the Program is made available in source code form:
-    a) it must be made available under this Agreement; and 
-    b) a copy of this Agreement must be included with each copy of the 
-       Program.  
+    a) it must be made available under this Agreement; and
+    b) a copy of this Agreement must be included with each copy of the
+       Program.
 
-Each Contributor must include the following in a conspicuous location 
-in the Program: 
+Each Contributor must include the following in a conspicuous location
+in the Program:
 
     Copyright (c) 1997,1998,1999, International Business Machines
     Corporation and others. All Rights Reserved.
 
 In addition, each Contributor must identify itself as the originator of
 its Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution. 
+Recipients to identify the originator of the Contribution.
 
 4.  COMMERCIAL DISTRIBUTION
 
@@ -433,10 +433,10 @@ product offering.  The obligations in this section do not apply to any
 claims or Losses relating to any actual or alleged intellectual property
 infringement.  In order to qualify, an Indemnified Contributor must:
     a) promptly notify the Commercial Contributor in writing of such claim,
-and 
+and
     b) allow the Commercial Contributor to control, and cooperate with
-       the Commercial Contributor in, the defense and any related 
-       settlement negotiations.  The Indemnified Contributor may 
+       the Commercial Contributor in, the defense and any related
+       settlement negotiations.  The Indemnified Contributor may
        participate in any such claim at its own expense.
 
 For example, a Contributor might include the Program in a commercial
@@ -461,7 +461,7 @@ the appropriateness of using and distributing the Program and assumes
 all risks associated with its exercise of rights under this Agreement,
 including but not limited to the risks and costs of program errors,
 compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. 
+equipment, and unavailability or interruption of operations.
 
 6.  DISCLAIMER OF LIABILITY
 
@@ -500,7 +500,7 @@ becoming aware of such noncompliance.  If all Recipient's rights under
 this Agreement terminate, Recipient agrees to cease use and distribution
 of the Program as soon as reasonably practicable.  However, Recipient's
 obligations under this Agreement and any licenses granted by Recipient
-relating to the Program shall continue and survive. 
+relating to the Program shall continue and survive.
 
 IBM may publish new versions (including revisions) of this Agreement
 from time to time.  Each new version of the Agreement will be given a
@@ -519,7 +519,7 @@ This Agreement is governed by the laws of the State of New York and the
 intellectual property laws of the United States of America. No party to
 this Agreement will bring a legal action under this Agreement more than
 one year after the cause of action arose.  Each party waives its rights
-to a jury trial in any resulting litigation. 
+to a jury trial in any resulting litigation.
 
 The following license applies to examples/chroot-setup/LINUX2:
 
diff --git a/debian/patches/Sort-list-of-AUXLIBS-for-reproducible-builds.patch b/debian/patches/Sort-list-of-AUXLIBS-for-reproducible-builds.patch
index 6046dd0..3532879 100644
--- a/debian/patches/Sort-list-of-AUXLIBS-for-reproducible-builds.patch
+++ b/debian/patches/Sort-list-of-AUXLIBS-for-reproducible-builds.patch
@@ -2,20 +2,30 @@ From: =?utf-8?q?Christian_G=C3=B6ttsche?= <cgzones@googlemail.com>
 Date: Mon, 1 Jan 2024 19:45:09 +0100
 Subject: Sort list of AUXLIBS for reproducible builds
 
+Forwarded: https://www.mail-archive.com/postfix-users@postfix.org/msg101292.html
 ---
  makedefs | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/makedefs b/makedefs
-index d9dc529..2b376b3 100644
---- a/makedefs
-+++ b/makedefs
-@@ -211,7 +211,7 @@ echo "#----------------------------------------------------------------"
+Index: postfix/makedefs
+===================================================================
+--- postfix.orig/makedefs
++++ postfix/makedefs
+@@ -184,6 +184,8 @@
+ #	New York, NY 10011, USA
+ #--
+ 
++LC_ALL=C; export LC_ALL
++
+ # By now all shells must have functions.
+ 
+ error() {
+@@ -211,7 +213,7 @@ echo "#---------------------------------
  echo "# Start of summary of user-configurable 'make makefiles' options."
  echo "# CCARGS=$CCARGS"
  echo "# AUXLIBS=$AUXLIBS"
 -env | grep '^AUXLIBS_' | sed 's/^/# /'
-+env | grep '^AUXLIBS_' | sed 's/^/# /' | LC_ALL=C sort
++env | grep '^AUXLIBS_' | sed 's/^/# /' | sort
  echo "# shared=$shared"
  echo "# dynamicmaps=$dynamicmaps"
  echo "# pie=$pie"
diff --git a/debian/po/sv.po b/debian/po/sv.po
index e0a80b1..261368b 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -1,22 +1,21 @@
 # Translation of Postfix debconf template to Swedish
-# Copyright (C) 2012-2017 Martin Bagge <brother@bsnet.se>
+# Copyright (C) 2024 Martin Bagge <brother@persilja.net>
 # This file is distributed under the same license as the postfix package.
 #
 # Martin Ågren <martin.agren@gmail.com>, 2008.
-# Martin Bagge <brother@bsnet.se>, 2012, 2013, 2017
+# Martin Bagge <brother@persilja.net>, 2012, 2013, 2017, 2024
 msgid ""
 msgstr ""
 "Project-Id-Version: postfix_2.5.2-2_sv\n"
 "Report-Msgid-Bugs-To: postfix@packages.debian.org\n"
 "POT-Creation-Date: 2023-06-30 20:49-0400\n"
-"PO-Revision-Date: 2017-01-02 10:53+0100\n"
-"Last-Translator: Martin Bagge / brother <brother@bsnet.se>\n"
+"PO-Revision-Date: 2024-01-26 15:27+0100\n"
+"Last-Translator: Martin Bagge / brother <brother@persilja.net>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.11\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Type: boolean
@@ -50,8 +49,6 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../templates:1001
-#, fuzzy
-#| msgid "Please choose whether you want to keep that choice anyway."
 msgid "Please check and confirm if you want to keep your entry."
 msgstr "Välj huruvida du vill behålla valet ändå."
 
@@ -118,10 +115,8 @@ msgstr "Endast lokalt"
 #. Type: select
 #. Description
 #: ../templates:2002
-#, fuzzy
-#| msgid "General type of mail configuration:"
 msgid "General mail configuration type:"
-msgstr "Allmän typ av e-postkonfiguration:"
+msgstr "Typ av e-postkonfiguration:"
 
 #. Type: select
 #. Description
@@ -134,21 +129,6 @@ msgstr ""
 #. Type: select
 #. Description
 #: ../templates:2002
-#, fuzzy
-#| msgid ""
-#| " No configuration:\n"
-#| "  Should be chosen to leave the current configuration unchanged.\n"
-#| " Internet site:\n"
-#| "  Mail is sent and received directly using SMTP.\n"
-#| " Internet with smarthost:\n"
-#| "  Mail is received directly using SMTP or by running a utility such\n"
-#| "  as fetchmail. Outgoing mail is sent using a smarthost.\n"
-#| " Satellite system:\n"
-#| "  All mail is sent to another machine, called a 'smarthost', for "
-#| "delivery.\n"
-#| " Local only:\n"
-#| "  The only delivered mail is the mail for local users. There is no "
-#| "network."
 msgid ""
 " No configuration:\n"
 "  Should be chosen to leave the current configuration unchanged.\n"
@@ -195,8 +175,8 @@ msgid ""
 " - Running 'service postfix start'."
 msgstr ""
 "Du har valt \"Ingen konfiguration\". Postfix kommer inte att konfigureras "
-"och kommer som standard inte att starta upp. Kör \"dpkg-reconfigure postfix"
-"\" vid ett senare tillfälle eller konfigurera det själv genom att:\n"
+"och kommer som standard inte att starta upp. Kör \"dpkg-reconfigure "
+"postfix\" vid ett senare tillfälle eller konfigurera det själv genom att:\n"
 " - Redigera /etc/postfix/main.cf för att passa dina behov;\n"
 " - Köra \"service postfix start\"."
 
@@ -209,12 +189,6 @@ msgstr "Systemets e-postnamn:"
 #. Type: string
 #. Description
 #: ../templates:4001
-#, fuzzy
-#| msgid ""
-#| "The \"mail name\" is the domain name used to \"qualify\" _ALL_ mail "
-#| "addresses without a domain name. This includes mail to and from <root>: "
-#| "please do not make your machine send out mail from root@example.org "
-#| "unless root@example.org has told you to."
 msgid ""
 "The 'mail name' is the domain name used to 'qualify' _ALL_ mail addresses "
 "without a domain name. This includes mail to and from <root>: please do not "
@@ -246,7 +220,7 @@ msgid ""
 "value for this option would be example.org."
 msgstr ""
 "Följaktligen, om en e-postadress på den lokala maskinen är foo@example.org, "
-"skulle det korrekta värde för den här inställning vara example.org."
+"skulle det korrekta värdet för den här inställningen vara example.org."
 
 #. Type: string
 #. Description
@@ -280,7 +254,7 @@ msgid ""
 "the form [destination] to turn off MX lookups. Leave this blank for no relay "
 "host."
 msgstr ""
-"Ange en domän, värd, värd:port,  [adress] eller [adress]:port. Använd "
+"Ange en domän, värd, värd:port, [adress] eller [adress]:port. Använd "
 "formatet [destination] för att stänga av MX-uppslag. Lämna blank för att "
 "inte använda en vidaresändningsvärd."
 
@@ -293,19 +267,15 @@ msgstr "Ange inte fler än en värd."
 #. Type: string
 #. Description
 #: ../templates:6001
-#, fuzzy
-#| msgid ""
-#| "The relayhost parameter specifies the default host to send mail to when "
-#| "no entry is matched in the optional transport(5) table. When no relay "
-#| "host is given, mail is routed directly to the destination."
 msgid ""
 "The relayhost parameter specifies the default external host to send mail to "
 "when no entry is matched in the optional transport(5) table. When no relay "
 "host is given, mail is routed directly to the destination."
 msgstr ""
-"Parametern \"relayhost\" (relävärd) anger den standardvärd som post ska "
-"skickas till när ingen post matchas i den valfria transport(5)-tabellen. När "
-"ingen relävärd angivits kommer post att skickas direkt till destinationen."
+"Parametern \"relayhost\" (relävärd) anger den externa standardvärd som post "
+"ska skickas till när ingen post matchas i den valfria transport(5)-tabellen. "
+"När ingen relävärd angivits kommer post att skickas direkt till "
+"destinationen."
 
 #. Type: boolean
 #. Description
@@ -387,15 +357,12 @@ msgstr "Tecken för lokala adressutökningar:"
 #. Type: string
 #. Description
 #: ../templates:9001
-#, fuzzy
-#| msgid ""
-#| "Please choose the character that will be used to define a local address "
-#| "extension."
 msgid ""
 "Please choose a character used as recipient delimiter that will indicate a "
 "local address extension."
 msgstr ""
-"Välj det tecken som ska användas för att definiera en lokal adressutökning."
+"Välj ett tecken som ska användas för att skilja mottagare åt vilket kommer "
+"att användas för att definiera en \"lokal adressutökning\"."
 
 #. Type: string
 #. Description
@@ -474,10 +441,6 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../templates:12001
-#, fuzzy
-#| msgid ""
-#| "To use the postfix default (which is based on the connected subnets), "
-#| "leave this blank."
 msgid ""
 "To use the Postfix default (which is based on the connected subnets), leave "
 "this blank."
@@ -494,28 +457,23 @@ msgstr "Storleksgräns för postlåda (i byte):"
 #. Type: string
 #. Description
 #: ../templates:13001
-#, fuzzy
-#| msgid ""
-#| "Please specify the limit that Postfix should place on mailbox files to "
-#| "prevent runaway software errors. A value of zero (0) means no limit. The "
-#| "upstream default is 51200000."
 msgid ""
 "Please specify the limit that Postfix should place on mailbox files to "
 "constrain file system usage by a single file (potentially due to abusive "
 "mail or software errors). A value of zero (0) means no limit. The upstream "
 "default is 51200000."
 msgstr ""
-"Vilken gräns ska Postfix sätta på postlådefiler för att förhindra att "
-"programvarufel skriver för mycket data. Ett värde på noll (0) betyder att "
-"det inte finns någon gräns. Standard från utvecklarna är 51200000."
+"Ange gräns som Postfix sätter på postlådefiler för att förhindra för hög "
+"användning av filsystemets resurser av en enskild fil (eventuellt orsakat av "
+"oredlig användning av e-post eller från mjukvarufel). Ett värde på noll (0) "
+"betyder att det inte finns någon gräns. Standard från utvecklarna är "
+"51200000."
 
 #. Type: string
 #. Description
 #: ../templates:14001
-#, fuzzy
-#| msgid "Root and postmaster mail recipient:"
 msgid "Recipient for root and postmaster mail:"
-msgstr "E-postmottagare för root och postmaster:"
+msgstr "Mottagare för meddelanden till root och postmaster:"
 
 #. Type: string
 #. Description
@@ -547,204 +505,16 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../templates:14001
-#, fuzzy
-#| msgid ""
-#| "If you already have a /etc/aliases file and it does not have an entry for "
-#| "root, then you should add this entry.  Leave this blank to not add one."
 msgid ""
 "If you already have a /etc/aliases file and it does not have an entry for "
 "root, then you should add this entry. Leave this blank to not add one."
 msgstr ""
 "Om du redan har filen /etc/aliases och den saknar instruktioner för root ska "
-"detta läggas till. Lämna den blank för att inte lägga till någon instruktion."
+"detta läggas till. Lämna detta blankt för att inte lägga till någon "
+"instruktion."
 
 #. Type: boolean
 #. Description
 #: ../templates:15001
 msgid "Run newaliases command?"
-msgstr ""
-
-#, fuzzy
-#~| msgid "Update configuration to avoid compatibility warnings"
-#~ msgid "Update configuration to avoid compatibility warnings?"
-#~ msgstr "Uppdatera inställningar för att undvika kompatibilitetsvarningar"
-
-#, fuzzy
-#~| msgid ""
-#~| "This upgrade of postfix changes some default values in the "
-#~| "configuration. As part of this upgrade, the following will be changed: "
-#~| "(1) chrooted components will be changed from '-' to 'y' in master.cf, "
-#~| "and (2) myhostname will be set to a fully-qualified domain name if it is "
-#~| "not already such.  The install will be aborted if you do not allow the "
-#~| "change."
-#~ msgid ""
-#~ "This upgrade of Postfix changes some default values in the configuration. "
-#~ "As part of this upgrade, the following will be changed: (1) chrooted "
-#~ "components will be changed from '-' to 'y' in master.cf, and (2) "
-#~ "myhostname will be set to a fully-qualified domain name if it is not "
-#~ "already such. The install will be aborted if you do not allow the change."
-#~ msgstr ""
-#~ "Denna version av postfix ändrar några standardvärden i inställningarna. "
-#~ "Som del i denna uppgradering kommer följande att ändras: (1) chrootade "
-#~ "komponenter kommer att ändras från \"-\" till \"y\" i master.cf och (2) "
-#~ "myhostname kommer att sättas till ett komplett kvalificerat domännamn om "
-#~ "det inte redan är ett sådant. Installationen kommer att avbrytas om du "
-#~ "inte tillåter ändringarna."
-
-#, fuzzy
-#~| msgid "Update main.cf for daemon_directory change"
-#~ msgid "Update main.cf for daemon_directory change?"
-#~ msgstr "Uppdatera main.cf för ändringen av daemon_directory"
-
-#, fuzzy
-#~| msgid ""
-#~| "This upgrade of postfix changes where daemons are located, and your "
-#~| "postfix configuration explicitly specifies the old location.  The "
-#~| "install will be aborted if you do not allow the change."
-#~ msgid ""
-#~ "This upgrade of Postfix changes where daemons are located, and your "
-#~ "Postfix configuration explicitly specifies the old location. The install "
-#~ "will be aborted if you do not allow the change."
-#~ msgstr ""
-#~ "Denna uppgradering av postfix ändrar var tjänster installeras och dina "
-#~ "inställningar pekar ut den gamla positionen. Installationen avbryts om du "
-#~ "inte tillåter förändringen."
-
-#, fuzzy
-#~| msgid "Update dynamicmaps.cf for 3.0"
-#~ msgid "Update dynamicmaps.cf for 3.0?"
-#~ msgstr "Uppdatera dynamicmaps.cf för 3.0"
-
-#, fuzzy
-#~| msgid ""
-#~| "Postfix version 3.0 changes how dynamic maps are delivered, and your "
-#~| "dynamicmaps.cf does not reflect that.  Accept this option to convert "
-#~| "dynamicmaps.cf to the version required for 3.0."
-#~ msgid ""
-#~ "Postfix version 3.0 changes how dynamic maps are delivered, and your "
-#~ "dynamicmaps.cf does not reflect that. Accept this option to convert "
-#~ "dynamicmaps.cf to the version required for 3.0."
-#~ msgstr ""
-#~ "Postfix version 3.0 har ändrat hur dynamisk mappning levereras och din "
-#~ "dynamicmaps.cf återspeglar inte detta. Automatisk konvertering av "
-#~ "dynamicmaps.cf till version 3.0 kan genomföras."
-
-#~ msgid "Add a 'mydomain' entry in main.cf for upgrade?"
-#~ msgstr "Lägg till en \"mydomain\"-post i main.cf inför uppgraderingen?"
-
-#~ msgid ""
-#~ "Postfix version 2.3.3-2 and later require changes in main.cf. "
-#~ "Specifically, mydomain must be specified, since hostname(1) is not a "
-#~ "fully qualified domain name (FQDN)."
-#~ msgstr ""
-#~ "Postfix version 2.3.3-2 och senare kräver ändringar i main.cf. Specifikt "
-#~ "måste \"mydomain\" anges eftersom hostname(1) inte är ett fullständigt "
-#~ "kvalificerat domännamn (FQDN)."
-
-#~ msgid ""
-#~ "Failure to fix this will result in a broken mailer. Decline this option "
-#~ "to abort the upgrade, giving you the opportunity to add this "
-#~ "configuration yourself. Accept this option to automatically set mydomain "
-#~ "based on the FQDN of the machine."
-#~ msgstr ""
-#~ "Om inte du rättar till dessa felaktigheter kommer e-postsystemet inte att "
-#~ "fungera korrekt. Vägra denna inställning för att avbryta uppgraderingen "
-#~ "och ge dig möjligheten att lägga till denna konfiguration själv.  "
-#~ "Acceptera inställningen för att automatiskt ställa in \"mydomain\" "
-#~ "baserat på FQDN för maskinen."
-
-#~ msgid "Set smtpd_relay_restrictions in main.cf for upgrade?"
-#~ msgstr "Ska smtpd_relay_restrictions i main.cf ställas in för uppgradering?"
-
-#~ msgid ""
-#~ "Postfix version 2.10 adds smtpd_relay_restrictions, to separate relaying "
-#~ "restrictions from recipient restrictions, and you have a non-default "
-#~ "value for smtpd_recipient_restrictions."
-#~ msgstr ""
-#~ "Postfix version 2.10 lägger till smtpd_relay_restrictions för att "
-#~ "separera restriktioner för vidaresändning och mottagare. Det här systemet "
-#~ "har ett ickestandardiserat värde för smtpd_recipient_restrictions."
-
-#~ msgid ""
-#~ "Failure to do this may result in deferred or bounced mail after the "
-#~ "upgrade.  Accept this option to set smtpd_relay_restrictions equal to "
-#~ "smtpd_recipient_restrictions."
-#~ msgstr ""
-#~ "Om detta inte justeras kan det innebära att e-post-meddelanden avvisas "
-#~ "eller studsar efter uppgraderingen. Aktivera detta alternativ för att "
-#~ "ange samma värde för smtpd_relay_restrictions som för "
-#~ "smtpd_recipient_restrictions."
-
-#, fuzzy
-#~| msgid ""
-#~| "This upgrade of postfix changes where daemons are located, and your "
-#~| "postfix configuration explicitly specifies the old location.  The "
-#~| "install will be aborted if you do not allow the change."
-#~ msgid ""
-#~ "This upgrade of postfix drops the \"lmtp\" symlink, and your "
-#~ "configuration (master.cf) refers to it: lmtp was merged into smtp long "
-#~ "ago.  The install will be aborted if you do not allow the change."
-#~ msgstr ""
-#~ "Denna uppgradering av postfix ändrar var tjänster installeras och dina "
-#~ "inställningar pekar ut den gamla positionen. Installationen avbryts om du "
-#~ "inte tillåter förändringen."
-
-#~ msgid "Add 'sqlite' entry to dynamicmaps.cf?"
-#~ msgstr "Ska \"sqlite\" läggas till i dynamicmaps.cf?"
-
-#~ msgid ""
-#~ "Postfix version 2.9 adds sqlite support to maps, but your dynamicmaps.cf "
-#~ "does not reflect that.  Accept this option to add support for sqlite maps."
-#~ msgstr ""
-#~ "Postfix version 2.0 lägger till stöd för sqlite-mappning men filen "
-#~ "dynamicmaps.cf visar inte detta. Godkänn detta alternativ för att lägga "
-#~ "till stöd för sqlite-mappning."
-
-#~ msgid "Install postfix despite an unsupported kernel?"
-#~ msgstr "Installera postfix även om kärnan inte stöds?"
-
-#~ msgid ""
-#~ "Postfix uses features that are not found in kernels prior to 2.6. If you "
-#~ "proceed with the installation, Postfix will not run."
-#~ msgstr ""
-#~ "Postfix använder funktioner som inte finns i kärnor före version 2.6. Om "
-#~ "du fortsätter med installationen kommer Postfix inte att kunna starta."
-
-#~ msgid "Correct retry entry in master.cf for upgrade?"
-#~ msgstr "Korrigera återförsöksposten i master.cf inför uppgradering?"
-
-#~ msgid ""
-#~ "Postfix version 2.4 requires that the retry service be added to master.cf."
-#~ msgstr ""
-#~ "Postfix version 2.4 och senare kräver att återförsöksposten läggs till i "
-#~ "master.cf."
-
-#~ msgid ""
-#~ "Failure to fix this will result in a broken mailer. Decline this option "
-#~ "to abort the upgrade, giving you the opportunity to add this "
-#~ "configuration yourself. Accept this option to automatically make master."
-#~ "cf compatible with Postfix 2.4 in this respect."
-#~ msgstr ""
-#~ "Om du inte rättar till dessa felaktigheter kommer e-postsystemet inte att "
-#~ "fungera korrekt. Vägra denna inställning för att avbryta uppgraderingen "
-#~ "och få möjlighet att lägga till denna konfiguration själv.  Acceptera "
-#~ "inställningen för att automatiskt göra master.cf kompatibel med Postfix "
-#~ "2.4 i det här avseendet."
-
-#~ msgid "Correct tlsmgr entry in master.cf for upgrade?"
-#~ msgstr "Korrigera tlsmgr-posten i master.cf inför uppgradering?"
-
-#~ msgid "Postfix version 2.2 has changed the invocation of tlsmgr."
-#~ msgstr "Postfix version 2.2 har ändringar i uppstarten av tlsmgr."
-
-#~ msgid ""
-#~ "Failure to fix this will result in a broken mailer. Decline this option "
-#~ "to abort the upgrade, giving you the opportunity to add this "
-#~ "configuration yourself. Accept this option to automatically make master."
-#~ "cf compatible with Postfix 2.2 in this respect."
-#~ msgstr ""
-#~ "Om inte du rättar till dessa felaktigheter kommer e-postsystemet inte att "
-#~ "fungera korrekt. Vägra denna inställning för att avbryta uppgraderingen "
-#~ "och ge dig möjligheten att lägga till denna konfiguration själv.  "
-#~ "Acceptera inställningen för att automatiskt göra master.cf kompatibel med "
-#~ "Postfix 2.2 i det här avseendet."
+msgstr "Ska newaliases-kommandot köras?"
diff --git a/debian/postfix-doc.dirs b/debian/postfix-doc.dirs
index 20ab72b..abb83eb 100644
--- a/debian/postfix-doc.dirs
+++ b/debian/postfix-doc.dirs
@@ -1,4 +1,4 @@
 usr/share/doc/postfix
-usr/share/doc/postfix/html
-usr/share/doc/postfix/examples
 usr/share/doc/postfix-doc
+usr/share/doc/postfix/examples
+usr/share/doc/postfix/html
diff --git a/debian/postfix.dirs b/debian/postfix.dirs
index f9e42cc..149abcc 100644
--- a/debian/postfix.dirs
+++ b/debian/postfix.dirs
@@ -1,37 +1,36 @@
 DEBIAN
 etc/init.d
 etc/insserv.conf.d
-etc/ppp/ip-up.d
-etc/ppp/ip-down.d
-etc/network/if-up.d
 etc/network/if-down.d
-usr/lib/networkd-dispatcher/routable.d
-usr/lib/networkd-dispatcher/off.d
+etc/network/if-up.d
+etc/postfix
 etc/postfix/dynamicmaps.cf.d
 etc/postfix/postfix-files.d
 etc/postfix/sasl
+etc/ppp/ip-down.d
+etc/ppp/ip-up.d
+etc/resolvconf/update-libc.d
 etc/rsyslog.d
 etc/ufw/applications.d
 usr/bin
-usr/sbin
+usr/lib/networkd-dispatcher/off.d
+usr/lib/networkd-dispatcher/routable.d
 usr/lib/postfix
 usr/lib/postfix/sbin
+usr/sbin
 usr/share/doc/postfix
+usr/share/lintian/overrides
 usr/share/man/man1
 usr/share/man/man5
 usr/share/man/man8
-usr/share/lintian/overrides
 usr/share/postfix
-etc/postfix
-etc/resolvconf/update-libc.d
+var/lib/postfix
+var/log
 var/spool/postfix
 var/spool/postfix/dev
 var/spool/postfix/etc
 var/spool/postfix/lib
 var/spool/postfix/usr
 var/spool/postfix/usr/lib
-var/spool/postfix/usr/lib/zoneinfo
 var/spool/postfix/usr/lib/sasl2
-var/log
-var/lib/postfix
-lib/systemd/system-generators
+var/spool/postfix/usr/lib/zoneinfo
diff --git a/debian/tests/control b/debian/tests/control
index 0560b7e..63dcbb8 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,8 @@
 Tests: postfix
-Depends: procmail, sasl2-bin, python3-pexpect, lsb-release, python3, libsasl2-modules
+Depends: libsasl2-modules,
+         lsb-release,
+         procmail,
+         python3,
+         python3-pexpect,
+         sasl2-bin
 Restrictions: needs-root