Merge ~paride/ubuntu/+source/at:lp1464051-HIRSUTE into ubuntu/+source/at:ubuntu/devel

[Paride Legovini]

Fixes LP: #1464051 - Low priority but very easy fix.
Test PPA: https://launchpad.net/~paride/+archive/ubuntu/atd-test

Test case:

# Buggy result:
$ at -t 201506101624.05
warning: commands will be executed using /bin/sh
at> echo hi
at> <EOT>
job 1 at Wed Jun 10 16:24:00 2015

# Expected result:
$ at -t 201506101624.05
warning: commands will be executed using /bin/sh
at> echo hi
at> <EOT>
job 1 at Wed Jun 10 16:24:05 2015

[Sergio Durigan Junior (sergiodj)]

I can review this one.

[Paride Legovini (paride)]

The e97122b commit message isn't in "changelog format", but it's in "git-buildpackage" format, so to generate the changelog I just did

  gbp dch --since ubuntu/devel

and that's is.

[Sergio Durigan Junior (sergiodj)]

LGTM, thanks.

$ git push pkg upload/3.1.23-1.1ubuntu2
Enumerating objects: 16, done.
Counting objects: 100% (16/16), done.
Delta compression using up to 8 threads
Compressing objects: 100% (10/10), done.
Writing objects: 100% (11/11), 1.80 KiB | 615.00 KiB/s, done.
Total 11 (delta 5), reused 0 (delta 0)
To ssh://git.launchpad.net/ubuntu/+source/at
 * [new tag] upload/3.1.23-1.1ubuntu2 -> upload/3.1.23-1.1ubuntu2

$ dput ubuntu at_3.1.23-1.1ubuntu2_source.changes
Checking signature on .changes
gpg: /home/sergio/work/at/at_3.1.23-1.1ubuntu2_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/at/at_3.1.23-1.1ubuntu2.dsc: Valid signature from 106DA1C8C3CBBF14
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading at_3.1.23-1.1ubuntu2.dsc: done.
  Uploading at_3.1.23-1.1ubuntu2.debian.tar.xz: done.
  Uploading at_3.1.23-1.1ubuntu2_amd64.buildinfo: done.
  Uploading at_3.1.23-1.1ubuntu2_source.changes: done.
Successfully uploaded packages.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 77d355e..09ff2a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+at (3.1.23-1.1ubuntu2) hirsute; urgency=medium
+
+  * d/patches: add 03-do-not-drop-seconds.patch (cherry-pick).
+    When calculating time for the job, do not drop seconds. (LP: #1464051)
+
+ -- Paride Legovini <[e-mail]>  Tue, 15 Dec 2020 12:01:14 +0100
+
 at (3.1.23-1.1ubuntu1) hirsute; urgency=medium
 
   * Merge with Debian unstable. Remaining changes:
diff --git a/debian/patches/03-do-not-drop-seconds.patch b/debian/patches/03-do-not-drop-seconds.patch
new file mode 100644
index 0000000..1aaa8a3
--- /dev/null
+++ b/debian/patches/03-do-not-drop-seconds.patch
@@ -0,0 +1,27 @@
+From 15ee22de9dfd67d9c97404302623a9d45ce887a2 Mon Sep 17 00:00:00 2001
+From: Jose M Calhariz <[e-mail]>
+Date: Wed, 17 Jul 2019 02:18:15 +0100
+Subject: [PATCH] when calculating time for the job, do not drop seconds
+Origin: upstream, https://salsa.debian.org/debian/at/-/commit/15ee22de9dfd67d9c97404302623a9d45ce887a2
+Bug-Debian: https://bugs.debian.org/792040
+
+---
+ at.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/at.c b/at.c
+index 2136e0b..48884ec 100644
+--- a/at.c
++++ b/at.c
+@@ -860,8 +860,6 @@ main(int argc, char **argv)
+ 		fprintf(stderr, "invalid date format: %s\n", optarg);
+ 		exit(EXIT_FAILURE);
+ 	    }
+-	    /* drop seconds */
+-	    timer -= timer % 60;
+ 	    break;
+ 
+ 	default:
+-- 
+GitLab
+
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..1dacf3a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+03-do-not-drop-seconds.patch