diff -Nru coreutils-8.26/debian/changelog coreutils-8.26/debian/changelog --- coreutils-8.26/debian/changelog 2017-03-01 03:33:36.000000000 -0500 +++ coreutils-8.26/debian/changelog 2017-10-04 15:56:41.000000000 -0400 @@ -1,3 +1,10 @@ +coreutils (8.26-3ubuntu4) artful; urgency=medium + + * debian/patches/test-misc-date-tzdb-2017a.patch: fixes date test + caused by tzdb-2017a update. LP: #1679865. + + -- Tiago Stürmer Daitx Wed, 04 Oct 2017 19:56:41 +0000 + coreutils (8.26-3ubuntu3) zesty; urgency=medium * Ignore the cut-huge-range test failure on armhf, only seen on the buildds. diff -Nru coreutils-8.26/debian/patches/series coreutils-8.26/debian/patches/series --- coreutils-8.26/debian/patches/series 2017-02-28 04:13:10.000000000 -0500 +++ coreutils-8.26/debian/patches/series 2017-10-04 15:56:41.000000000 -0400 @@ -9,3 +9,4 @@ 99_kfbsd_fstat_patch.patch 99_hppa_longlong.patch 99_float_endian_detection.patch +test-misc-date-tzdb-2017a.patch diff -Nru coreutils-8.26/debian/patches/test-misc-date-tzdb-2017a.patch coreutils-8.26/debian/patches/test-misc-date-tzdb-2017a.patch --- coreutils-8.26/debian/patches/test-misc-date-tzdb-2017a.patch 1969-12-31 19:00:00.000000000 -0500 +++ coreutils-8.26/debian/patches/test-misc-date-tzdb-2017a.patch 2017-10-04 15:56:41.000000000 -0400 @@ -0,0 +1,56 @@ +Description: Fix date test after tzdb-2017a update + Problem reported by Bernhard Voelker in: + http://lists.gnu.org/archive/html/coreutils/2017-03/msg00026.html + * tests/misc/date-debug.sh: Port test to tzdb 2017a, + and future-proof the America/Belize test. +Author: Paul Eggert +Origin: http://lists.gnu.org/archive/html/coreutils/2017-03/msg00026.html +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/coreutils/+bug/1679865 +Forwarded: not-needed +Reviewed-by: Tiago Stürmer Daitx +Last-Update: 2017-10-05 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +From b6d68d90981d9ce747d5d87f4f4da3991b3ee82b Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Thu, 9 Mar 2017 23:59:05 -0800 +Subject: [PATCH] tests: port to tzdb-2017a + +Problem reported by Bernhard Voelker in: +http://lists.gnu.org/archive/html/coreutils/2017-03/msg00026.html +* tests/misc/date-debug.sh: Port test to tzdb 2017a, +and future-proof the America/Belize test. +--- + tests/misc/date-debug.sh | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +--- a/tests/misc/date-debug.sh ++++ b/tests/misc/date-debug.sh +@@ -52,10 +52,11 @@ date: output timezone: -06:00 (set from + date: final: 661095000.000000000 (epoch-seconds) + date: final: (Y-M-D) 1990-12-13 13:30:00 (UTC0) + date: final: (Y-M-D) 1990-12-13 07:30:00 (output timezone TZ=-06:00) +-Thu Dec 13 07:30:00 CST 1990 ++Thu Dec 13 07:30:00 -0600 1990 + EOF + +-TZ=America/Belize date --debug -d "$in1" >out1 2>&1 || fail=1 ++TZ=America/Belize date --debug -d "$in1" +'%a %b %e %T %z %Y' >out1 2>&1 || ++ fail=1 + + compare exp1 out1 || fail=1 + +@@ -94,10 +95,10 @@ date: output timezone: -05:00 (set from + date: final: 1.000000000 (epoch-seconds) + date: final: (Y-M-D) 1970-01-01 00:00:01 (UTC0) + date: final: (Y-M-D) 1969-12-31 19:00:01 (output timezone TZ=-05:00) +-Wed Dec 31 19:00:01 PET 1969 ++Wed Dec 31 19:00:01 -0500 1969 + EOF + +-TZ=America/Lima date --debug -d "$in3" >out3 2>&1 || fail=1 ++TZ=America/Lima date --debug -d "$in3" +'%a %b %e %T %z %Y' >out3 2>&1 || fail=1 + compare exp3 out3 || fail=1 + + Exit $fail