Merge ~mitchdz/ubuntu/+source/at:merge-at-lp2040367-noble into ubuntu/+source/at:debian/sid

[Mitchell Dzurick]

PPA - https://launchpad.net/~mitchdz/+archive/ubuntu/merge-at-lp2040367-noble

[Mitchell Dzurick (mitchdz)]

Autopkgtests ran

* Results:
  - at/3.2.5-2.1ubuntu1~noble1
    + ✅ at on noble for amd64 @ 16.02.24 20:20:27
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-noble-mitchdz-merge-at-lp2040367-noble/noble/amd64/a/at/20240216_202027_43f4a@/log.gz
    + ✅ at on noble for arm64 @ 16.02.24 20:18:04
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-noble-mitchdz-merge-at-lp2040367-noble/noble/arm64/a/at/20240216_201804_49434@/log.gz
    + ✅ at on noble for armhf @ 16.02.24 20:17:01
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-noble-mitchdz-merge-at-lp2040367-noble/noble/armhf/a/at/20240216_201701_dc2c2@/log.gz
    + ✅ at on noble for ppc64el @ 16.02.24 20:17:11
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-noble-mitchdz-merge-at-lp2040367-noble/noble/ppc64el/a/at/20240216_201711_402e1@/log.gz

[Bryce Harrington (bryce)]

Thanks, just one minor fix needed.

review: Needs Fixing

[Mitchell Dzurick (mitchdz)]

Thanks a ton Bryce! I was curious about that, and saw a few other random merges kept the : in so I figured that's just the way we like to do it.

[Mitchell Dzurick (mitchdz)]

Fixed the changelog in this branch. Not rebuilding in my PPA for that change.

[Bryce Harrington (bryce)]

Thanks, I've sponsored the upload, sorry I didn't notice this was ready until now.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index a749851..e2f5874 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+at (3.2.5-2.1ubuntu1) noble; urgency=medium
+
+  * Merge with Debian unstable (LP: #2040367). Remaining changes:
+    - Replace Recommends on "default-mta | mail-transport-agent" with
+      Suggests to prevent this seeded package from pulling in an MTA on
+      Ubuntu by default (LP #1968874).
+
+ -- Mitchell Dzurick <[e-mail]>  Fri, 09 Feb 2024 16:07:33 -0700
+
 at (3.2.5-2.1) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -13,6 +22,14 @@ at (3.2.5-2) unstable; urgency=medium
 
  -- Jose M Calhariz <[e-mail]>  Sun, 25 Jun 2023 22:46:36 +0100
 
+at (3.2.5-1ubuntu1) jammy; urgency=medium
+
+  * Replace Recommends on "default-mta | mail-transport-agent" with
+    Suggests to prevent this seeded package from pulling in an MTA on
+    Ubuntu by default (LP: #1968874).
+
+ -- Robie Basak <[e-mail]>  Thu, 14 Apr 2022 01:23:36 +0100
+
 at (3.2.5-1) unstable; urgency=medium
 
   * Fix: atd forgets to run a job in the queue (Closes: #1004972), thank
diff --git a/debian/control b/debian/control
index cb1248e..18e9d0f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: at
 Section: admin
 Priority: standard
-Maintainer: Jose M Calhariz <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Jose M Calhariz <[e-mail]>
 Uploaders: Ansgar Burchardt <[e-mail]>,
 Standards-Version: 4.3.0
 Build-Depends: autotools-dev,
@@ -27,7 +28,7 @@ Depends: libpam-runtime (>= 1.0.1-11),
          lsb-base (>= 3.2-14),
          ${misc:Depends},
          ${shlibs:Depends},
-Recommends: default-mta | mail-transport-agent,
+Suggests: default-mta | mail-transport-agent,
 Description: Delayed job execution and batch processing
  At and batch read shell commands from standard input
  storing them as a job to be scheduled for execution in the