Control: tags 1028833 + patch Control: tags 1028833 + pending Dear maintainer,
I've prepared an NMU for khal (versioned as 1:0.10.5-1.1) and uploaded it to DELAYED/7. Please feel free to tell me if I should cancel it. cu Adrian
diff -Nru khal-0.10.5/debian/changelog khal-0.10.5/debian/changelog --- khal-0.10.5/debian/changelog 2022-12-16 18:31:23.000000000 +0200 +++ khal-0.10.5/debian/changelog 2023-02-12 13:41:00.000000000 +0200 @@ -1,3 +1,11 @@ +khal (1:0.10.5-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Backport fix from upstream merge request for FTBFS with + tzdata 2022g. (Closes: #1028833) + + -- Adrian Bunk <b...@debian.org> Sun, 12 Feb 2023 13:41:00 +0200 + khal (1:0.10.5-1) unstable; urgency=medium [ upstream ] diff -Nru khal-0.10.5/debian/patches/0001-Update-Colombia-s-1993-fallback.patch khal-0.10.5/debian/patches/0001-Update-Colombia-s-1993-fallback.patch --- khal-0.10.5/debian/patches/0001-Update-Colombia-s-1993-fallback.patch 1970-01-01 02:00:00.000000000 +0200 +++ khal-0.10.5/debian/patches/0001-Update-Colombia-s-1993-fallback.patch 2023-02-12 13:39:55.000000000 +0200 @@ -0,0 +1,45 @@ +From f93bcf1641c2c5381de93c91437ad5c903997f3a Mon Sep 17 00:00:00 2001 +From: Daniele Tricoli <er...@mornie.org> +Date: Mon, 19 Dec 2022 14:12:20 +0100 +Subject: Update Colombia's 1993 fallback + +In 2022g release of tz code we have: + + Colombia's 1993 fallback was 02-06 24:00, not 04-04 00:00. + +See https://mm.icann.org/pipermail/tz-announce/2022-November/000076.html +for details. +--- + tests/ics/cal_no_dst.ics | 2 +- + tests/vtimezone_test.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/ics/cal_no_dst.ics b/tests/ics/cal_no_dst.ics +index d22ada6..73c39b7 100644 +--- a/tests/ics/cal_no_dst.ics ++++ b/tests/ics/cal_no_dst.ics +@@ -4,7 +4,7 @@ PRODID:-//PIMUTILS.ORG//NONSGML khal / icalendar //EN + BEGIN:VTIMEZONE + TZID:America/Bogota + BEGIN:STANDARD +-DTSTART;VALUE=DATE-TIME:19930403T230000 ++DTSTART;VALUE=DATE-TIME:19930206T230000 + TZNAME:COT + TZOFFSETFROM:-0400 + TZOFFSETTO:-0500 +diff --git a/tests/vtimezone_test.py b/tests/vtimezone_test.py +index d19936c..4c19b78 100644 +--- a/tests/vtimezone_test.py ++++ b/tests/vtimezone_test.py +@@ -67,7 +67,7 @@ def test_bogota(pytz_version): + vbogota = [b'BEGIN:VTIMEZONE', + b'TZID:America/Bogota', + b'BEGIN:STANDARD', +- b'DTSTART;VALUE=DATE-TIME:19930403T230000', ++ b'DTSTART;VALUE=DATE-TIME:19930206T230000', + b'TZNAME:COT', + b'TZOFFSETFROM:-0400', + b'TZOFFSETTO:-0500', +-- +2.30.2 + diff -Nru khal-0.10.5/debian/patches/series khal-0.10.5/debian/patches/series --- khal-0.10.5/debian/patches/series 2022-12-16 17:18:44.000000000 +0200 +++ khal-0.10.5/debian/patches/series 2023-02-12 13:40:16.000000000 +0200 @@ -4,3 +4,4 @@ 2002_Fix_intersphinx_mapping.patch 2003_Avoid_privacy_breach_in_sphinx_doc.patch 2004_version.patch +0001-Update-Colombia-s-1993-fallback.patch
